From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 17 Mar 2011 10:17:22 +0000 (+0100)
Subject: Localisation updates from http://translatewiki.net.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=199e05f9deba36092748997cfbb870146ac4d4ce;p=quix0rs-gnu-social.git

Localisation updates from http://translatewiki.net.
---

diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 17a4cb5b14..9650e26148 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -12,19 +12,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:16:53+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:21+0000\n"
 "Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -600,7 +600,7 @@ msgstr "لم يمكن إزالة المستخدم %1$s من المجموعة %2$
 msgid "%s's groups"
 msgstr "مجموعات %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "مجموعات %1$s التي %2$s عضو فيها."
@@ -4606,19 +4606,6 @@ msgstr "مجموعة %s"
 msgid "%1$s group, page %2$d"
 msgstr "مجموعة %1$s، الصفحة %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "ملاحظة"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "الكنى"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-#, fuzzy
-msgid "Group actions"
-msgstr "تصرفات المستخدم"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4729,6 +4716,10 @@ msgstr "نتائج البحث ل\"%1$s\" على %2$s"
 msgid "Notice deleted."
 msgstr "حُذف الإشعار."
 
+#, fuzzy
+msgid "Notice"
+msgstr "الإشعارات"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5253,7 +5244,6 @@ msgstr "لا مدخل هوية."
 msgid "Tag %s"
 msgstr "الوسوم"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "ملف المستخدم الشخصي"
 
@@ -5960,6 +5950,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "تصرفات المستخدم"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "حذف المستخدم قيد التنفيذ..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "عدّل إعدادات الملف الشخصي"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "عدّل"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "أرسل رسالة مباشرة إلى هذا المستخدم"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "رسالة"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "راقب"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "دور المستخدم"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "إداري"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "مراقب"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6711,85 +6744,171 @@ msgstr[3] "أنت عضو في هذه المجموعات:"
 msgstr[4] ""
 msgstr[5] ""
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"الأوامر:\n"
-"on - شغّل الإشعار\n"
-"off - أطفئ الإشعار\n"
-"help - أظهر هذه المساعدة\n"
-"follow <nickname> - اشترك بالمستخدم\n"
-"groups - اسرد المجموعات التي أنا عضو فيها\n"
-"subscriptions - اسرد الذين أتابعهم\n"
-"subscribers - اسرد الذين يتابعونني\n"
-"leave <nickname> - ألغِ الاشتراك بمستخدم\n"
-"d <nickname> <text> - وجّه رسالة مباشرة إلى مستخدم\n"
-"get <nickname> - اجلب آخر رسالة من مستخدم\n"
-"whois <nickname> - اجلب معلومات ملف المستخدم\n"
-"lose <nickname> - أجبر المستخدم على عدم تتبعك\n"
-"fav <nickname> - اجعل آخر إشعار من المستخدم مفضلًا\n"
-"fav #<notice_id> - اجعل الإشعار ذا رقم الهوية المعطى مفضلا\n"
-"repeat #<notice_id> - كرّر الإشعار ذا رقم الهوية المعطى\n"
-"repeat <nickname> - كرّر آخر إشعار من المستخدم\n"
-"reply #<notice_id> - رُد على الإشعار ذي رقم الهوية المعطى\n"
-"reply <nickname> - رُد على آخر إشعار من المستخدم\n"
-"join <group> - انضم إلى مجموعة\n"
-"login - اجلب وصلة الولوج إلى واجهة الوب\n"
-"drop <group> - اترك المجموعة\n"
-"stats - اجلب إحصاءاتك\n"
-"stop - مثل 'off'\n"
-"quit - مثل 'off'\n"
-"sub <nickname> - مثل 'follow'\n"
-"unsub <nickname> - مثل 'leave'\n"
-"last <nickname> - مثل 'get'\n"
-"on <nickname> - لم يطبق بعد.\n"
-"off <nickname> - لم يطبق بعد.\n"
-"nudge <nickname> - ذكّر مستخدمًا بإشعار أرسلته.\n"
-"invite <phone number> - لم يطبق بعد.\n"
-"track <word> - لم يطبق بعد.\n"
-"untrack <word> - لم يطبق بعد.\n"
-"track off - لم يطبق بعد.\n"
-"untrack all - لم يطبق بعد.\n"
-"tracks - لم يطبق بعد.\n"
-"tracking - لم يطبق بعد.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "نتائج الأمر"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "تعذّر تشغيل الإشعار."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "تعذّر إطفاء الإشعارات."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "اشترك بهذا المستخدم"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "ألغِ الاشتراك مع هذا المستخدم"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "رسالة مباشرة %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "معلومات الملف الشخصي"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "كرّر هذا الإشعار"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "رُد على هذا الإشعار"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "غير معروفة"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "احذف المستخدم"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "الأمر لم يُجهزّ بعد."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -6973,6 +7092,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
 
+msgid "Aliases"
+msgstr "الكنى"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7054,6 +7176,11 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+#, fuzzy
+msgid "Group actions"
+msgstr "تصرفات المستخدم"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "المجموعات الأكثر أعضاءً"
@@ -7560,6 +7687,7 @@ msgstr "أرسل إشعارًا"
 msgid "What's up, %s?"
 msgstr "ما الأخبار يا %s؟"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "أرفق"
 
@@ -8024,52 +8152,6 @@ msgstr "ألغِ الاشتراك"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "ليس للمستخدم ملف شخصي."
 
-msgid "Edit Avatar"
-msgstr "عدّل الأفتار"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "تصرفات المستخدم"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "حذف المستخدم قيد التنفيذ..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "عدّل إعدادات الملف الشخصي"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "عدّل"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "أرسل رسالة مباشرة إلى هذا المستخدم"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "رسالة"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "راقب"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "دور المستخدم"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "إداري"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "مراقب"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "لست والجًا."
@@ -8161,3 +8243,88 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "ملاحظة"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "الأوامر:\n"
+#~ "on - شغّل الإشعار\n"
+#~ "off - أطفئ الإشعار\n"
+#~ "help - أظهر هذه المساعدة\n"
+#~ "follow <nickname> - اشترك بالمستخدم\n"
+#~ "groups - اسرد المجموعات التي أنا عضو فيها\n"
+#~ "subscriptions - اسرد الذين أتابعهم\n"
+#~ "subscribers - اسرد الذين يتابعونني\n"
+#~ "leave <nickname> - ألغِ الاشتراك بمستخدم\n"
+#~ "d <nickname> <text> - وجّه رسالة مباشرة إلى مستخدم\n"
+#~ "get <nickname> - اجلب آخر رسالة من مستخدم\n"
+#~ "whois <nickname> - اجلب معلومات ملف المستخدم\n"
+#~ "lose <nickname> - أجبر المستخدم على عدم تتبعك\n"
+#~ "fav <nickname> - اجعل آخر إشعار من المستخدم مفضلًا\n"
+#~ "fav #<notice_id> - اجعل الإشعار ذا رقم الهوية المعطى مفضلا\n"
+#~ "repeat #<notice_id> - كرّر الإشعار ذا رقم الهوية المعطى\n"
+#~ "repeat <nickname> - كرّر آخر إشعار من المستخدم\n"
+#~ "reply #<notice_id> - رُد على الإشعار ذي رقم الهوية المعطى\n"
+#~ "reply <nickname> - رُد على آخر إشعار من المستخدم\n"
+#~ "join <group> - انضم إلى مجموعة\n"
+#~ "login - اجلب وصلة الولوج إلى واجهة الوب\n"
+#~ "drop <group> - اترك المجموعة\n"
+#~ "stats - اجلب إحصاءاتك\n"
+#~ "stop - مثل 'off'\n"
+#~ "quit - مثل 'off'\n"
+#~ "sub <nickname> - مثل 'follow'\n"
+#~ "unsub <nickname> - مثل 'leave'\n"
+#~ "last <nickname> - مثل 'get'\n"
+#~ "on <nickname> - لم يطبق بعد.\n"
+#~ "off <nickname> - لم يطبق بعد.\n"
+#~ "nudge <nickname> - ذكّر مستخدمًا بإشعار أرسلته.\n"
+#~ "invite <phone number> - لم يطبق بعد.\n"
+#~ "track <word> - لم يطبق بعد.\n"
+#~ "untrack <word> - لم يطبق بعد.\n"
+#~ "track off - لم يطبق بعد.\n"
+#~ "untrack all - لم يطبق بعد.\n"
+#~ "tracks - لم يطبق بعد.\n"
+#~ "tracking - لم يطبق بعد.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "عدّل الأفتار"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 96a8a02c59..ece9e2217b 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:16:54+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:22+0000\n"
 "Language-Team: Egyptian Spoken Arabic <http://translatewiki.net/wiki/Portal:"
 "arz>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: arz\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -609,7 +609,7 @@ msgstr "ما نفعش يتشال اليوزر %1$s من الجروپ %2$s."
 msgid "%s's groups"
 msgstr "مجموعات %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, fuzzy, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "المجموعات التى %s عضو فيها"
@@ -4647,19 +4647,6 @@ msgstr "مجموعه %s"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s اعضاء الجروپ, صفحه %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "ملاحظة"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "الكنى"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-#, fuzzy
-msgid "Group actions"
-msgstr "تصرفات المستخدم"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4768,6 +4755,10 @@ msgstr "نتايج التدوير لـ\"%1$s\" على %2$s"
 msgid "Notice deleted."
 msgstr "حُذف الإشعار."
 
+#, fuzzy
+msgid "Notice"
+msgstr "الإشعارات"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5294,7 +5285,6 @@ msgstr "لا مدخل هويه."
 msgid "Tag %s"
 msgstr "الوسوم"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "ملف المستخدم الشخصي"
 
@@ -5995,6 +5985,51 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "تصرفات المستخدم"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "عدّل إعدادات الملف الشخصي"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "عدّل"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "أرسل رساله مباشره إلى هذا المستخدم"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "رسالة"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+#, fuzzy
+msgid "User role"
+msgstr "ملف المستخدم الشخصي"
+
+#. TRANS: Role that can be set for a user profile.
+#, fuzzy
+msgctxt "role"
+msgid "Administrator"
+msgstr "الإداريون"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr ""
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6758,46 +6793,170 @@ msgstr[3] "أنت عضو فى هذه المجموعات:"
 msgstr[4] ""
 msgstr[5] ""
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "نتائج الأمر"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "مش نافعه تتكرر الملاحظتك بتاعتك."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "مش نافعه تتكرر الملاحظتك بتاعتك."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "اشترك بهذا المستخدم"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "ألغِ الاشتراك مع هذا المستخدم"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "رساله مباشره %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "معلومات الملف الشخصي"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "كرر هذا الإشعار"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "رُد على هذا الإشعار"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "مش معروف"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "احذف المستخدم"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "اكتمل الأمر"
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6982,6 +7141,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 
+msgid "Aliases"
+msgstr "الكنى"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7064,6 +7226,11 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+#, fuzzy
+msgid "Group actions"
+msgstr "تصرفات المستخدم"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "المجموعات الأكثر أعضاءً"
@@ -7552,6 +7719,7 @@ msgstr "أرسل إشعارًا"
 msgid "What's up, %s?"
 msgstr "ما الأخبار يا %s؟"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "أرفق"
 
@@ -8020,54 +8188,6 @@ msgstr "ألغِ الاشتراك"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "ليس للمستخدم ملف شخصى."
 
-msgid "Edit Avatar"
-msgstr "عدّل الأفتار"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "تصرفات المستخدم"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "عدّل إعدادات الملف الشخصي"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "عدّل"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "أرسل رساله مباشره إلى هذا المستخدم"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "رسالة"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr ""
-
-#. TRANS: Label text on user profile to select a user role.
-#, fuzzy
-msgid "User role"
-msgstr "ملف المستخدم الشخصي"
-
-#. TRANS: Role that can be set for a user profile.
-#, fuzzy
-msgctxt "role"
-msgid "Administrator"
-msgstr "الإداريون"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr ""
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "لست والجًا."
@@ -8159,3 +8279,9 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "ملاحظة"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "عدّل الأفتار"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index eaabeec93f..4d1cf6906c 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:16:55+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:23+0000\n"
 "Language-Team: Bulgarian <http://translatewiki.net/wiki/Portal:bg>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -587,7 +587,7 @@ msgstr "Грешка при създаване на групата."
 msgid "%s's groups"
 msgstr "Групи на %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, fuzzy, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Групи, в които участва %s"
@@ -4658,19 +4658,6 @@ msgstr "Група %s"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s, страница %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Бележка"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Псевдоними"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-#, fuzzy
-msgid "Group actions"
-msgstr "Потребителски действия"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4773,6 +4760,10 @@ msgstr "Съобщение от %1$s в %2$s"
 msgid "Notice deleted."
 msgstr "Бележката е изтрита."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Бележки"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5292,7 +5283,6 @@ msgstr "Липсват аргументи return-to."
 msgid "Tag %s"
 msgstr "Етикети"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Потребителски профил"
 
@@ -6001,6 +5991,50 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Потребителски действия"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Редактиране на профила"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Редактиране"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Изпращате на пряко съобщение до този потребител."
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Съобщение"
+
+#. TRANS: Label text on user profile to select a user role.
+#, fuzzy
+msgid "Moderate"
+msgstr "Модератор"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Потребителска роля"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Администратор"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Модератор"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6745,46 +6779,170 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Не членувате в тази група."
 msgstr[1] "Не членувате в тази група."
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Резултат от командата"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Грешка при включване на уведомлението."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Грешка при изключване на уведомлението."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Абониране за този потребител"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Отписване от този потребител"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Преки съобщения до %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Данни на профила"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Повтаряне на тази бележка"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Отговаряне на тази бележка"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Непозната група."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Изтриване на потребител"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Командата все още не се поддържа."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6972,6 +7130,9 @@ msgid ""
 msgstr ""
 "Къде се намира групата — град, община, държава и т.н. (ако е приложимо)"
 
+msgid "Aliases"
+msgstr "Псевдоними"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7050,6 +7211,11 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+#, fuzzy
+msgid "Group actions"
+msgstr "Потребителски действия"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Групи с най-много членове"
@@ -7525,6 +7691,7 @@ msgstr "Изпращане на бележка"
 msgid "What's up, %s?"
 msgstr "Какво става, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Прикрепяне"
 
@@ -7988,53 +8155,6 @@ msgstr "Отписване"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Потребителят няма профил."
 
-msgid "Edit Avatar"
-msgstr "Редактиране на аватара"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Потребителски действия"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Редактиране на профила"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Редактиране"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Изпращате на пряко съобщение до този потребител."
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Съобщение"
-
-#. TRANS: Label text on user profile to select a user role.
-#, fuzzy
-msgid "Moderate"
-msgstr "Модератор"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Потребителска роля"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Администратор"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Модератор"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Не сте влезли в системата."
@@ -8110,3 +8230,9 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Бележка"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Редактиране на аватара"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 8ca30f42c1..6bf976f0fd 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:16:56+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:25+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -589,7 +589,7 @@ msgstr "Dibosupl eo dilemel an implijer %1$s deus ar strollad %2$s."
 msgid "%s's groups"
 msgstr "Strollad %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Strolladoù %1s m'eo ezel %2s."
@@ -4582,18 +4582,6 @@ msgstr "strollad %s"
 msgid "%1$s group, page %2$d"
 msgstr "Strollad %1$s, pajenn %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Notenn"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Aliasoù"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Obererezh ar strollad"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4700,6 +4688,10 @@ msgstr "Kemenadenn resevet eus %1$s d'an %2$s"
 msgid "Notice deleted."
 msgstr "Ali dilammet."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Ali"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5225,7 +5217,6 @@ msgstr "Arguzenn ID ebet."
 msgid "Tag %s"
 msgstr "Merk %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Profil an implijer"
 
@@ -5916,6 +5907,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Obererezh an implijer"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Diverkadenn an implijer o vont war-raok..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Kemmañ arventennoù ar profil"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Aozañ"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Kas ur gemennadenn war-eeun d'an implijer-mañ"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Kemennadenn"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Habaskaat"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Rol an implijer"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Merour"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Habasker"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6644,46 +6678,170 @@ 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:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Disoc'hoù an urzhiad"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Dibosupl eo gweredekaat ar c'hemennoù."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Dibosupl eo diweredekaat ar c'hemennoù."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "En em goumanantiñ d'an implijer-mañ"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "En em zigoumanantiñ eus an implijer-mañ"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Kemennadennoù war-eeun kaset da %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Titouroù ar profil"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Adkregiñ gant ar c'hemenn-mañ"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Respont d'ar c'hemenn-mañ"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Strollad dianav."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Dilemel ar strollad"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Digarezit, n'eo ket bet emplementet an urzhiad-mañ c'hoazh."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6867,6 +7025,9 @@ 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\""
 
+msgid "Aliases"
+msgstr "Aliasoù"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -6944,6 +7105,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Ouzhpennañ pe kemmañ tres ar strollad %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Obererezh ar strollad"
+
 #. TRANS: Title for groups with the most members section.
 #, fuzzy
 msgid "Groups with most members"
@@ -7418,6 +7583,7 @@ msgstr "Kas un ali"
 msgid "What's up, %s?"
 msgstr "Penaos 'mañ kont, %s ?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Stagañ"
 
@@ -7877,52 +8043,6 @@ msgstr "Digoumanantiñ"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "An implijer-mañ n'eus profil ebet dezhañ."
 
-msgid "Edit Avatar"
-msgstr "Kemmañ an Avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Obererezh an implijer"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Diverkadenn an implijer o vont war-raok..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Kemmañ arventennoù ar profil"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Aozañ"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Kas ur gemennadenn war-eeun d'an implijer-mañ"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Kemennadenn"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Habaskaat"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Rol an implijer"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Merour"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Habasker"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Nann-kevreet."
@@ -7998,3 +8118,9 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Notenn"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Kemmañ an Avatar"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index c8c23852bb..be175cd65b 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -16,17 +16,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:16:57+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:26+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -598,7 +598,7 @@ msgstr "No s'ha pogut eliminar l'usuari %1$s del grup %2$s."
 msgid "%s's groups"
 msgstr "Grups de %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s grups dels que %2$s és membre."
@@ -3433,7 +3433,6 @@ msgid "6 or more characters."
 msgstr "6 o més caràcters."
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Confirma"
@@ -3444,7 +3443,6 @@ msgid "Same as password above."
 msgstr "Igual que la contrasenya de dalt"
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
 msgstr "Canvia"
@@ -3457,9 +3455,8 @@ msgid "Passwords don't match."
 msgstr "Les contrasenyes no coincideixen."
 
 #. TRANS: Form validation error on page where to change password.
-#, fuzzy
 msgid "Incorrect old password."
-msgstr "Contrasenya antiga incorrecta"
+msgstr "La contrasenya antiga no és correcta"
 
 #. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
@@ -4646,18 +4643,6 @@ msgstr "%s grup"
 msgid "%1$s group, page %2$d"
 msgstr "grup %1$s, pàgina %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Avisos"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Àlies"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Accions del grup"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4768,6 +4753,10 @@ msgstr "Missatge de %1$s a %2$s"
 msgid "Notice deleted."
 msgstr "S'ha eliminat l'avís."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Avisos"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5303,7 +5292,6 @@ msgstr "No hi ha cap argument ID."
 msgid "Tag %s"
 msgstr "Etiqueta %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Perfil de l'usuari"
 
@@ -6022,6 +6010,49 @@ msgstr "No es pot trobar l'XRD de %s."
 msgid "No AtomPub API service for %s."
 msgstr "No hi ha cap servei API d'AtomPub de %s."
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Accions de l'usuari"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "S'està eliminant l'usuari..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Edita la configuració del perfil"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Edita"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Envia un missatge directe a aquest usuari"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Missatge"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Modera"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Rol de l'usuari"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrador"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderador"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6747,85 +6778,171 @@ 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:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"Ordres:\n"
-"on - activeu els avisos\n"
-"off - desactiveu els avisos\n"
-"help - mostra aquesta ajuda\n"
-"follow <nickname> - se subscriu a l'usuari\n"
-"groups - llista els grups on us heu unit\n"
-"subscriptions - llista la gent que seguiu\n"
-"subscribers - llista la gent que us segueix\n"
-"leave <nickname> - cancel·la la subscripció de l'usuari\n"
-"d <nickname> <text> - missatge directe a l'usuari\n"
-"get <nickname> - s'obté el darrer avís de l'usuari\n"
-"whois <nickname> - s'obté la informació del perfil de l'usuari\n"
-"lose <nickname> - es força l'usuari a deixar de seguir-vos\n"
-"fav <nickname> - afegeix el darrer avís de l'usuari com a «preferit»\n"
-"fav #<notice_id> - afegeix l'avís amb l'id donat com a «preferit»\n"
-"repeat #<notice_id> - repeteix l'avís amb l'id donat\n"
-"repeat <nickname> - repeteix el darrer avís de l'usari\n"
-"reply #<notice_id> - respon l'avís amb l'id donat\n"
-"reply <nickname> - respon el darrer avís de l'usuari\n"
-"join <group> - s'uneix al grup\n"
-"login - s'obté un enllaç per iniciar una sessió des de la interfície web\n"
-"drop <group> - es deixa el grup\n"
-"stats - s'obté el vostre estat\n"
-"stop - el mateix que «off»\n"
-"quit - el mateix que «off»\n"
-"sub <nickname> - el mateix que «follow»\n"
-"unsub <nickname> - el mateix que «leave»\n"
-"last <nickname> - el mateix que «get»\n"
-"on <nickname> - no s'ha implementat encara.\n"
-"off <nickname> - no s'ha implementat encara.\n"
-"nudge <nickname> - es recorda a l'usuari que actualitzi.\n"
-"invite <phone number> - no s'ha implementat encara.\n"
-"track <word> - no s'ha implementat encara.\n"
-"untrack <word> - no s'ha implementat encara.\n"
-"track off - no s'ha implementat encara.\n"
-"untrack all - no s'ha implementat encara.\n"
-"tracks - no s'ha implementat encara.\n"
-"tracking - no s'ha implementat encara.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Resultats de les comandes"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "No es poden activar els avisos."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "No es poden desactivar els avisos."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Subscriu-me a aquest usuari"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Cancel·la la subscripció d'aquest usuari"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Missatges directes a %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "El perfil remot no és un grup!"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Repeteix l'avís"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Respon a aquest avís"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Grup desconegut."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Elimina el grup"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Comanda encara no implementada."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -6999,6 +7116,9 @@ msgid ""
 msgstr ""
 "Ubicació del grup, si s'hi adiu cap, com ara «ciutat, comarca (o illa), país»."
 
+msgid "Aliases"
+msgstr "Àlies"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7080,6 +7200,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Afegeix o edita el disseny de %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Accions del grup"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grups amb més membres"
@@ -7647,6 +7771,7 @@ msgstr "Envia un avís"
 msgid "What's up, %s?"
 msgstr "Què tal, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Adjunta"
 
@@ -8099,52 +8224,6 @@ msgstr "Cancel·la la subscripció"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "L'usuari %1$s (%2$d) no té un registre de perfil."
 
-msgid "Edit Avatar"
-msgstr "Edita l'avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Accions de l'usuari"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "S'està eliminant l'usuari..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Edita la configuració del perfil"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Edita"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Envia un missatge directe a aquest usuari"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Missatge"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Modera"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Rol de l'usuari"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrador"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderador"
-
 msgid "Not allowed to log in."
 msgstr "No es permet iniciar una sessió."
 
@@ -8218,3 +8297,88 @@ msgstr "L'XML no és vàlid, hi manca l'arrel XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Es recupera la còpia de seguretat del fitxer '%s'."
+
+#~ msgid "Note"
+#~ msgstr "Avisos"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Ordres:\n"
+#~ "on - activeu els avisos\n"
+#~ "off - desactiveu els avisos\n"
+#~ "help - mostra aquesta ajuda\n"
+#~ "follow <nickname> - se subscriu a l'usuari\n"
+#~ "groups - llista els grups on us heu unit\n"
+#~ "subscriptions - llista la gent que seguiu\n"
+#~ "subscribers - llista la gent que us segueix\n"
+#~ "leave <nickname> - cancel·la la subscripció de l'usuari\n"
+#~ "d <nickname> <text> - missatge directe a l'usuari\n"
+#~ "get <nickname> - s'obté el darrer avís de l'usuari\n"
+#~ "whois <nickname> - s'obté la informació del perfil de l'usuari\n"
+#~ "lose <nickname> - es força l'usuari a deixar de seguir-vos\n"
+#~ "fav <nickname> - afegeix el darrer avís de l'usuari com a «preferit»\n"
+#~ "fav #<notice_id> - afegeix l'avís amb l'id donat com a «preferit»\n"
+#~ "repeat #<notice_id> - repeteix l'avís amb l'id donat\n"
+#~ "repeat <nickname> - repeteix el darrer avís de l'usari\n"
+#~ "reply #<notice_id> - respon l'avís amb l'id donat\n"
+#~ "reply <nickname> - respon el darrer avís de l'usuari\n"
+#~ "join <group> - s'uneix al grup\n"
+#~ "login - s'obté un enllaç per iniciar una sessió des de la interfície web\n"
+#~ "drop <group> - es deixa el grup\n"
+#~ "stats - s'obté el vostre estat\n"
+#~ "stop - el mateix que «off»\n"
+#~ "quit - el mateix que «off»\n"
+#~ "sub <nickname> - el mateix que «follow»\n"
+#~ "unsub <nickname> - el mateix que «leave»\n"
+#~ "last <nickname> - el mateix que «get»\n"
+#~ "on <nickname> - no s'ha implementat encara.\n"
+#~ "off <nickname> - no s'ha implementat encara.\n"
+#~ "nudge <nickname> - es recorda a l'usuari que actualitzi.\n"
+#~ "invite <phone number> - no s'ha implementat encara.\n"
+#~ "track <word> - no s'ha implementat encara.\n"
+#~ "untrack <word> - no s'ha implementat encara.\n"
+#~ "track off - no s'ha implementat encara.\n"
+#~ "untrack all - no s'ha implementat encara.\n"
+#~ "tracks - no s'ha implementat encara.\n"
+#~ "tracking - no s'ha implementat encara.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Edita l'avatar"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index ec922736f3..6dc8c4efc7 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:16:59+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:27+0000\n"
 "Language-Team: Czech <http://translatewiki.net/wiki/Portal:cs>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
 "2 );\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -600,7 +600,7 @@ msgstr "Nelze odebrat uživatele %1$S ze skupiny %2$s."
 msgid "%s's groups"
 msgstr "skupiny uživatele %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "skupiny na %1$s, kterych je %2$s členem."
@@ -4725,18 +4725,6 @@ msgstr "skupina %s"
 msgid "%1$s group, page %2$d"
 msgstr "skupina %1$s, str. %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Poznámka"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Aliasy"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Akce skupiny"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4848,6 +4836,10 @@ msgstr "Zpráva od %1$s na %2$s"
 msgid "Notice deleted."
 msgstr "Oznámení smazáno."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Sdělení"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5379,7 +5371,6 @@ msgstr "Žádný argument ID."
 msgid "Tag %s"
 msgstr "Otagujte %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Uživatelský profil"
 
@@ -6100,6 +6091,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Akce uživatele"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Probíhá mazání uživatele..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Upravit nastavení profilu"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Editovat"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Odeslat přímou zprávu tomuto uživateli"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Zpráva"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderovat"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Role uživatele"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrátor"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderátor"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6827,85 +6861,171 @@ msgstr[0] "Jste členem této skupiny:"
 msgstr[1] "Jste členem těchto skupin:"
 msgstr[2] ""
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"Příkazy:\n"
-"on - zapnout oznámení\n"
-"off - vypnout oznámení\n"
-"help - zobrazí tuto nápovědu\n"
-"follow <nickname> - Přihlásit se k uživatel\n"
-"groups - seznam skupin, ke kterým jste připojen\n"
-"subscriptions - seznam lidí, které sledujete\n"
-"subscribers - seznam osob, které vás sledují\n"
-"leave <přezdívka> - Odhlásit se od uživatele\n"
-"d <přezdívka> <text> - Přímá zpráva uživateli\n"
-"get <přezdívka> - Dostanete poslední upozornění od uživatele\n"
-"whois <přezdívka> - Získat informace o profilu uživatele\n"
-"lose <přezdívka> - Donutit uživatele přestat vás sledovat\n"
-"fav <přezdívka> - Přidejte uživatelovo poslední oznámení jako 'Oblíbené'\n"
-"fav #<notice_id> - Přidat upozornění s daným id jako 'Oblíbené'\n"
-"repeat #<notice_id> - Opakovat oznámení s daným id\n"
-"repeat <přezdívka> - Opakovat poslední oznámení od uživatele\n"
-"reply #<notice_id> - Odpověď na oznámení s daným id\n"
-"reply <přezdívka> - Odpověď na poslední oznámení od uživatele\n"
-"join <skupina> - Připojit se ke skupině\n"
-"login - Získat odkaz pro přihlášení k webovému rozhraní\n"
-"drop <skupina> - Opustit skupinu\n"
-"stats - získejte Vaše statistiky\n"
-"stop - stejné jako 'off'\n"
-"quit - stejné jako 'off'\n"
-"sub <přezdívka> - Stejné jako 'follow'\n"
-"unsub <přezdívka> - Stejné jako 'leave'\n"
-"last <přezdívka> - Stejné jako 'get'\n"
-"on <přezdívka> - Dosud neimplementován.\n"
-"off <přezdívka> - Dosud neimplementován.\n"
-"nudge <přezdívka> - Připomenout uživateli aby něco poslal.\n"
-"invite <telefonní číslo> - Dosud neimplementován.\n"
-"track <word> - Dosud neimplementován.\n"
-"untrack <word> -Dosud neimplementován.\n"
-"track off - Dosud neimplementován.\n"
-"untrack all - Dosud neimplementován.\n"
-"tracks -  Dosud neimplementován.\n"
-"tracking - Dosud neimplementován.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Výsledky příkazu"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Nelze zapnout oznámení."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Nelze vypnout oznámení."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Přihlásit se k tomuto uživateli"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Odhlásit se od tohoto uživatele"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Přímé zprávy uživateli %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Nastavené Profilu"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Opakovat toto oznámení"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Odpovědět na toto oznámení"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Neznámé"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Smazat uživatele"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Příkaz ještě nebyl implementován."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -7091,6 +7211,9 @@ msgstr ""
 "Umístění skupiny, pokud je nějaké, ve stylu \"město, stát (nebo region), země"
 "\""
 
+msgid "Aliases"
+msgstr "Aliasy"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7169,6 +7292,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Akce skupiny"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Skupiny s nejvíce členy"
@@ -7739,6 +7866,7 @@ msgstr "Poslat oznámení"
 msgid "What's up, %s?"
 msgstr "Co se děje, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Připojit"
 
@@ -8202,52 +8330,6 @@ msgstr "Odhlásit"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Uživatel nemá profil."
 
-msgid "Edit Avatar"
-msgstr "Upravit avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Akce uživatele"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Probíhá mazání uživatele..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Upravit nastavení profilu"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Editovat"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Odeslat přímou zprávu tomuto uživateli"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Zpráva"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderovat"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Role uživatele"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrátor"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderátor"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Nejste přihlášen(a)."
@@ -8327,3 +8409,88 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Poznámka"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Příkazy:\n"
+#~ "on - zapnout oznámení\n"
+#~ "off - vypnout oznámení\n"
+#~ "help - zobrazí tuto nápovědu\n"
+#~ "follow <nickname> - Přihlásit se k uživatel\n"
+#~ "groups - seznam skupin, ke kterým jste připojen\n"
+#~ "subscriptions - seznam lidí, které sledujete\n"
+#~ "subscribers - seznam osob, které vás sledují\n"
+#~ "leave <přezdívka> - Odhlásit se od uživatele\n"
+#~ "d <přezdívka> <text> - Přímá zpráva uživateli\n"
+#~ "get <přezdívka> - Dostanete poslední upozornění od uživatele\n"
+#~ "whois <přezdívka> - Získat informace o profilu uživatele\n"
+#~ "lose <přezdívka> - Donutit uživatele přestat vás sledovat\n"
+#~ "fav <přezdívka> - Přidejte uživatelovo poslední oznámení jako 'Oblíbené'\n"
+#~ "fav #<notice_id> - Přidat upozornění s daným id jako 'Oblíbené'\n"
+#~ "repeat #<notice_id> - Opakovat oznámení s daným id\n"
+#~ "repeat <přezdívka> - Opakovat poslední oznámení od uživatele\n"
+#~ "reply #<notice_id> - Odpověď na oznámení s daným id\n"
+#~ "reply <přezdívka> - Odpověď na poslední oznámení od uživatele\n"
+#~ "join <skupina> - Připojit se ke skupině\n"
+#~ "login - Získat odkaz pro přihlášení k webovému rozhraní\n"
+#~ "drop <skupina> - Opustit skupinu\n"
+#~ "stats - získejte Vaše statistiky\n"
+#~ "stop - stejné jako 'off'\n"
+#~ "quit - stejné jako 'off'\n"
+#~ "sub <přezdívka> - Stejné jako 'follow'\n"
+#~ "unsub <přezdívka> - Stejné jako 'leave'\n"
+#~ "last <přezdívka> - Stejné jako 'get'\n"
+#~ "on <přezdívka> - Dosud neimplementován.\n"
+#~ "off <přezdívka> - Dosud neimplementován.\n"
+#~ "nudge <přezdívka> - Připomenout uživateli aby něco poslal.\n"
+#~ "invite <telefonní číslo> - Dosud neimplementován.\n"
+#~ "track <word> - Dosud neimplementován.\n"
+#~ "untrack <word> -Dosud neimplementován.\n"
+#~ "track off - Dosud neimplementován.\n"
+#~ "untrack all - Dosud neimplementován.\n"
+#~ "tracks -  Dosud neimplementován.\n"
+#~ "tracking - Dosud neimplementován.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Upravit avatar"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 3fc5e059c2..0ef7232dc1 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -22,17 +22,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:00+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:28+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -608,7 +608,7 @@ msgstr "Konnte Benutzer %1$s nicht aus der Gruppe %2$s entfernen."
 msgid "%s's groups"
 msgstr "Gruppen von %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s Gruppen in denen %2$s Mitglied ist"
@@ -4730,18 +4730,6 @@ msgstr "%s-Gruppe"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s Gruppe, Seite %d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Nachricht"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Pseudonyme"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Gruppenaktionen"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4851,6 +4839,10 @@ msgstr "Nachricht von %1$s auf %2$s"
 msgid "Notice deleted."
 msgstr "Nachricht gelöscht."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Nachrichten"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5387,7 +5379,6 @@ msgstr "Kein ID-Argument."
 msgid "Tag %s"
 msgstr "Tag „%s“"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Benutzerprofil"
 
@@ -6114,6 +6105,49 @@ msgstr "XRD für %s kann nicht gefunden werden."
 msgid "No AtomPub API service for %s."
 msgstr "AtomPub API für %s kann nicht gefunden werden."
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Benutzeraktionen"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Löschung des Benutzers in Arbeit …"
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Profil-Einstellungen ändern"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Direkte Nachricht an Benutzer versenden"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Nachricht"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderieren"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Benutzerrolle"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrator"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderator"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6838,85 +6872,171 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Du bist Mitglied dieser Gruppe:"
 msgstr[1] "Du bist Mitglied dieser Gruppen:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"Befehle:\n"
-"on - Benachrichtigung einschalten\n"
-"off - Benachrichtigung ausschalten\n"
-"help - diese Hilfe anzeigen\n"
-"follow <nickname> - einem Benutzer folgen\n"
-"groups - Gruppen auflisten in denen du Mitglied bist\n"
-"subscriptions - Leute auflisten denen du folgst\n"
-"subscribers - Leute auflisten die dir folgen\n"
-"leave <nickname> - einem Benutzer nicht mehr folgen\n"
-"d <nickname> <text> - Direkte Nachricht an einen Benutzer schicken\n"
-"get <nickname> - letzte Nachricht eines Benutzers abrufen\n"
-"whois <nickname> - Profil eines Benutzers abrufen\n"
-"lose <nickname> - Benutzer zwingen dir nicht mehr zu folgen\n"
-"fav <nickname> - letzte Nachricht eines Benutzers als Favorit markieren\n"
-"fav #<notice_id> - Nachricht mit bestimmter ID als Favorit markieren\n"
-"repeat #<notice_id> - Nachricht mit bestimmter ID wiederholen\n"
-"repeat <nickname> - letzte Nachricht eines Benutzers wiederholen\n"
-"reply #<notice_id> - Nachricht mit bestimmter ID beantworten\n"
-"reply <nickname> - letzte Nachricht eines Benutzers beantworten\n"
-"join <group> - Gruppe beitreten\n"
-"login - Link zum Anmelden auf der Webseite anfordern\n"
-"drop <group> - Gruppe verlassen\n"
-"stats - deine Statistik abrufen\n"
-"stop - Äquivalent zu „off“\n"
-"quit - Äquivalent zu „off“\n"
-"sub <nickname> - Äquivalent zu „follow“\n"
-"unsub <nickname> - Äquivalent zu „leave“\n"
-"last <nickname> - Äquivalent zu „get“\n"
-"on <nickname> - noch nicht implementiert\n"
-"off <nickname> - noch nicht implementiert\n"
-"nudge <nickname> - einen Benutzer ans Aktualisieren erinnern\n"
-"invite <phone number> - noch nicht implementiert\n"
-"track <word> - noch nicht implementiert\n"
-"untrack <word> - noch nicht implementiert\n"
-"track off - noch nicht implementiert\n"
-"untrack all - noch nicht implementiert\n"
-"tracks - noch nicht implementiert\n"
-"tracking - noch nicht implementiert\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Befehl-Ergebnisse"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Konnte Benachrichtigung nicht aktivieren."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Konnte Benachrichtigung nicht deaktivieren."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Abonniere diesen Benutzer"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Abonnement von diesem Benutzer abbestellen"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Direkte Nachrichten an %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Entferntes Profil ist keine Gruppe!"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Diese Nachricht wiederholen"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Auf diese Nachricht antworten"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Unbekannte Gruppe."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Gruppe löschen"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Befehl noch nicht implementiert."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -7093,6 +7213,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Ort der Gruppe, optional, beispielsweise „Stadt, Region, Land“."
 
+msgid "Aliases"
+msgstr "Pseudonyme"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7174,6 +7297,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "%s-Design hinzufügen oder bearbeiten"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Gruppenaktionen"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Gruppen mit den meisten Mitgliedern"
@@ -7743,6 +7870,7 @@ msgstr "Nachricht senden"
 msgid "What's up, %s?"
 msgstr "Was geht, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Anhängen"
 
@@ -8202,52 +8330,6 @@ msgstr "Abbestellen"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Benutzer „%1$s“ (%2$d) hat kein Profil."
 
-msgid "Edit Avatar"
-msgstr "Avatar bearbeiten"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Benutzeraktionen"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Löschung des Benutzers in Arbeit …"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Profil-Einstellungen ändern"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Direkte Nachricht an Benutzer versenden"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Nachricht"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderieren"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Benutzerrolle"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrator"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderator"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Nicht angemeldet."
@@ -8322,3 +8404,88 @@ msgstr "Ungültiges XML, XRD-Root fehlt."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Hole Backup von der Datei „%s“."
+
+#~ msgid "Note"
+#~ msgstr "Nachricht"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Befehle:\n"
+#~ "on - Benachrichtigung einschalten\n"
+#~ "off - Benachrichtigung ausschalten\n"
+#~ "help - diese Hilfe anzeigen\n"
+#~ "follow <nickname> - einem Benutzer folgen\n"
+#~ "groups - Gruppen auflisten in denen du Mitglied bist\n"
+#~ "subscriptions - Leute auflisten denen du folgst\n"
+#~ "subscribers - Leute auflisten die dir folgen\n"
+#~ "leave <nickname> - einem Benutzer nicht mehr folgen\n"
+#~ "d <nickname> <text> - Direkte Nachricht an einen Benutzer schicken\n"
+#~ "get <nickname> - letzte Nachricht eines Benutzers abrufen\n"
+#~ "whois <nickname> - Profil eines Benutzers abrufen\n"
+#~ "lose <nickname> - Benutzer zwingen dir nicht mehr zu folgen\n"
+#~ "fav <nickname> - letzte Nachricht eines Benutzers als Favorit markieren\n"
+#~ "fav #<notice_id> - Nachricht mit bestimmter ID als Favorit markieren\n"
+#~ "repeat #<notice_id> - Nachricht mit bestimmter ID wiederholen\n"
+#~ "repeat <nickname> - letzte Nachricht eines Benutzers wiederholen\n"
+#~ "reply #<notice_id> - Nachricht mit bestimmter ID beantworten\n"
+#~ "reply <nickname> - letzte Nachricht eines Benutzers beantworten\n"
+#~ "join <group> - Gruppe beitreten\n"
+#~ "login - Link zum Anmelden auf der Webseite anfordern\n"
+#~ "drop <group> - Gruppe verlassen\n"
+#~ "stats - deine Statistik abrufen\n"
+#~ "stop - Äquivalent zu „off“\n"
+#~ "quit - Äquivalent zu „off“\n"
+#~ "sub <nickname> - Äquivalent zu „follow“\n"
+#~ "unsub <nickname> - Äquivalent zu „leave“\n"
+#~ "last <nickname> - Äquivalent zu „get“\n"
+#~ "on <nickname> - noch nicht implementiert\n"
+#~ "off <nickname> - noch nicht implementiert\n"
+#~ "nudge <nickname> - einen Benutzer ans Aktualisieren erinnern\n"
+#~ "invite <phone number> - noch nicht implementiert\n"
+#~ "track <word> - noch nicht implementiert\n"
+#~ "untrack <word> - noch nicht implementiert\n"
+#~ "track off - noch nicht implementiert\n"
+#~ "untrack all - noch nicht implementiert\n"
+#~ "tracks - noch nicht implementiert\n"
+#~ "tracking - noch nicht implementiert\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Avatar bearbeiten"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index c08f5a607f..7289070638 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -13,17 +13,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:01+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:29+0000\n"
 "Language-Team: British English <http://translatewiki.net/wiki/Portal:en-gb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -595,7 +595,7 @@ msgstr "Could not remove user %1$s from group %2$s."
 msgid "%s's groups"
 msgstr "%s's groups"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s groups %2$s is a member of."
@@ -4678,18 +4678,6 @@ msgstr "%s group"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s group, page %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Note"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Group actions"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4801,6 +4789,10 @@ msgstr "Message from %1$s on %2$s"
 msgid "Notice deleted."
 msgstr "Notice deleted."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Notices"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5321,7 +5313,6 @@ msgstr "No ID argument."
 msgid "Tag %s"
 msgstr "Tag %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "User profile"
 
@@ -6025,6 +6016,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "User actions"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Edit profile settings"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Edit"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Send a direct message to this user"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Message"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderate"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "User role"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrator"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderator"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6735,85 +6769,171 @@ 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:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Command results"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Can't turn on notification."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Can't turn off notification."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Subscribe to this user"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Unsubscribe from this user"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Direct messages to %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Profile information"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Repeat this notice"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Reply to this notice"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Unknown"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Delete group"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Command not yet implemented."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -6996,6 +7116,9 @@ msgid ""
 msgstr ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 
+msgid "Aliases"
+msgstr ""
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7073,6 +7196,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Group actions"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Groups with most members"
@@ -7553,6 +7680,7 @@ msgstr "Send a notice"
 msgid "What's up, %s?"
 msgstr "What's up, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr ""
 
@@ -8005,52 +8133,6 @@ msgstr "Unsubscribe"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "User %1$s (%2$d) has no profile record."
 
-msgid "Edit Avatar"
-msgstr "Edit Avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "User actions"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Edit profile settings"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Edit"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Send a direct message to this user"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Message"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderate"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "User role"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrator"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderator"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Not logged in."
@@ -8126,3 +8208,88 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Note"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Edit Avatar"
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 2b24b835bf..029c3231b7 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/locale/eo/LC_MESSAGES/statusnet.po
@@ -17,17 +17,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:02+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:30+0000\n"
 "Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -596,7 +596,7 @@ msgstr "Malsukcesis forigi uzanton %1$s de grupo %2$s."
 msgid "%s's groups"
 msgstr "Grupoj de %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Grupoj de %2$s ĉe %1$s."
@@ -4651,18 +4651,6 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, paĝo %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Noto"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Alnomo"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Grupaj agoj"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4773,6 +4761,10 @@ msgstr "Mesaĝo de %1$s ĉe %2$s"
 msgid "Notice deleted."
 msgstr "Avizo viŝiĝas"
 
+#, fuzzy
+msgid "Notice"
+msgstr "Avizoj"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5299,7 +5291,6 @@ msgstr "Neniu ID-argumento"
 msgid "Tag %s"
 msgstr "Etikedo %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Uzanta profilo"
 
@@ -6007,6 +5998,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Nekonata ago"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Forigante uzanton..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Redakti profilan agordon"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Redakti"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Sendi rektan mesaĝon a ĉi tiu uzanto"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Mesaĝo"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderigi"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Uzanta rolo"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administranto"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderanto"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6733,85 +6767,171 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Vi estas grupano de jena grupo:"
 msgstr[1] "Vi estas grupano de jenaj grupoj:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"Komandoj:\n"
-"on — ŝalti sciigon;\n"
-"off — malŝalti sciigon;\n"
-"help — montri ĉi tiun helpon;\n"
-"follow <nickname> — aboni uzanton;\n"
-"groups — listigi grupojn, kiujn vi aniĝis;\n"
-"subscriptions — listigi viajn abonatojn;\n"
-"subscribers — listigi viajn abonantojn;\n"
-"leave <nickname> — malaboni uzanton;\n"
-"d <nickname> <text> — sendi rektan mesaĝon al uzanto;\n"
-"get <nickname> — legi la lastan avizon de uzanto;\n"
-"whois <nickname> — legi profilan informon pri uzanto;\n"
-"lose <nickname> — ĉesigi la uzanton de sekvi vin;\n"
-"fav <nickname> — ŝati la lastan avizon de uzanto;\n"
-"fav #<notice_id> — ŝati la avizon kun la ID;\n"
-"repeat #<notice_id> — ripeti la avizon kun la ID;\n"
-"repeat <nickname> — ripeti la lastan avizon de uzanto;\n"
-"reply #<notice_id> — respondi la avizon kun la ID;\n"
-"reply <nickname> — respondi la lastan avizon de uzanto;\n"
-"join <group> — aniĝi al grupo;\n"
-"login — havi ligilon por ensaluti al reta interfaco;\n"
-"drop <group> — foriri el grupo;\n"
-"stats — legi vian staton;\n"
-"stop — same kiel «off»;\n"
-"quit — same kiel «off»;\n"
-"sub <nickname> — same kiel «follow»;\n"
-"unsub <nickname> — same kiel «leave»;\n"
-"last <nickname> — same kiel «get»;\n"
-"on <nickname> — ankoraŭ ne realigita;\n"
-"off <nickname> — ankoraŭ ne realigita;\n"
-"nudge <nickname> — puŝeti la uzanton, ke li ĝisdatigu!\n"
-"invite <phone number> — ankoraŭ ne realigita;\n"
-"track <word> — ankoraŭ ne realigita;\n"
-"untrack <word> — ankoraŭ ne realigita;\n"
-"track off — ankoraŭ ne realigita;\n"
-"untrack all — ankoraŭ ne realigita;\n"
-"tracks — ankoraŭ ne realigita;\n"
-"tracking — ankoraŭ ne realigita;\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Komandaj rezultoj"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Malsukcesis ŝalti sciigon."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Malsukcesis malŝalti sciigon."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Aboni la uzanton"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Malaboni la uzanton"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Rektaj mesaĝoj al %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Profila informo"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Ripeti la avizon"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Respondi ĉi tiun avizon"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Nekonata grupo."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Forigo de grupo"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Komando ankoraÅ­ ne realigita."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -6994,6 +7114,9 @@ msgid ""
 msgstr ""
 "Loko de la grupo, se iu ajn, ekzemple \"Urbo, Stato (aÅ­ Regiono), Lando\""
 
+msgid "Aliases"
+msgstr "Alnomo"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7073,6 +7196,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Aldoni aÅ­ redakti desegnon de %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Grupaj agoj"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grupoj kun plej multe da membroj"
@@ -7639,6 +7766,7 @@ msgstr "Sendi avizon"
 msgid "What's up, %s?"
 msgstr "Kio novas, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Aldoni"
 
@@ -8095,52 +8223,6 @@ msgstr "Malaboni"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "La uzanto ne havas profilon."
 
-msgid "Edit Avatar"
-msgstr "Redakti vizaĝbildon"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Nekonata ago"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Forigante uzanton..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Redakti profilan agordon"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Redakti"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Sendi rektan mesaĝon a ĉi tiu uzanto"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Mesaĝo"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderigi"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Uzanta rolo"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administranto"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderanto"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Ne konektita."
@@ -8216,3 +8298,88 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Noto"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Komandoj:\n"
+#~ "on — ŝalti sciigon;\n"
+#~ "off — malŝalti sciigon;\n"
+#~ "help — montri ĉi tiun helpon;\n"
+#~ "follow <nickname> — aboni uzanton;\n"
+#~ "groups — listigi grupojn, kiujn vi aniĝis;\n"
+#~ "subscriptions — listigi viajn abonatojn;\n"
+#~ "subscribers — listigi viajn abonantojn;\n"
+#~ "leave <nickname> — malaboni uzanton;\n"
+#~ "d <nickname> <text> — sendi rektan mesaĝon al uzanto;\n"
+#~ "get <nickname> — legi la lastan avizon de uzanto;\n"
+#~ "whois <nickname> — legi profilan informon pri uzanto;\n"
+#~ "lose <nickname> — ĉesigi la uzanton de sekvi vin;\n"
+#~ "fav <nickname> — ŝati la lastan avizon de uzanto;\n"
+#~ "fav #<notice_id> — ŝati la avizon kun la ID;\n"
+#~ "repeat #<notice_id> — ripeti la avizon kun la ID;\n"
+#~ "repeat <nickname> — ripeti la lastan avizon de uzanto;\n"
+#~ "reply #<notice_id> — respondi la avizon kun la ID;\n"
+#~ "reply <nickname> — respondi la lastan avizon de uzanto;\n"
+#~ "join <group> — aniĝi al grupo;\n"
+#~ "login — havi ligilon por ensaluti al reta interfaco;\n"
+#~ "drop <group> — foriri el grupo;\n"
+#~ "stats — legi vian staton;\n"
+#~ "stop — same kiel «off»;\n"
+#~ "quit — same kiel «off»;\n"
+#~ "sub <nickname> — same kiel «follow»;\n"
+#~ "unsub <nickname> — same kiel «leave»;\n"
+#~ "last <nickname> — same kiel «get»;\n"
+#~ "on <nickname> — ankoraŭ ne realigita;\n"
+#~ "off <nickname> — ankoraŭ ne realigita;\n"
+#~ "nudge <nickname> — puŝeti la uzanton, ke li ĝisdatigu!\n"
+#~ "invite <phone number> — ankoraŭ ne realigita;\n"
+#~ "track <word> — ankoraŭ ne realigita;\n"
+#~ "untrack <word> — ankoraŭ ne realigita;\n"
+#~ "track off — ankoraŭ ne realigita;\n"
+#~ "untrack all — ankoraŭ ne realigita;\n"
+#~ "tracks — ankoraŭ ne realigita;\n"
+#~ "tracking — ankoraŭ ne realigita;\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Redakti vizaĝbildon"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 7319a67351..5ece490d2e 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -4,6 +4,7 @@
 # Author: Brion
 # Author: Crazymadlover
 # Author: Fitoschido
+# Author: Johnarupire
 # Author: Locos epraix
 # Author: McDutchie
 # Author: Ovruni
@@ -18,17 +19,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:03+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:32+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -278,7 +279,7 @@ msgstr "No se pudo guardar el perfil."
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
 "current configuration."
@@ -286,10 +287,10 @@ msgid_plural ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 msgstr[0] ""
-"El servidor no ha podido manejar tanta información del tipo POST (% de "
+"El servidor no ha podido manejar tanta información del tipo POST (%s de "
 "bytes) a causa de su configuración actual."
 msgstr[1] ""
-"El servidor no ha podido manejar tanta información del tipo POST (% de "
+"El servidor no ha podido manejar tanta información del tipo POST (%s de "
 "bytes) a causa de su configuración actual."
 
 #. TRANS: Client error displayed when saving design settings fails because of an empty id.
@@ -308,7 +309,7 @@ msgstr "No se pudo actualizar tu diseño."
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
-msgstr ""
+msgstr "Principal"
 
 #. TRANS: Title for Atom feed. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
@@ -330,14 +331,14 @@ msgstr "Suscripciones %s"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "Favoritos"
+msgstr "%s Favoritos"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
-msgstr "Miembros del grupo %s"
+msgstr "%s miembros del grupo"
 
 #. TRANS: Client error displayed when users try to block themselves.
 msgid "You cannot block yourself!"
@@ -379,26 +380,24 @@ msgstr "¡Sin texto de mensaje!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] "Demasiado largo. Tamaño máx. de los mensajes es %d caracteres."
-msgstr[1] "Demasiado largo. Tamaño máx. de los mensajes es %d caracteres."
+msgstr[0] "Muy largo. El tamaño máx. por mensaje es de %d caracteres."
+msgstr[1] "Muy largo. El tamaño máx. por mensaje es de %d caracteres."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
 msgid "Recipient user not found."
 msgstr "No se encuentra usuario receptor."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
-msgstr "No se puede enviar mensajes directos a usuarios que no son tu amigo."
+msgstr "No puedes enviar mensajes directos a usuarios que no son tus amigos."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#, fuzzy
 msgid ""
 "Do not 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."
+msgstr "No te envíes un mensaje a ti mismo; sólo dilo para ti en voz baja."
 
 #. TRANS: Client error displayed when requesting a status with a non-existing ID.
 #. TRANS: Client error displayed when trying to remove a favourite with an invalid ID.
@@ -444,9 +443,8 @@ msgid "You cannot unfollow yourself."
 msgstr "No puedes dejar de seguirte a ti mismo."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
-msgstr "Deben proveerse dos IDs válidos o nombres en pantalla."
+msgstr "Son necesarios dos nombres de usuario o IDs válidos."
 
 #. TRANS: Client error displayed when a source user could not be determined showing friendship.
 msgid "Could not determine source user."
@@ -487,9 +485,8 @@ msgstr "La página de inicio no es un URL válido."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
-msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
+msgstr "Nombre demasiado largo (max. 255 carac.)"
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
@@ -502,20 +499,19 @@ msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
-msgstr[0] "La descripción es demasiado larga (máx. %d caracteres)."
-msgstr[1] "La descripción es demasiado larga (máx. %d caracteres)."
+msgstr[0] "Descripción demasiado larga (máx. %d caracteres)."
+msgstr[1] "Descripción demasiado larga (máx. %d caracteres)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
 #. TRANS: API validation exception thrown when location does not validate.
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#, fuzzy
 msgid "Location is too long (maximum 255 characters)."
-msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
+msgstr "Ubicación demasiado larga (máx. 255 caracteres)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
@@ -525,11 +521,11 @@ msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#, fuzzy, php-format
+#, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
-msgstr[0] "¡Muchos seudónimos! El máximo es %d."
-msgstr[1] "¡Muchos seudónimos! El máximo es %d."
+msgstr[0] "¡Muchos seudónimos! el máximo es %d."
+msgstr[1] "¡Muchos seudónimos! el máximo permitido es %d."
 
 #. TRANS: Client error shown when providing an invalid alias during group creation.
 #. TRANS: %s is the invalid alias.
@@ -601,8 +597,8 @@ msgstr "No se pudo eliminar al usuario %1$s del grupo %2$s."
 msgid "%s's groups"
 msgstr "Grupos de %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
-#, php-format
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
+#, fuzzy, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s grupos %2$s es un miembro de."
 
@@ -644,9 +640,8 @@ msgstr ""
 
 #. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
-msgstr "El alias no puede ser el mismo que el usuario."
+msgstr "El alias no puede ser el igual al nombre de usuario."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
 msgid "Upload failed."
@@ -765,20 +760,17 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Permitir"
 
 #. TRANS: Form instructions.
-#, fuzzy
 msgid "Authorize access to your account information."
-msgstr "Permitir o denegar el acceso a la información de tu cuenta."
+msgstr "Permitir el acceso a la información de tu cuenta."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#, fuzzy
 msgid "Authorization canceled."
-msgstr "Confirmación de mensajería instantánea cancelada."
+msgstr "Autorización cancelada"
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
@@ -787,21 +779,22 @@ msgid "The request token %s has been revoked."
 msgstr "El token de solicitud %2 ha sido denegado y revocado."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#, fuzzy
 msgid "You have successfully authorized the application"
-msgstr "No estás autorizado."
+msgstr "Has autorizado satisfactoriamente la aplicación."
 
 #. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
 msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
 msgstr ""
+"Por favor, vuelva a la aplicación e introduzca el siguiente código de "
+"seguridad para terminar el proceso."
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#, fuzzy, php-format
+#, php-format
 msgid "You have successfully authorized %s"
-msgstr "No estás autorizado."
+msgstr "Has sido autorizado correctamente %s"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
@@ -810,6 +803,8 @@ msgid ""
 "Please return to %s and enter the following security code to complete the "
 "process."
 msgstr ""
+"Por favor, regrese a %s e ingrese el siguiente código de seguridad para "
+"completar el proceso."
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
@@ -849,9 +844,9 @@ msgstr "Método de API no encontrado."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported format: %s."
-msgstr "Formato no soportado."
+msgstr "Formato no soportado: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
 msgid "Status deleted."
@@ -863,18 +858,17 @@ msgstr "No hay estado para ese ID"
 
 #. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
 msgid "Can only delete using the Atom format."
-msgstr ""
+msgstr "Sólo se puede eliminar usando el formato Atom."
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#, fuzzy
 msgid "Cannot delete this notice."
 msgstr "No se puede eliminar este mensaje."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted notice %d"
-msgstr "Borrar mensaje"
+msgstr "Aviso eliminado %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 msgid "Client must provide a 'status' parameter with a value."
@@ -882,11 +876,11 @@ msgstr "El cliente debe proveer un parámetro de 'status' con un valor."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
-msgstr[0] "El mensaje es muy largo. El tamaño máximo es de %d caracteres."
-msgstr[1] "El mensaje es muy largo. El tamaño máximo es de %d caracteres."
+msgstr[0] "Demasiado largo. El tamaño máximo es de %d caracteres."
+msgstr[1] "Demasiado largo. El tamaño máximo es de %d caracteres."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
 #, fuzzy
@@ -984,9 +978,8 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualizaciones etiquetadas con %1$s en %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#, fuzzy
 msgid "Only the user can add to their own timeline."
-msgstr "Sólo el usuario puede leer sus bandejas de correo."
+msgstr "Sólo el usuario puede leer su línea de tiempo."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 msgid "Only accept AtomPub for Atom feeds."
@@ -1006,7 +999,7 @@ msgstr "La publicación Atom debe ser una entrada Atom."
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
 msgid "Can only handle POST activities."
-msgstr ""
+msgstr "Solo se puede gestionar las actividades en POST"
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
@@ -1060,9 +1053,8 @@ msgid "Can only fave notices."
 msgstr "Sólo se pueden preferir los avisos."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown notice."
-msgstr "Nota desconocida."
+msgstr "Aviso desconocido."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
 msgid "Already a favorite."
@@ -1103,7 +1095,7 @@ msgstr "Todos los miembros"
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
 msgid "Blocked by admin."
-msgstr ""
+msgstr "Bloqueado por el administrador"
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
 #, fuzzy
@@ -1180,11 +1172,11 @@ msgstr "Personas suscritas a %s"
 
 #. TRANS: Client error displayed when not using the follow verb.
 msgid "Can only handle Follow activities."
-msgstr ""
+msgstr "Sólo es posible gestionar las actividades que sigues"
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
 msgid "Can only follow people."
-msgstr ""
+msgstr "Sólo puede seguir personas"
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
@@ -1194,9 +1186,9 @@ msgstr "Tipo de archivo desconocido"
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "¡Ya te has suscrito!"
+msgstr "Ya está suscrito a %s"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 msgid "No such attachment."
@@ -1281,9 +1273,8 @@ msgid "No file uploaded."
 msgstr "Ningún archivo fue subido."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#, fuzzy
 msgid "Pick a square area of the image to be your avatar."
-msgstr "Elige un área cuadrada para que sea tu imagen"
+msgstr "Selecciona un área de la imagen para que sea tu avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
@@ -1305,12 +1296,13 @@ msgstr "Imagen borrada."
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
 msgid "Backup account"
-msgstr ""
+msgstr "Cuenta de respaldo (backup)"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Sólo los usuarios que hayan accedido pueden repetir mensajes."
+msgstr ""
+"Sólo los usuarios que hayan accedido pueden hacer una copia de seguridad "
+"(backup) de sus cuentas."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
 msgid "You may not backup your account."
@@ -1333,7 +1325,7 @@ msgstr "Fondo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 msgid "Backup your account."
-msgstr ""
+msgstr "Hacer una copia de seguridad de su cuenta"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 msgid "You already blocked that user."
@@ -1366,7 +1358,6 @@ msgid "No"
 msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#, fuzzy
 msgid "Do not block this user."
 msgstr "No bloquear a este usuario"
 
@@ -1411,7 +1402,6 @@ msgid "Unblock user from group"
 msgstr "Desbloquear usuario de grupo"
 
 #. TRANS: Button text for unblocking a user from a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Desbloquear"
@@ -1635,9 +1625,8 @@ msgid "Do not delete this group."
 msgstr "No eliminar este grupo"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#, fuzzy
 msgid "Delete this group."
-msgstr "Borrar este grupo"
+msgstr "Eliminar este grupo."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to remove a favorite while not logged in.
@@ -1675,14 +1664,12 @@ msgid "Are you sure you want to delete this notice?"
 msgstr "¿Estás seguro de que quieres eliminar este aviso?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#, fuzzy
 msgid "Do not delete this notice."
-msgstr "No eliminar este mensaje"
+msgstr "No eliminar este mensaje."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#, fuzzy
 msgid "Delete this notice."
-msgstr "Borrar este mensaje"
+msgstr "Eliminar este mensaje"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 msgid "You cannot delete users."
@@ -2054,6 +2041,8 @@ msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
 msgstr ""
+"Para enviar avisos vía correo electrónico, necesitamos crear una dirección "
+"de correo electrónico exclusiva para usted en este servidor."
 
 #. 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.
@@ -2493,7 +2482,7 @@ msgstr "Bloquear"
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
 msgid "Block this user"
-msgstr ""
+msgstr "Bloquear a este usuario"
 
 #. TRANS: Form legend for form to make a user a group admin.
 msgid "Make user an admin of the group"
@@ -2515,7 +2504,6 @@ msgid "Updates from members of %1$s on %2$s!"
 msgstr "¡Actualizaciones de miembros de %1$s en %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupos"
@@ -2569,13 +2557,13 @@ msgstr "No se obtuvo resultados."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
 "action.newgroup%%) yourself."
 msgstr ""
-"Si no puedes encontrar el grupo que estás buscando, puedes [crearlo](%%"
-"action.newgroup%%) tú mismo."
+"Si no encuentras el grupo que estás buscando, puedes [crearlo](%%action."
+"newgroup%%) tú mismo."
 
 #. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
 #. TRANS: This message contains Markdown links in the form [link text](link).
@@ -2607,32 +2595,31 @@ msgstr "Configuración de mensajería instantánea"
 #. 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.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
 "(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
-"Puedes enviar y recibir avisos vía [mensajes instantáneos](%%doc.im%%) de "
+"Puedes enviar y recibir mensajes vía [mensajería instantána](%%doc.im%%) de "
 "Jabber/GTalk. Configura tu dirección y opciones abajo."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgid "IM is not available."
 msgstr "La mensajería instantánea no está disponible."
 
-#, fuzzy, php-format
+#, php-format
 msgid "Current confirmed %s address."
-msgstr "Actual dirección de correo electrónico confirmada"
+msgstr "Actual dirección de correo electrónico %s confirmada"
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
 "with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"A la espera de una confirmación para esta dirección. Busca en tu cuenta "
-"Jabber/GTalk un mensaje con más instrucciones. (¿Has añadido a %s a tu lista "
-"de amigos?)"
+"Esperando confirmación para esta dirección. Revisa tu cuenta Jabber/GTalk un "
+"mensaje con más instrucciones. (¿Has añadido a %s a tu lista de amigos?)"
 
 msgid "IM address"
 msgstr "Dirección de mensajería instantánea"
@@ -2766,14 +2753,13 @@ msgstr "Debes estar conectado para invitar otros usuarios a usar %s."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid email address: %s."
 msgstr "Dirección de correo electrónico inválida: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#, fuzzy
 msgid "Invitations sent"
-msgstr "Invitacion(es) enviada(s)"
+msgstr "Invitación(es) enviada(s)"
 
 #. TRANS: Page title when inviting potential users.
 msgid "Invite new users"
@@ -2955,11 +2941,11 @@ msgstr "Licencia"
 
 #. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
-msgstr ""
+msgstr "Licencia para este sitio de StatusNet"
 
 #. TRANS: Client error displayed selecting an invalid license in the license admin panel.
 msgid "Invalid license selection."
-msgstr ""
+msgstr "Selección de licencia incorrecta"
 
 #. TRANS: Client error displayed when not specifying an owner for the all rights reserved license in the license admin panel.
 msgid ""
@@ -2990,7 +2976,7 @@ msgstr ""
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License selection"
-msgstr ""
+msgstr "Selección de Licencia"
 
 #. TRANS: License option in the license admin panel.
 msgid "Private"
@@ -2998,11 +2984,11 @@ msgstr "Privado"
 
 #. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
-msgstr ""
+msgstr "Todos los derechos reservados"
 
 #. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
-msgstr ""
+msgstr "Creative Commons"
 
 #. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
@@ -3015,11 +3001,11 @@ msgstr "Seleccione un operador móvil"
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
-msgstr ""
+msgstr "Detalles de la licencia"
 
 #. TRANS: Field label in the license admin panel.
 msgid "Owner"
-msgstr ""
+msgstr "Propietario"
 
 #. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
@@ -3087,10 +3073,9 @@ msgstr ""
 "compartidos! "
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
-msgstr "Inicio de sesión"
+msgstr "Iniciar sesión"
 
 #. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
@@ -3456,7 +3441,6 @@ msgstr ""
 "Ésta es tu bandeja de salida, incluye la lista de mensajes privados enviados."
 
 #. TRANS: Title for page where to change password.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Change password"
 msgstr "Cambiar contraseña"
@@ -3480,24 +3464,20 @@ msgid "New password"
 msgstr "Nueva contraseña"
 
 #. TRANS: Field title on page where to change password.
-#, fuzzy
 msgid "6 or more characters."
-msgstr "6 o más caracteres"
+msgstr "6 o más caracteres."
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field title on page where to change password.
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#, fuzzy
 msgid "Same as password above."
-msgstr "Igual a la contraseña de arriba"
+msgstr "Igual a la contraseña de arriba."
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
 msgstr "Cambiar"
@@ -3510,7 +3490,6 @@ msgid "Passwords don't match."
 msgstr "Las contraseñas no coinciden"
 
 #. TRANS: Form validation error on page where to change password.
-#, fuzzy
 msgid "Incorrect old password."
 msgstr "Contraseña antigua incorrecta."
 
@@ -3521,7 +3500,6 @@ msgstr "Error al guardar el usuario; inválido."
 #. TRANS: Server error displayed on page where to change password when password change
 #. TRANS: could not be made because of a server error.
 #. TRANS: Reset password form validation error message.
-#, fuzzy
 msgid "Cannot save new password."
 msgstr "No se puede guardar la nueva contraseña."
 
@@ -3608,7 +3586,6 @@ msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "¿Usar URL amigables (más legibles y memorizables)?"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Tema"
@@ -3716,9 +3693,8 @@ msgid "Server for attachments."
 msgstr "Tema para el sitio."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Web path to attachments."
-msgstr "Sin archivo adjunto"
+msgstr "Ruta de acceso a los adjuntos"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 #, fuzzy
@@ -3735,7 +3711,6 @@ msgid "Directory where attachments are located."
 msgstr "Ruta del directorio de las configuraciones locales"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
@@ -3756,14 +3731,12 @@ msgid "Use SSL"
 msgstr "Usar SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "When to use SSL."
-msgstr "Cuándo utilizar SSL"
+msgstr "Cuándo utilizar SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server to direct SSL requests to."
-msgstr "Servidor hacia el cual dirigir las solicitudes SSL"
+msgstr "Servidor hacia el cual dirigir las solicitudes SSL."
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
 msgid "Save paths"
@@ -3798,7 +3771,7 @@ msgstr "Usuarios auto etiquetados con %1$s - página %2$d"
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
 msgid "Disabled"
-msgstr ""
+msgstr "Deshabilitado"
 
 #. TRANS: Client error displayed when trying to use another method than POST.
 #. TRANS: Do not translate POST.
@@ -3808,25 +3781,22 @@ msgid "This action only accepts POST requests."
 msgstr "Esta acción sólo acepta solicitudes POST."
 
 #. TRANS: Client error displayed when trying to enable or disable a plugin without access rights.
-#, fuzzy
 msgid "You cannot administer plugins."
-msgstr "No puedes borrar usuarios."
+msgstr "Usted no puede administrar los plugins."
 
 #. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
-#, fuzzy
 msgid "No such plugin."
-msgstr "No existe tal página."
+msgstr "El plugin no existe."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgctxt "plugin"
 msgid "Enabled"
-msgstr ""
+msgstr "Habilitado"
 
 #. TRANS: Tab and title for plugins admin panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Plugins"
-msgstr "Complementos"
+msgstr "Plugins"
 
 #. TRANS: Instructions at top of plugin admin page.
 msgid ""
@@ -4006,9 +3976,8 @@ msgstr "Se guardó configuración."
 
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
-#, fuzzy
 msgid "Restore account"
-msgstr "Crear una cuenta"
+msgstr "Restaurar cuenta"
 
 #. TRANS: Client error displayed when requesting a public timeline page beyond the page limit.
 #. TRANS: %s is the page limit.
@@ -4101,9 +4070,9 @@ msgstr "Nube de etiquetas pública"
 
 #. TRANS: Instructions (more used like an explanation/header).
 #. TRANS: %s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "These are most popular recent tags on %s"
-msgstr "Estas son las etiquetas recientes más populares en %s "
+msgstr "Estas son las etiquetas recientes más populares en %s"
 
 #. TRANS: This message contains a Markdown URL. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
@@ -4193,7 +4162,6 @@ msgid "Recover"
 msgstr "Recuperar"
 
 #. TRANS: Button text on password recovery page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Recuperar"
@@ -4212,22 +4180,19 @@ msgid "Password recovery requested"
 msgstr "Recuperación de contraseña solicitada"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#, fuzzy
 msgid "Password saved"
-msgstr "Se guardó la contraseña."
+msgstr "Contraseña guardada."
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 msgid "Unknown action"
 msgstr "Acción desconocida"
 
 #. TRANS: Title for field label for password reset form.
-#, fuzzy
 msgid "6 or more characters, and do not forget it!"
-msgstr "6 o más caracteres, ¡no te olvides!"
+msgstr "6 o más caracteres, ¡y no la olvides!"
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Restablecer"
@@ -4261,7 +4226,6 @@ msgid "Unexpected password reset."
 msgstr "Restablecimiento de contraseña inesperado."
 
 #. TRANS: Reset password form validation error message.
-#, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "La contraseña debe tener 6 o más caracteres."
 
@@ -4281,9 +4245,9 @@ msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
 msgid "No id parameter"
 msgstr "No existe argumento de ID."
 
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\""
-msgstr "No existe tal archivo."
+msgstr "No existe el archivo %d"
 
 msgid "Sorry, only invited people can register."
 msgstr "Disculpa, sólo personas invitadas pueden registrarse."
@@ -4300,7 +4264,6 @@ msgstr "Registrarse"
 msgid "Registration not allowed."
 msgstr "Registro de usuario no permitido."
 
-#, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "No puedes registrarte si no estás de acuerdo con la licencia."
 
@@ -4310,27 +4273,23 @@ msgstr "La dirección de correo electrónico ya existe."
 msgid "Invalid username or password."
 msgstr "Usuario o contraseña inválidos."
 
-#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 "Con este formulario puedes crear una nueva cuenta. Después podrás publicar "
-"avisos y enviar vínculos de ellos a tus amigos y colegas. "
+"mensajes y enviar vínculos de ellos a tus amigos y colegas."
 
 msgid "Email"
 msgstr "Correo electrónico"
 
-#, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
-"Se usa sólo para actualizaciones, anuncios y recuperación de contraseñas"
+"Sólo se usa para actualizaciones, anuncios y recuperación de contraseñas"
 
-#, fuzzy
 msgid "Longer name, preferably your \"real\" name."
-msgstr "Nombre más largo, preferiblemente tu nombre \"real\""
+msgstr "Nombre largo, preferiblemente tu nombre \"real\""
 
-#, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
 
@@ -4422,7 +4381,6 @@ msgstr "Suscribirse a un usuario remoto"
 msgid "User nickname"
 msgstr "Usuario"
 
-#, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Usuario a quien quieres seguir"
 
@@ -4597,9 +4555,8 @@ msgid ""
 msgstr ""
 
 #. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
-#, fuzzy
 msgid "Upload the file"
-msgstr "Subir archivo"
+msgstr "Subir el archivo"
 
 msgid "You cannot revoke user roles on this site."
 msgstr "No puedes revocar funciones de usuario en este sitio."
@@ -4746,18 +4703,6 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "grupo %1$s, página %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Nota"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Alias"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Acciones del grupo"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4798,7 +4743,6 @@ msgstr "Todos los miembros"
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Creado"
@@ -4869,6 +4813,10 @@ msgstr "Mensaje de %1$s en %2$s"
 msgid "Notice deleted."
 msgstr "Mensaje borrado"
 
+#, fuzzy
+msgid "Notice"
+msgstr "Mensajes"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5212,9 +5160,8 @@ msgstr ""
 "informarnos al %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#, fuzzy
 msgid "No code entered."
-msgstr "No ingresó código"
+msgstr "No ingresó el código"
 
 #. TRANS: Menu item for site administration
 msgid "Snapshots"
@@ -5300,13 +5247,12 @@ msgid "These are the people who listen to %s's notices."
 msgstr "Estas son las personas que escuchan los avisos de %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
 msgstr ""
 "No tienes suscriptores. Intenta suscribirte a gente que conozcas y puede que "
-"te devuelvan el favor"
+"te devuelvan el favor."
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user other
 #. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
@@ -5409,7 +5355,6 @@ msgstr "No existe argumento de ID."
 msgid "Tag %s"
 msgstr "%s etiqueta"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Perfil de usuario"
 
@@ -5610,26 +5555,22 @@ msgstr ""
 "haz clic en \"Cancelar\"."
 
 #. TRANS: Button text on Authorise Subscription page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aceptar"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
 msgid "Subscribe to this user."
-msgstr "Suscribirse a este usuario"
+msgstr "Suscribirse a este usuario."
 
 #. TRANS: Button text on Authorise Subscription page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rechazar"
 
 #. TRANS: Title for button on Authorise Subscription page.
-#, fuzzy
 msgid "Reject this subscription."
-msgstr "Rechazar esta suscripción"
+msgstr "Rechazar esta suscripción."
 
 #. TRANS: Client error displayed for an empty authorisation request.
 msgid "No authorization request!"
@@ -6133,6 +6074,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Acciones de usuario"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Eliminación de usuario en curso..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Editar configuración del perfil"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Editar"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Enviar un mensaje directo a este usuario"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Mensaje"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderar"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Rol de usuario"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrador"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderador"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6145,10 +6129,9 @@ msgstr "Página sin título"
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
 msgctxt "TOOLTIP"
 msgid "Show more"
-msgstr ""
+msgstr "Ver más"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "Responder"
@@ -6157,9 +6140,8 @@ msgstr "Responder"
 msgid "Write a reply..."
 msgstr ""
 
-#, fuzzy
 msgid "Status"
-msgstr "StatusNet"
+msgstr "Estado"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6283,9 +6265,9 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "Buscar en el contenido de mensajes"
 
-#, fuzzy, php-format
+#, php-format
 msgid "No such user %s."
-msgstr "No existe ese usuario."
+msgstr "Este usuario no existe %s"
 
 #. TRANS: Client exception thrown when post to collection fails with a 400 status.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
@@ -6293,10 +6275,10 @@ msgstr "No existe ese usuario."
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
 #. TRANS: Exception thrown when post to collection fails with a status that is not handled.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
-#, fuzzy, php-format
+#, php-format
 msgctxt "URLSTATUSREASON"
 msgid "%1$s %2$s %3$s"
-msgstr "%1$s - %2$s"
+msgstr "%1$s %2$s %3$s"
 
 #. TRANS: Client exception thrown when there is no source attribute.
 msgid "Can't handle remote content yet."
@@ -6390,9 +6372,8 @@ msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "Configuración de rutas"
+msgstr "Configuración de plugins"
 
 #. TRANS: Client error 401.
 msgid "API resource requires read-write access, but you only have read access."
@@ -6421,9 +6402,8 @@ msgid "Could not authenticate you."
 msgstr "No ha sido posible autenticarte."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
-#, fuzzy
 msgid "Could not create anonymous consumer."
-msgstr "No fue posible crear alias."
+msgstr "No fue posible crear usuario anónimo."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth application.
 #, fuzzy
@@ -6529,7 +6509,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 msgid " by "
-msgstr ""
+msgstr "por "
 
 #. TRANS: Application access type
 msgid "read-write"
@@ -6577,9 +6557,8 @@ msgid "Password changing failed."
 msgstr "El cambio de contraseña ha fallado"
 
 #. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
-#, fuzzy
 msgid "Password changing is not allowed."
-msgstr "No está permitido cambiar la contraseña"
+msgstr "El cambio de contraseña no está permitido"
 
 #. TRANS: Title for the form to block a user.
 msgid "Block"
@@ -6866,85 +6845,172 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Eres miembro de este grupo:"
 msgstr[1] "Eres miembro de estos grupos:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"comandos:\n"
-"on - activar notificaciones\n"
-"off - desactivar notificaciones\n"
-"help - mostrar esta ayuda\n"
-"follow <usuario> - suscribirse al usuario\n"
-"groups - listar los grupos que sigues\n"
-"subscriptions - listar las personas que sigues\n"
-"subscribers - listar los grupos que te siguen\n"
-"leave <usuario> - cancelar la suscripción al usuario\n"
-"d <usuario> <text> - dirigir mensaje al usuario\n"
-"get <usuario> - obtener último aviso del usuario\n"
-"whois <usuario> - obtener información del perfil del usuario\n"
-"lose <usuario> - obligar al usuario a que deje de seguirte\n"
-"fav <usuario> - añadir el último aviso del usario a tus favoritos\n"
-"fav #<id_aviso> - añadir el aviso con el ID dado a tus favoritos\n"
-"repeat #<id_aviso> - repetir el aviso con el ID dado\n"
-"repeat <usuario> - repetir el último aviso del usuario\n"
-"reply #<id_aviso> - responder al aviso del ID dado\n"
-"reply <usuario> - responder al último aviso del usuario\n"
-"join <grupo> - unirse a un grupo\n"
-"login - obtener un vínculo para iniciar sesión en la interfaz Web\n"
-"drop <grupo> - abandonar el grupo\n"
-"stats - obtener tus estadísticas\n"
-"stop - igual que 'desactivar'\n"
-"quit - igual que 'desactivar'\n"
-"sub <usuario> - igual que 'seguir'\n"
-"unsub <usuario> - igual que 'abandonar'\n"
-"last <usuario> - igual que 'obtener'\n"
-"on <usuario> - aún sin implementar.\n"
-"off <usuario> - aún sin implementar.\n"
-"nudge <usuario> - recordarle a un ausuario que actualice.\n"
-"invite <phone number> - aún sin implementar.\n"
-"track <word> - aún sin implementar.\n"
-"untrack <word> - aún sin implementar.\n"
-"track off - aún sin implementar.\n"
-"untrack all - aún sin implementar.\n"
-"tracks - aún sin implementar.\n"
-"tracking - aún sin implementar.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Resultados de comando"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "No se puede activar notificación."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "No se puede desactivar notificación."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Suscribirse a este usuario"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Desuscribirse de este usuario"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Mensajes directos a %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Información del perfil"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Repetir este mensaje."
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Responder a este mensaje."
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Desconocido"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Borrar grupo"
+
+#. TRANS: Help message for IM/SMS command "stats"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr "Actualiza tu estado."
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Todavía no se implementa comando."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -7010,13 +7076,11 @@ msgstr ""
 "permitido es 2 MB."
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
-#, fuzzy
 msgctxt "RADIO"
 msgid "On"
 msgstr "Activar"
 
 #. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
-#, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Desactivar"
@@ -7085,7 +7149,7 @@ msgstr ""
 
 #. TRANS: Header for feed links (h2).
 msgid "Feeds"
-msgstr ""
+msgstr "Feeds"
 
 msgid "All"
 msgstr "Todo"
@@ -7130,6 +7194,9 @@ msgstr ""
 "Ubicación del grupo, si existe, por ejemplo \"Ciudad, Estado (o Región), País"
 "\""
 
+msgid "Aliases"
+msgstr "Alias"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7209,6 +7276,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Añadir o modificar el diseño %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Acciones del grupo"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grupos con mayor cantidad de miembros"
@@ -7320,7 +7391,7 @@ msgstr "Confirmación de correo electrónico"
 #. TRANS: Body for address confirmation email.
 #. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
 #. TRANS: %3$s is the URL to confirm at.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Hey, %1$s.\n"
 "\n"
@@ -7335,19 +7406,19 @@ msgid ""
 "Thanks for your time, \n"
 "%2$s\n"
 msgstr ""
-"¡Hola, %s!\n"
+"Hola, %1$s !\n"
 "\n"
-"Hace un momento, alguien introdujo esta dirección de correo electrónico en %"
-"s.\n"
+"Hace un momento, alguien introdujo esta dirección de correo electrónico en %2"
+"$s.\n"
 "\n"
-"Si has sido tú y deseas confirmarlo, haz clic en el vínculo de abajo:\n"
+"Si fuiste tú y deseas confirmarlo, haz clic en el vínculo de abajo:\n"
 "\n"
-"%s\n"
+"%3$s\n"
 "\n"
 "Si no, simplemente ignora este mensaje.\n"
 "\n"
 "Gracias por tu tiempo, \n"
-"%s\n"
+"%2$s\n"
 
 #. TRANS: Subject of new-subscriber notification e-mail.
 #. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
@@ -7371,7 +7442,7 @@ msgstr ""
 #. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
 #. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
 #. TRANS: %7$s is a link to the addressed user's e-mail settings.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"
@@ -7395,7 +7466,7 @@ msgstr ""
 "%7$s.\n"
 "\n"
 "----\n"
-"Cambia tus preferencias de notificaciones a tu correo electrónico en  %8$s\n"
+"Cambia tu correo electrónico o las opciones de notificación en  %7$s\n"
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
@@ -7450,7 +7521,7 @@ msgstr "%s: Confirma que este es tu número de teléfono mediante este código:"
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#, fuzzy, php-format
+#, php-format
 msgid "You have been nudged by %s"
 msgstr "%s te ha dado un toque"
 
@@ -7527,9 +7598,9 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
-msgstr "%s (@%s) agregó tu mensaje a los favoritos"
+msgstr "%1$s (@%2$s) agregó tu mensaje como favorito."
 
 #. TRANS: Body for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
@@ -7585,9 +7656,9 @@ msgstr ""
 
 #. TRANS: E-mail subject for notice notification.
 #. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
-msgstr "%s (@%s) ha enviado un aviso a tu atención"
+msgstr "%1$s (@%2$s) ha enviado un aviso para tu atención"
 
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's long name, $2$s is the StatusNet sitename,
@@ -7729,9 +7800,8 @@ msgid "Select recipient:"
 msgstr "Seleccione un operador móvil"
 
 #. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
-#, fuzzy
 msgid "No mutual subscribers."
-msgstr "¡No estás suscrito!"
+msgstr "Sin suscripción mutua"
 
 msgid "To"
 msgstr "Para"
@@ -7740,9 +7810,8 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Enviar"
 
-#, fuzzy
 msgid "Messages"
-msgstr "Mensaje"
+msgstr "Mensajes"
 
 msgid "from"
 msgstr "desde"
@@ -7781,13 +7850,13 @@ msgstr "Enviar un mensaje"
 msgid "What's up, %s?"
 msgstr "¿Qué tal, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Adjuntar"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "Adjuntar un archivo"
+msgstr "Adjuntar archivo"
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -7850,7 +7919,7 @@ msgid "Notice repeated"
 msgstr "Mensaje repetido"
 
 msgid "Update your status..."
-msgstr ""
+msgstr "Actualiza tu estado."
 
 msgid "Nudge this user"
 msgstr "Dar un toque a este usuario"
@@ -7898,12 +7967,12 @@ msgstr "Desconocido"
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "Deshabilitado"
 
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "Habilitado"
 
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
@@ -7932,9 +8001,8 @@ msgstr "Iniciar sesión en el sitio"
 msgid "Search"
 msgstr "Buscar"
 
-#, fuzzy
 msgid "Search the site"
-msgstr "Buscar sitio"
+msgstr "Buscar en el sitio"
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
@@ -8212,7 +8280,6 @@ msgid "Top posters"
 msgstr "Principales posteadores"
 
 #. TRANS: Title for the form to unblock a user.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Desbloquear"
@@ -8241,52 +8308,6 @@ msgstr "Cancelar suscripción"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "El usuario no tiene un perfil."
 
-msgid "Edit Avatar"
-msgstr "Editar imagen"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Acciones de usuario"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Eliminación de usuario en curso..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Editar configuración del perfil"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Editar"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Enviar un mensaje directo a este usuario"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Mensaje"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderar"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Rol de usuario"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrador"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderador"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "No conectado."
@@ -8362,3 +8383,88 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Nota"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "comandos:\n"
+#~ "on - activar notificaciones\n"
+#~ "off - desactivar notificaciones\n"
+#~ "help - mostrar esta ayuda\n"
+#~ "follow <usuario> - suscribirse al usuario\n"
+#~ "groups - listar los grupos que sigues\n"
+#~ "subscriptions - listar las personas que sigues\n"
+#~ "subscribers - listar los grupos que te siguen\n"
+#~ "leave <usuario> - cancelar la suscripción al usuario\n"
+#~ "d <usuario> <text> - dirigir mensaje al usuario\n"
+#~ "get <usuario> - obtener último aviso del usuario\n"
+#~ "whois <usuario> - obtener información del perfil del usuario\n"
+#~ "lose <usuario> - obligar al usuario a que deje de seguirte\n"
+#~ "fav <usuario> - añadir el último aviso del usario a tus favoritos\n"
+#~ "fav #<id_aviso> - añadir el aviso con el ID dado a tus favoritos\n"
+#~ "repeat #<id_aviso> - repetir el aviso con el ID dado\n"
+#~ "repeat <usuario> - repetir el último aviso del usuario\n"
+#~ "reply #<id_aviso> - responder al aviso del ID dado\n"
+#~ "reply <usuario> - responder al último aviso del usuario\n"
+#~ "join <grupo> - unirse a un grupo\n"
+#~ "login - obtener un vínculo para iniciar sesión en la interfaz Web\n"
+#~ "drop <grupo> - abandonar el grupo\n"
+#~ "stats - obtener tus estadísticas\n"
+#~ "stop - igual que 'desactivar'\n"
+#~ "quit - igual que 'desactivar'\n"
+#~ "sub <usuario> - igual que 'seguir'\n"
+#~ "unsub <usuario> - igual que 'abandonar'\n"
+#~ "last <usuario> - igual que 'obtener'\n"
+#~ "on <usuario> - aún sin implementar.\n"
+#~ "off <usuario> - aún sin implementar.\n"
+#~ "nudge <usuario> - recordarle a un ausuario que actualice.\n"
+#~ "invite <phone number> - aún sin implementar.\n"
+#~ "track <word> - aún sin implementar.\n"
+#~ "untrack <word> - aún sin implementar.\n"
+#~ "track off - aún sin implementar.\n"
+#~ "untrack all - aún sin implementar.\n"
+#~ "tracks - aún sin implementar.\n"
+#~ "tracking - aún sin implementar.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Editar imagen"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 443e410308..5dc14bc11d 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -4,6 +4,7 @@
 # Author: ArianHT
 # Author: Brion
 # Author: Choxos
+# Author: Ebraminio
 # Author: Everplays
 # Author: Mjbmr
 # Author: Narcissus
@@ -16,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:04+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:33+0000\n"
 "Last-Translator: Ahmad Sufi Mahmudi\n"
 "Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
 "MIME-Version: 1.0\n"
@@ -26,9 +27,9 @@ msgstr ""
 "X-Language-Code: fa\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -299,7 +300,6 @@ msgid "Could not update your design."
 msgstr "نمی‌توان طرح‌تان به‌هنگام‌سازی کرد."
 
 #. TRANS: Title for Atom feed.
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
 msgstr "اصلی"
@@ -324,14 +324,14 @@ msgstr "%s اشتراک"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "برگزیده‌ها"
+msgstr "%s مورد علاقهٔ شما"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
-msgstr "اعضای گروه %s"
+msgstr "%s عضو"
 
 #. TRANS: Client error displayed when users try to block themselves.
 msgid "You cannot block yourself!"
@@ -592,7 +592,7 @@ msgstr "خارج شدن %s از گروه %s نا موفق بود"
 msgid "%s's groups"
 msgstr "گروه‌های %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, fuzzy, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "هست عضو %s گروه"
@@ -1051,9 +1051,8 @@ msgid "Can only fave notices."
 msgstr "پیدا کردن محتوای پیام‌ها"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown notice."
-msgstr "ناشناخته"
+msgstr "اعلان ناشناخته."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
 #, fuzzy
@@ -1084,9 +1083,8 @@ msgid "Can only handle join activities."
 msgstr "پیدا کردن محتوای پیام‌ها"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#, fuzzy
 msgid "Unknown group."
-msgstr "ناشناخته"
+msgstr "گروه ناشناخته."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
 #, fuzzy
@@ -1260,13 +1258,11 @@ msgstr "حذف"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
-msgstr "پایین‌گذاری"
+msgstr "بارگذاری"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "برش"
@@ -1322,10 +1318,9 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "پیش‌زمینه"
+msgstr "پشتیبان‌گیری"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 msgid "Backup your account."
@@ -1492,7 +1487,7 @@ msgstr "شما نمی‌توانید کاربران را پاک کنید."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
 msgid "I am sure."
-msgstr ""
+msgstr "من مطمئن هستم."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
@@ -1501,15 +1496,13 @@ msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
-#, fuzzy
 msgid "Account deleted."
-msgstr "چهره پاک شد."
+msgstr "حساب کاربری حذف شد."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#, fuzzy
 msgid "Delete account"
-msgstr "ساختن یک جساب‌کاربری"
+msgstr "حذف حساب کاربری"
 
 #. TRANS: Form text for user deletion form.
 msgid ""
@@ -1532,9 +1525,9 @@ msgstr "تایید"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#, fuzzy, php-format
+#, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
-msgstr "شما نمی‌توانید کاربران را پاک کنید."
+msgstr "«%s» را برای تأیید اینکه می‌خواهید حسابتان حذف شود وارد کنید."
 
 #. TRANS: Button title for user account deletion.
 #, fuzzy
@@ -1613,9 +1606,8 @@ msgstr "%1$s گروه %2$s را ترک کرد"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#, fuzzy
 msgid "Delete group"
-msgstr "حذف کاربر"
+msgstr "حذف گروه"
 
 #. TRANS: Warning in form for deleleting a group.
 #, fuzzy
@@ -4710,18 +4702,6 @@ msgstr "گروه %s"
 msgid "%1$s group, page %2$d"
 msgstr "گروه %1$s، صفحهٔ %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "یادداشت"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "نام های مستعار"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "اعمال گروه"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4835,6 +4815,10 @@ msgstr "پیام از %1$s در %2$s"
 msgid "Notice deleted."
 msgstr "پیام پاک شد."
 
+#, fuzzy
+msgid "Notice"
+msgstr "پیام‌ها"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5371,7 +5355,6 @@ msgstr "هیچ پیوستی وجود ندارد."
 msgid "Tag %s"
 msgstr "برچسب %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "نمایهٔ کاربر"
 
@@ -6076,6 +6059,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "اعمال کاربر"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "پاک‌کردن کاربر در حالت اجرا است..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "ویرایش تنظیمات نمایه"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "ویرایش"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "پیام مستقیم به این کاربر بفرستید"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "پیام"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "اداره کردن"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "وظیفهٔ کاربر"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "رئیس"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "مدیر"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6797,85 +6823,171 @@ msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "شما یک عضو این گروه هستید:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"دستورات:\n"
-"on - روشن‌کردن آگاه‌سازی‌ها\n"
-"off - خاموش‌کردن آگاه‌سازی‌ها\n"
-"help - نشان دادن این کمک\n"
-"follow <nickname> - مشترک کاربر شدن\n"
-"groups - گروه‌هایی را که به آن‌ها پیوسته‌اید، فهرست می‌کند\n"
-"subscriptions - افرادی را که دنبال می‌کنید، فهرست می‌کند\n"
-"subscribers - کاربرانی را که شما را دنبال می‌کنند، فهرست می‌کند\n"
-"leave <nickname> - لغو اشتراک از کاربر\n"
-"d <nickname> <text> - پیام مستقیم به کاربر\n"
-"get <nickname> - دریافت آخرین پیام از کاربر\n"
-"whois <nickname> - دریافت اطلاعات نمایهٔ کاربر\n"
-"lose <nickname> - وادار کردن کاربر به توقف دنبال‌کردن شما\n"
-"fav <nickname> - افزودن آخرین پیام کاربر به عنوان برگزیده\n"
-"fav #<notice_id> - افزودن پیام با یک شناسهٔ داده‌شده به عنوان برگزیده\n"
-"repeat #<notice_id> - تکرار کردن یک پیام با یک شناسهٔ داده‌شده\n"
-"repeat <nickname> - تکرار کردن آخرین پیام از کاربر\n"
-"reply #<notice_id> - پاسخ‌دادن به یک پیام با یک شناسهٔ داده‌شده\n"
-"reply <nickname> - پاسخ‌دادن به آخرین پیام از کاربر\n"
-"join <group> - پیوستن به گروه\n"
-"login - دریافت یک پیوند برای واردشدن به رابط وب\n"
-"drop <group> - ترک‌کردن گروه\n"
-"stats - دریافت آمار شما\n"
-"stop - مانند «off»\n"
-"quit - مانند «off»\n"
-"sub <nickname> - مانند «follow»\n"
-"unsub <nickname> - مانند «leave»\n"
-"last <nickname> - مانند «get»\n"
-"on <nickname> - هنوز پیاده نشده است.\n"
-"off <nickname> - هنوز پیاده نشده است.\n"
-"nudge <nickname> - یادآوری‌کردن به یک کاربر برای به‌روز کردن\n"
-"invite <phone number> - هنوز پیاده نشده است.\n"
-"track <word> - هنوز پیاده نشده است.\n"
-"untrack <word> - هنوز پیاده نشده است.\n"
-"track off - هنوز پیاده نشده است.\n"
-"untrack all - هنوز پیاده نشده است.\n"
-"tracks - هنوز پیاده نشده است.\n"
-"tracking - هنوز پیاده نشده است.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "نتیجه دستور"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "ناتوان در روشن کردن آگاه سازی."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "ناتوان در خاموش کردن آگاه سازی."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "مشترک شدن این کاربر"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "لغو مشترک‌شدن از این کاربر"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "پیام‌های مستقیم به %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "اطلاعات نمایه"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "تکرار این پیام"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "به این پیام پاسخ دهید"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "گروه ناشناخته."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "حذف گروه"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "دستور هنوز پیاده نشده است."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -7058,6 +7170,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "مکان گروه، در صورت وجود داشتن، مانند «شهر، ایالت (یا استان)، کشور»"
 
+msgid "Aliases"
+msgstr "نام های مستعار"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7135,6 +7250,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "اعمال گروه"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "گروه های با اعضاء بیشتر"
@@ -7698,6 +7817,7 @@ msgstr "فرستادن یک پیام"
 msgid "What's up, %s?"
 msgstr "چه خبر، %s؟"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "پیوست کردن"
 
@@ -8159,52 +8279,6 @@ msgstr "لغو اشتراک"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "کاربر هیچ نمایه‌ای ندارد."
 
-msgid "Edit Avatar"
-msgstr "ویرایش اواتور"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "اعمال کاربر"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "پاک‌کردن کاربر در حالت اجرا است..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "ویرایش تنظیمات نمایه"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "ویرایش"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "پیام مستقیم به این کاربر بفرستید"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "پیام"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "اداره کردن"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "وظیفهٔ کاربر"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "رئیس"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "مدیر"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "شما به سیستم وارد نشده اید."
@@ -8276,3 +8350,88 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "یادداشت"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "دستورات:\n"
+#~ "on - روشن‌کردن آگاه‌سازی‌ها\n"
+#~ "off - خاموش‌کردن آگاه‌سازی‌ها\n"
+#~ "help - نشان دادن این کمک\n"
+#~ "follow <nickname> - مشترک کاربر شدن\n"
+#~ "groups - گروه‌هایی را که به آن‌ها پیوسته‌اید، فهرست می‌کند\n"
+#~ "subscriptions - افرادی را که دنبال می‌کنید، فهرست می‌کند\n"
+#~ "subscribers - کاربرانی را که شما را دنبال می‌کنند، فهرست می‌کند\n"
+#~ "leave <nickname> - لغو اشتراک از کاربر\n"
+#~ "d <nickname> <text> - پیام مستقیم به کاربر\n"
+#~ "get <nickname> - دریافت آخرین پیام از کاربر\n"
+#~ "whois <nickname> - دریافت اطلاعات نمایهٔ کاربر\n"
+#~ "lose <nickname> - وادار کردن کاربر به توقف دنبال‌کردن شما\n"
+#~ "fav <nickname> - افزودن آخرین پیام کاربر به عنوان برگزیده\n"
+#~ "fav #<notice_id> - افزودن پیام با یک شناسهٔ داده‌شده به عنوان برگزیده\n"
+#~ "repeat #<notice_id> - تکرار کردن یک پیام با یک شناسهٔ داده‌شده\n"
+#~ "repeat <nickname> - تکرار کردن آخرین پیام از کاربر\n"
+#~ "reply #<notice_id> - پاسخ‌دادن به یک پیام با یک شناسهٔ داده‌شده\n"
+#~ "reply <nickname> - پاسخ‌دادن به آخرین پیام از کاربر\n"
+#~ "join <group> - پیوستن به گروه\n"
+#~ "login - دریافت یک پیوند برای واردشدن به رابط وب\n"
+#~ "drop <group> - ترک‌کردن گروه\n"
+#~ "stats - دریافت آمار شما\n"
+#~ "stop - مانند «off»\n"
+#~ "quit - مانند «off»\n"
+#~ "sub <nickname> - مانند «follow»\n"
+#~ "unsub <nickname> - مانند «leave»\n"
+#~ "last <nickname> - مانند «get»\n"
+#~ "on <nickname> - هنوز پیاده نشده است.\n"
+#~ "off <nickname> - هنوز پیاده نشده است.\n"
+#~ "nudge <nickname> - یادآوری‌کردن به یک کاربر برای به‌روز کردن\n"
+#~ "invite <phone number> - هنوز پیاده نشده است.\n"
+#~ "track <word> - هنوز پیاده نشده است.\n"
+#~ "untrack <word> - هنوز پیاده نشده است.\n"
+#~ "track off - هنوز پیاده نشده است.\n"
+#~ "untrack all - هنوز پیاده نشده است.\n"
+#~ "tracks - هنوز پیاده نشده است.\n"
+#~ "tracking - هنوز پیاده نشده است.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "ویرایش اواتور"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 98f6370d3e..fcde77fab6 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -15,17 +15,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:06+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:34+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -388,7 +388,7 @@ msgstr ""
 #. TRANS: Client error displayed trying to direct message self (403).
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
-msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi."
+msgstr "Et voi lähettää viestiä itsellesi. Kuiskaa se hiljaa itsellesi."
 
 #. TRANS: Client error displayed when requesting a status with a non-existing ID.
 #. TRANS: Client error displayed when trying to remove a favourite with an invalid ID.
@@ -588,10 +588,10 @@ msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s."
 msgid "%s's groups"
 msgstr "Käyttäjän %s ryhmät"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
-msgstr "%1$s ryhmät, joiden jäsen %2$s on."
+msgstr "Sivuston %1$s ryhmät, joiden jäsen %2$s on."
 
 #. TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
@@ -1244,7 +1244,7 @@ msgstr "Poista"
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
 msgctxt "BUTTON"
 msgid "Upload"
-msgstr "Lataa"
+msgstr "Tallenna"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
 msgctxt "BUTTON"
@@ -1512,11 +1512,11 @@ msgstr "Vahvista"
 #. TRANS: %s is the text that needs to be input.
 #, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
-msgstr "Anna \"%s\" varmistaaksesi että haluat todella poistaa käyttäjätilisi."
+msgstr "Kirjoita ”%s”, jos haluat todella poistaa käyttäjätilisi."
 
 #. TRANS: Button title for user account deletion.
 msgid "Permanently delete your account"
-msgstr "Poista käyttäjätilisi lopullisesti"
+msgstr "Poista käyttäjätilini lopullisesti"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1839,7 +1839,7 @@ msgstr "Lisää suosikkeihin"
 #. TRANS: %s is the non-existing document.
 #, php-format
 msgid "No such document \"%s\"."
-msgstr "Dokumenttia \"%s\" ei ole."
+msgstr "Dokumenttia ”%s” ei ole."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
@@ -1858,7 +1858,7 @@ msgstr "Sovellusta ei ole."
 
 #. TRANS: Instructions for "Edit application" form.
 msgid "Use this form to edit your application."
-msgstr "Käytä tätä lomaketta muokataksesi sovellustasi."
+msgstr "Käytä tätä lomaketta sovelluksesi muokkaamiseen."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
 #. TRANS: Validation error shown when not providing a name in the "New application" form.
@@ -2339,9 +2339,8 @@ msgid ""
 "will be removed from the group, unable to post, and unable to subscribe to "
 "the group in the future."
 msgstr ""
-"Haluatko varmasti estää käyttäjän \"%1$s\" ryhmästä \"%2$s\"? Heidät "
-"poistetaan ryhmästä, eivät voi lähettää päivityksiä, ja eivät voi enää "
-"liittyä ryhmään."
+"Haluatko varmasti estää käyttäjän %1$s ryhmästä %2$s? Estetty käyttäjä "
+"poistetaan ryhmästä, hän ei voi lähettää päivityksiä, eikä liittyä ryhmään."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 msgid "Do not block this user from this group."
@@ -2395,7 +2394,7 @@ msgstr "Ryhmän logo"
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
-msgstr "Voit ladata ryhmälle logokuvan. Maksimikoko on %s."
+msgstr "Voit ladata ryhmälle logokuvan. Kuvan enimmäiskoko on %s."
 
 #. TRANS: Submit button for uploading a group logo.
 msgid "Upload"
@@ -4688,18 +4687,6 @@ msgstr "Ryhmä %s"
 msgid "%1$s group, page %2$d"
 msgstr "Ryhmät, sivu %d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Huomaa"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Aliakset"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Ryhmän toiminnot"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4805,6 +4792,10 @@ msgstr "Viesti käyttäjältä %1$s, %2$s"
 msgid "Notice deleted."
 msgstr "Päivitys on poistettu."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Päivitykset"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5336,7 +5327,6 @@ msgstr "Ei id parametria."
 msgid "Tag %s"
 msgstr "Tagi %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Käyttäjän profiili"
 
@@ -6057,6 +6047,52 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Käyttäjän toiminnot"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Profiiliasetukset"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Lähetä suora viesti tälle käyttäjälle"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Viesti"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+#, fuzzy
+msgid "User role"
+msgstr "Käyttäjän profiili"
+
+#. TRANS: Role that can be set for a user profile.
+#, fuzzy
+msgctxt "role"
+msgid "Administrator"
+msgstr "Ylläpitäjät"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr ""
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, fuzzy, php-format
 msgid "%1$s - %2$s"
@@ -6803,46 +6839,170 @@ 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."
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Komennon tulos"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Ilmoituksia ei voi pistää päälle."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Ilmoituksia ei voi pistää pois päältä."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Tilaa tämä käyttäjä"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Peruuta tämän käyttäjän tilaus"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Suorat viestit käyttäjälle %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Profiilitieto"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Vastaa tähän päivitykseen"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Vastaa tähän päivitykseen"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Tuntematon ryhmä."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Poista ryhmä"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Komentoa ei ole vielä toteutettu."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -7036,6 +7196,9 @@ msgstr ""
 "Ryhmän paikka, jos sellainen on, kuten \"Kaupunki, Maakunta (tai Lääni), Maa"
 "\""
 
+msgid "Aliases"
+msgstr "Aliakset"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7114,6 +7277,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Ryhmän toiminnot"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Ryhmät, joissa eniten jäseniä"
@@ -7597,6 +7764,7 @@ msgstr "Lähetä päivitys"
 msgid "What's up, %s?"
 msgstr "Mitä teet juuri nyt, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr ""
 
@@ -8070,56 +8238,6 @@ msgstr "Peruuta tilaus"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Käyttäjällä ei ole profiilia."
 
-#, fuzzy
-msgid "Edit Avatar"
-msgstr "Kuva"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Käyttäjän toiminnot"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-#, fuzzy
-msgid "Edit profile settings"
-msgstr "Profiiliasetukset"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Lähetä suora viesti tälle käyttäjälle"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Viesti"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr ""
-
-#. TRANS: Label text on user profile to select a user role.
-#, fuzzy
-msgid "User role"
-msgstr "Käyttäjän profiili"
-
-#. TRANS: Role that can be set for a user profile.
-#, fuzzy
-msgctxt "role"
-msgid "Administrator"
-msgstr "Ylläpitäjät"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr ""
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Et ole kirjautunut sisään."
@@ -8195,3 +8313,10 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Huomaa"
+
+#, fuzzy
+#~ msgid "Edit Avatar"
+#~ msgstr "Kuva"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index f63f26d5f4..cba78330be 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -21,17 +21,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:07+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:35+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -605,7 +605,7 @@ msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s."
 msgid "%s's groups"
 msgstr "Groupes de %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Groupes de %1$s dont %2$s est membre."
@@ -4750,18 +4750,6 @@ msgstr "Groupe %s"
 msgid "%1$s group, page %2$d"
 msgstr "Groupe %1$s, page %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Note"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Alias"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Actions du groupe"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4874,6 +4862,10 @@ msgstr "Message reçu de %1$s le %2$s"
 msgid "Notice deleted."
 msgstr "Avis supprimé."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Avis"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5418,7 +5410,6 @@ msgstr "Aucun argument d’identifiant."
 msgid "Tag %s"
 msgstr "Marque %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Profil de l’utilisateur"
 
@@ -6144,6 +6135,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Actions de l’utilisateur"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Suppression de l'utilisateur en cours..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Modifier les paramètres du profil"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Modifier"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Envoyer un message à cet utilisateur"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Message"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Modérer"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Rôle de l'utilisateur"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrateur"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Modérateur"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6881,86 +6915,171 @@ 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 :"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"Commandes :\n"
-"on - activer les notifications\n"
-"off - désactiver les notifications\n"
-"help - montrer cette aide\n"
-"follow <nickname> - s’abonner à l’utilisateur\n"
-"groups - lister les groupes que vous avez rejoints\n"
-"subscriptions - lister les personnes que vous suivez\n"
-"subscribers - lister les personnes qui vous suivent\n"
-"leave <nickname> - se désabonner de l’utilisateur\n"
-"d <nickname> <text> - message direct à l’utilisateur\n"
-"get <nickname> - obtenir le dernier avis de l’utilisateur\n"
-"whois <nickname> - obtenir le profil de l’utilisateur\n"
-"lose <nickname> - forcer un utilisateur à arrêter de vous suivre\n"
-"fav <nickname> - ajouter de dernier avis de l’utilisateur comme favori\n"
-"fav #<notice_id> - ajouter l’avis correspondant à l’identifiant comme "
-"favori\n"
-"repeat #<notice_id> - reprendre l’avis correspondant à l’identifiant\n"
-"repeat <nickname> - reprendre le dernier avis de l’utilisateur\n"
-"reply #<notice_id> - répondre à l’avis correspondant à l’identifiant\n"
-"reply <nickname> - répondre au dernier avis de l’utilisateur\n"
-"join <group> - rejoindre le groupe\n"
-"login - Obtenir un lien pour s’identifier sur l’interface web\n"
-"drop <group> - quitter le groupe\n"
-"stats - obtenir vos statistiques\n"
-"stop - même effet que 'off'\n"
-"quit - même effet que 'off'\n"
-"sub <nickname> - même effet que 'follow'\n"
-"unsub <nickname> - même effet que 'leave'\n"
-"last <nickname> - même effet que 'get'\n"
-"on <nickname> - pas encore implémenté.\n"
-"off <nickname> - pas encore implémenté.\n"
-"nudge <nickname> - envoyer un clin d’œil à l’utilisateur.\n"
-"invite <phone number> - pas encore implémenté.\n"
-"track <word> - pas encore implémenté.\n"
-"untrack <word> - pas encore implémenté.\n"
-"track off - pas encore implémenté.\n"
-"untrack all - pas encore implémenté.\n"
-"tracks - pas encore implémenté.\n"
-"tracking - pas encore implémenté.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Résultats de la commande"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Impossible d’activer les avertissements."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Impossible de désactiver les avertissements."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "S’abonner à cet utilisateur"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Ne plus suivre cet utilisateur"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Messages directs envoyés à %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Information de profil"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Reprendre cet avis"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Répondre à cet avis"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Inconnu"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Supprimer le groupe"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Cette commande n’a pas encore été implémentée."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -7139,6 +7258,9 @@ msgstr ""
 "Emplacement du groupe, s’il y a lieu, de la forme « Ville, État (ou région), "
 "pays »"
 
+msgid "Aliases"
+msgstr "Alias"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7220,6 +7342,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Ajouter ou modifier l’apparence du groupe « %s »"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Actions du groupe"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Groupes avec le plus de membres"
@@ -7794,6 +7920,7 @@ msgstr "Envoyer un avis"
 msgid "What's up, %s?"
 msgstr "Quoi de neuf, %s ?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Attacher"
 
@@ -8255,52 +8382,6 @@ msgstr "Désabonnement"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "L’utilisateur %1$s (%2$d) n’a pas de profil."
 
-msgid "Edit Avatar"
-msgstr "Modifier l’avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Actions de l’utilisateur"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Suppression de l'utilisateur en cours..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Modifier les paramètres du profil"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Modifier"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Envoyer un message à cet utilisateur"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Message"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Modérer"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Rôle de l'utilisateur"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrateur"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Modérateur"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Non connecté."
@@ -8376,3 +8457,89 @@ msgstr "XML invalide, racine XRD manquante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
+
+#~ msgid "Note"
+#~ msgstr "Note"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Commandes :\n"
+#~ "on - activer les notifications\n"
+#~ "off - désactiver les notifications\n"
+#~ "help - montrer cette aide\n"
+#~ "follow <nickname> - s’abonner à l’utilisateur\n"
+#~ "groups - lister les groupes que vous avez rejoints\n"
+#~ "subscriptions - lister les personnes que vous suivez\n"
+#~ "subscribers - lister les personnes qui vous suivent\n"
+#~ "leave <nickname> - se désabonner de l’utilisateur\n"
+#~ "d <nickname> <text> - message direct à l’utilisateur\n"
+#~ "get <nickname> - obtenir le dernier avis de l’utilisateur\n"
+#~ "whois <nickname> - obtenir le profil de l’utilisateur\n"
+#~ "lose <nickname> - forcer un utilisateur à arrêter de vous suivre\n"
+#~ "fav <nickname> - ajouter de dernier avis de l’utilisateur comme favori\n"
+#~ "fav #<notice_id> - ajouter l’avis correspondant à l’identifiant comme "
+#~ "favori\n"
+#~ "repeat #<notice_id> - reprendre l’avis correspondant à l’identifiant\n"
+#~ "repeat <nickname> - reprendre le dernier avis de l’utilisateur\n"
+#~ "reply #<notice_id> - répondre à l’avis correspondant à l’identifiant\n"
+#~ "reply <nickname> - répondre au dernier avis de l’utilisateur\n"
+#~ "join <group> - rejoindre le groupe\n"
+#~ "login - Obtenir un lien pour s’identifier sur l’interface web\n"
+#~ "drop <group> - quitter le groupe\n"
+#~ "stats - obtenir vos statistiques\n"
+#~ "stop - même effet que 'off'\n"
+#~ "quit - même effet que 'off'\n"
+#~ "sub <nickname> - même effet que 'follow'\n"
+#~ "unsub <nickname> - même effet que 'leave'\n"
+#~ "last <nickname> - même effet que 'get'\n"
+#~ "on <nickname> - pas encore implémenté.\n"
+#~ "off <nickname> - pas encore implémenté.\n"
+#~ "nudge <nickname> - envoyer un clin d’œil à l’utilisateur.\n"
+#~ "invite <phone number> - pas encore implémenté.\n"
+#~ "track <word> - pas encore implémenté.\n"
+#~ "untrack <word> - pas encore implémenté.\n"
+#~ "track off - pas encore implémenté.\n"
+#~ "untrack all - pas encore implémenté.\n"
+#~ "tracks - pas encore implémenté.\n"
+#~ "tracking - pas encore implémenté.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Modifier l’avatar"
diff --git a/locale/fur/LC_MESSAGES/statusnet.po b/locale/fur/LC_MESSAGES/statusnet.po
index 12cca595ec..94f77eb11c 100644
--- a/locale/fur/LC_MESSAGES/statusnet.po
+++ b/locale/fur/LC_MESSAGES/statusnet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:08+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:36+0000\n"
 "Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fur\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -577,7 +577,7 @@ msgstr ""
 msgid "%s's groups"
 msgstr "Grups di %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr ""
@@ -4441,18 +4441,6 @@ msgstr "Grup %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grup %1$s, pagjine %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Note"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Azions dal grup"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4563,6 +4551,10 @@ msgstr "Messaç di %1$s su %2$s"
 msgid "Notice deleted."
 msgstr "L'avîs al è stât eliminât."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Avîs"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5072,7 +5064,6 @@ msgstr ""
 msgid "Tag %s"
 msgstr "Etichete %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Profîl dal utent"
 
@@ -5740,6 +5731,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Azions dal utent"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Cambie lis impuestazions dal profîl"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Cambie"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Mande un messaç diret a chest utent"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Messaç"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Rûl dal utent"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Aministradôr"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderatôr"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6457,46 +6491,166 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Tu sês un membri di chest grup:"
 msgstr[1] "Tu sês un membri di chescj grups:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on"
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "off"
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Sotscrivimi a chest utent"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "No tu sês plui sotscrit a %s."
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Messaçs direts par %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Informazions sul profîl"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Ripet chest avîs"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Rispuint a chest avîs"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Grup %s"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Elimine il grup"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6670,6 +6824,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Lûc dal grup, se al esist, come \"Citât, Regjon, Stât\"."
 
+msgid "Aliases"
+msgstr ""
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -6747,6 +6904,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Azions dal grup"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grups cun plui membris"
@@ -7209,6 +7370,7 @@ msgstr "Mande un avîs"
 msgid "What's up, %s?"
 msgstr "Ce sucedial, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Aleghe"
 
@@ -7667,52 +7829,6 @@ msgstr ""
 msgid "User %1$s (%2$d) has no profile record."
 msgstr ""
 
-msgid "Edit Avatar"
-msgstr "Modifiche l'avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Azions dal utent"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Cambie lis impuestazions dal profîl"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Cambie"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Mande un messaç diret a chest utent"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Messaç"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr ""
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Rûl dal utent"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Aministradôr"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderatôr"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "No tu sês jentrât."
@@ -7787,3 +7903,9 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Note"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Modifiche l'avatar"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index f189cd13b7..98903771ff 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:09+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:37+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -593,7 +593,7 @@ msgstr "O usuario %1$s non se puido eliminar do grupo %2$s."
 msgid "%s's groups"
 msgstr "Os grupos de %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Grupos de %1$s aos que pertence %2$s."
@@ -4739,18 +4739,6 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, páxina %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Nota"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Pseudónimos"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Accións do grupo"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4862,6 +4850,10 @@ msgstr "Mensaxe de %1$s en %2$s"
 msgid "Notice deleted."
 msgstr "Borrouse a nota."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Notas"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5402,7 +5394,6 @@ msgstr "Sen argumento ID."
 msgid "Tag %s"
 msgstr "Etiqueta %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Perfil do usuario"
 
@@ -6126,6 +6117,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Accións do usuario"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Procedendo a borrar o usuario..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Modificar a configuración do perfil"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Modificar"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Enviarlle unha mensaxe directa a este usuario"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Mensaxe"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderar"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Rol do usuario"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrador"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderador"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6865,85 +6899,171 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Vostede pertence a este grupo:"
 msgstr[1] "Vostede pertence a estes grupos:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"Ordes:\n"
-"on - activa as notificacións\n"
-"off - desactiva as notificacións\n"
-"help - amosa esta axuda\n"
-"follow <alcume> - subscribirse ao usuario\n"
-"groups - lista os grupos nos que está\n"
-"subscriptions - lista a xente á que segue\n"
-"subscribers - lista a xente que o segue\n"
-"leave <alcume> - cancela a subscrición ao usuario\n"
-"d <alcume> <texto> - mensaxe directa a un usuario\n"
-"get <alcume> - obter a última nota do usuario\n"
-"whois <alcume> - obtén a información do perfil do usuario\n"
-"lose <alcume> - facer que o usuario deixe de seguilo\n"
-"fav <alcume> - marcar como \"favorita\" a última nota do usuario\n"
-"fav #<id da nota> - marcar como \"favorita\" a nota coa id indicada\n"
-"repeat #<id da nota> - repetir a nota doa id indicada\n"
-"repeat <alcume> - repetir a última nota do usuario\n"
-"reply #<id da nota> - responder a unha nota coa id indicada\n"
-"reply <alcume> - responder á última nota do usuario\n"
-"join <grupo> - unirse ao grupo indicado\n"
-"login - obter un enderezo para identificarse na interface web\n"
-"drop <grupo> - deixar o grupo indicado\n"
-"stats - obter as súas estatísticas\n"
-"stop - idéntico a \"off\"\n"
-"quit - idéntico a \"off\"\n"
-"sub <alcume> - idéntico a \"follow\"\n"
-"unsub <alcume> - idéntico a \"leave\"\n"
-"last <alcume> - idéntico a \"get\"\n"
-"on <alcume> - aínda non se integrou\n"
-"off <alcume> - aínda non se integrou\n"
-"nudge <alcume> - facerlle un aceno ao usuario indicado\n"
-"invite <número de teléfono> - aínda non se integrou\n"
-"track <palabra> - aínda non se integrou\n"
-"untrack <palabra> - aínda non se integrou\n"
-"track off - aínda non se integrou\n"
-"untrack all - aínda non se integrou\n"
-"tracks - aínda non se integrou\n"
-"tracking - aínda non se integrou\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Resultados da orde"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Non se pode activar a notificación."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Non se pode desactivar a notificación."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Subscribirse a este usuario"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Cancelar a subscrición a este usuario"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Mensaxes directas a %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Información do perfil"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Repetir esta nota"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Responder a esta nota"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Descoñecida"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Borrar un grupo"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Aínda non se integrou esa orde."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -7130,6 +7250,9 @@ msgstr ""
 "Localidade do grupo, se a ten, como por exemplo \"Cidade, Provincia, "
 "Comunidade, País\""
 
+msgid "Aliases"
+msgstr "Pseudónimos"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7211,6 +7334,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Engadir ou modificar o deseño de %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Accións do grupo"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grupos con máis membros"
@@ -7781,6 +7908,7 @@ msgstr "Enviar unha nota"
 msgid "What's up, %s?"
 msgstr "Que hai de novo, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Anexar"
 
@@ -8248,52 +8376,6 @@ msgstr "Cancelar a subscrición"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "O usuario %1$s (%2$d) non ten perfil."
 
-msgid "Edit Avatar"
-msgstr "Modificar o avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Accións do usuario"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Procedendo a borrar o usuario..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Modificar a configuración do perfil"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Modificar"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Enviarlle unha mensaxe directa a este usuario"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Mensaxe"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderar"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Rol do usuario"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrador"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderador"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Non iniciou sesión."
@@ -8369,3 +8451,88 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Nota"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Ordes:\n"
+#~ "on - activa as notificacións\n"
+#~ "off - desactiva as notificacións\n"
+#~ "help - amosa esta axuda\n"
+#~ "follow <alcume> - subscribirse ao usuario\n"
+#~ "groups - lista os grupos nos que está\n"
+#~ "subscriptions - lista a xente á que segue\n"
+#~ "subscribers - lista a xente que o segue\n"
+#~ "leave <alcume> - cancela a subscrición ao usuario\n"
+#~ "d <alcume> <texto> - mensaxe directa a un usuario\n"
+#~ "get <alcume> - obter a última nota do usuario\n"
+#~ "whois <alcume> - obtén a información do perfil do usuario\n"
+#~ "lose <alcume> - facer que o usuario deixe de seguilo\n"
+#~ "fav <alcume> - marcar como \"favorita\" a última nota do usuario\n"
+#~ "fav #<id da nota> - marcar como \"favorita\" a nota coa id indicada\n"
+#~ "repeat #<id da nota> - repetir a nota doa id indicada\n"
+#~ "repeat <alcume> - repetir a última nota do usuario\n"
+#~ "reply #<id da nota> - responder a unha nota coa id indicada\n"
+#~ "reply <alcume> - responder á última nota do usuario\n"
+#~ "join <grupo> - unirse ao grupo indicado\n"
+#~ "login - obter un enderezo para identificarse na interface web\n"
+#~ "drop <grupo> - deixar o grupo indicado\n"
+#~ "stats - obter as súas estatísticas\n"
+#~ "stop - idéntico a \"off\"\n"
+#~ "quit - idéntico a \"off\"\n"
+#~ "sub <alcume> - idéntico a \"follow\"\n"
+#~ "unsub <alcume> - idéntico a \"leave\"\n"
+#~ "last <alcume> - idéntico a \"get\"\n"
+#~ "on <alcume> - aínda non se integrou\n"
+#~ "off <alcume> - aínda non se integrou\n"
+#~ "nudge <alcume> - facerlle un aceno ao usuario indicado\n"
+#~ "invite <número de teléfono> - aínda non se integrou\n"
+#~ "track <palabra> - aínda non se integrou\n"
+#~ "untrack <palabra> - aínda non se integrou\n"
+#~ "track off - aínda non se integrou\n"
+#~ "untrack all - aínda non se integrou\n"
+#~ "tracks - aínda non se integrou\n"
+#~ "tracking - aínda non se integrou\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Modificar o avatar"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index c878043d4b..c61a1d5452 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:10+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:39+0000\n"
 "Language-Team: Upper Sorbian <http://translatewiki.net/wiki/Portal:hsb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
 "n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -588,7 +588,7 @@ msgstr "Njebě móžno wužiwarja %1$s ze skupiny %2$s wotstronić."
 msgid "%s's groups"
 msgstr "Skupiny wužiwarja %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Skupiny na %1$s, w kotrychž wužiwar %2$s je čłon."
@@ -1027,7 +1027,6 @@ msgid "Can only fave notices."
 msgstr "Jenož zdźělenki dadźa so jako fawority składować."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown notice."
 msgstr "Njeznata notica."
 
@@ -4455,18 +4454,6 @@ msgstr "skupina %s"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s skupina, strona %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Přispomnjenka"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Aliasy"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Skupinske akcije"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4567,6 +4554,10 @@ msgstr "Powěsć wot %1$s na %2$s"
 msgid "Notice deleted."
 msgstr "Zdźělenka zničena."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Zdźělenki"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5068,7 +5059,6 @@ msgstr "Žadyn argument ID."
 msgid "Tag %s"
 msgstr ""
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Wužiwarski profil"
 
@@ -5742,6 +5732,49 @@ msgstr "XRD za %s njeda so namakać."
 msgid "No AtomPub API service for %s."
 msgstr "Žana słužba AtomPub API za %s."
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Wužiwarske akcije"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Wužiwar so haša..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Profilowe nastajenja wobdźěłać"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Wobdźěłać"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Tutomu wužiwarja direktnu powěsć pósłać"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Powěsć"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderěrować"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Wužiwarska róla"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrator"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderator"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6469,46 +6502,170 @@ msgstr[1] "Sy čłon tuteju skupinow:"
 msgstr[2] "Sy čłon tutych skupinow:"
 msgstr[3] "Sy čłon tutych skupinow:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Přikazowe wuslědki"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Zdźělenje njeda so zmóžnić."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Zdźělenje njeda so znjemóžnić."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Tutoho wužiwarja abonować"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Tutoho wužiwarja wotskazać"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Direktne powěsće do %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Zdaleny profil skupina njeje!"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Tutu zdźělenku wospjetować"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Na tutu zdźělenku wotmołwić"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Njeznata skupina"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Skupinu zhašeć"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Přikaz hišće njeimplementowany."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6689,6 +6846,9 @@ msgstr ""
 "Městno za skupinu, jeli eksistuje, na př. \"město, zwjazkowy kraj (abo "
 "region), kraj\"."
 
+msgid "Aliases"
+msgstr "Aliasy"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -6768,6 +6928,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Design skupiny %s přidać abo wobdźěłać"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Skupinske akcije"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Skupiny z najwjace čłonami"
@@ -7249,6 +7413,7 @@ msgstr "Zdźělenku pósłać"
 msgid "What's up, %s?"
 msgstr "Å to je, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Připowěsnyć"
 
@@ -7707,52 +7872,6 @@ msgstr "Wotskazać"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Wužiwar %1$s (%2$d) nima profilowu datowu sadźbu."
 
-msgid "Edit Avatar"
-msgstr "Awatar wobdźěłać"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Wužiwarske akcije"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Wužiwar so haša..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Profilowe nastajenja wobdźěłać"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Wobdźěłać"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Tutomu wužiwarja direktnu powěsć pósłać"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Powěsć"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderěrować"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Wužiwarska róla"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrator"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderator"
-
 msgid "Not allowed to log in."
 msgstr "Přizjewjenje njedowolene."
 
@@ -7836,3 +7955,9 @@ msgstr "Njepłaćiwy XML, korjeń XRD faluje."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Wobstaruje so zawěsćenje z dataje \"%s\"-"
+
+#~ msgid "Note"
+#~ msgstr "Přispomnjenka"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Awatar wobdźěłać"
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index f05265f38e..a3515effa3 100644
--- a/locale/hu/LC_MESSAGES/statusnet.po
+++ b/locale/hu/LC_MESSAGES/statusnet.po
@@ -12,13 +12,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:11+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:40+0000\n"
 "Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -591,7 +591,7 @@ msgstr "Nem sikerült %1$s felhasználót eltávolítani a %2$s csoportból."
 msgid "%s's groups"
 msgstr "%s csoportjai"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr ""
@@ -4586,18 +4586,6 @@ msgstr "%s csoport"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s csoport, %2$d. oldal"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Megjegyzés"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Álnevek"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Csoport-tevékenységek"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4706,6 +4694,10 @@ msgstr ""
 msgid "Notice deleted."
 msgstr "A hírt töröltük."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Hírek"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5214,7 +5206,6 @@ msgstr ""
 msgid "Tag %s"
 msgstr ""
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Felhasználói profil"
 
@@ -5888,6 +5879,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Felhasználói műveletek"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Szerkesztés"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Üzenet"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderálás"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Felhasználói szerepkör"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Adminisztrátor"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderátor"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6598,46 +6632,166 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Ennek a csoportnak vagy tagja:"
 msgstr[1] "Ezeknek a csoportoknak vagy tagja:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on"
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "off"
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Ezen felhasználók híreire már feliratkoztál:"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Ezen felhasználók híreire már feliratkoztál:"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Közvetlen üzenetek neki: %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Személyes profil"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Ismételjük meg ezt a hírt"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Válaszoljunk erre a hírre"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Ismeretlen művelet"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Felhasználó törlése"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6821,6 +6975,9 @@ msgstr ""
 "A csoport földrajzi elhelyezkedése, ha van ilyen, pl. \"Város, Megye, Ország"
 "\""
 
+msgid "Aliases"
+msgstr "Álnevek"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -6902,6 +7059,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Csoport-tevékenységek"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "A legtöbb tagból álló csoportok"
@@ -7434,6 +7595,7 @@ msgstr "Küldjünk egy hírt"
 msgid "What's up, %s?"
 msgstr "Mi hír, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Csatolás"
 
@@ -7888,52 +8050,6 @@ msgstr ""
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "A felhasználónak nincs profilja."
 
-msgid "Edit Avatar"
-msgstr ""
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Felhasználói műveletek"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr ""
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Szerkesztés"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr ""
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Üzenet"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderálás"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Felhasználói szerepkör"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Adminisztrátor"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderátor"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Nem vagy bejelentkezve."
@@ -8009,3 +8125,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Megjegyzés"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index a56aa7c5c8..653cf949bd 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:12+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:41+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -589,7 +589,7 @@ msgstr "Non poteva remover le usator %1$s del gruppo %2$s."
 msgid "%s's groups"
 msgstr "Gruppos de %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Gruppos de %1$s del quales %2$s es membro."
@@ -1039,7 +1039,6 @@ msgid "Can only fave notices."
 msgstr "Solmente notas pote esser addite al favorites."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown notice."
 msgstr "Nota incognite."
 
@@ -3083,9 +3082,8 @@ msgstr "Le URL de origine es requirite."
 msgid "Could not create application."
 msgstr "Non poteva crear application."
 
-#, fuzzy
 msgid "Invalid image."
-msgstr "Dimension invalide."
+msgstr "Imagine invalide."
 
 #. TRANS: Title for form to create a group.
 msgid "New group"
@@ -3372,7 +3370,6 @@ msgstr ""
 "Isto es tu cassa de exito, que lista le messages private que tu ha inviate."
 
 #. TRANS: Title for page where to change password.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Change password"
 msgstr "Cambiar contrasigno"
@@ -3400,7 +3397,6 @@ msgid "6 or more characters."
 msgstr "6 o plus characteres."
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Confirmar"
@@ -3411,7 +3407,6 @@ msgid "Same as password above."
 msgstr "Identic al contrasigno hic supra."
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
 msgstr "Cambiar"
@@ -3424,9 +3419,8 @@ msgid "Passwords don't match."
 msgstr "Le contrasignos non corresponde."
 
 #. TRANS: Form validation error on page where to change password.
-#, fuzzy
 msgid "Incorrect old password."
-msgstr "Ancian contrasigno incorrecte"
+msgstr "Ancian contrasigno incorrecte."
 
 #. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
@@ -3513,12 +3507,10 @@ msgid "Fancy URLs"
 msgstr "URLs de luxo"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Usar URLs de luxo (plus legibile e memorabile)?"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Thema"
@@ -3632,7 +3624,6 @@ msgid "Directory where attachments are located."
 msgstr "Cammino a ubi se trova le annexos."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
@@ -3716,7 +3707,6 @@ msgid "Enabled"
 msgstr "Activate"
 
 #. TRANS: Tab and title for plugins admin panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Plug-ins"
@@ -3748,11 +3738,11 @@ msgstr "Le contento del nota es invalide."
 
 #. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
 #. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
-"Le licentia del nota ‘%1$s’ non es compatibile con le licentia del sito ‘%2"
-"$s’."
+"Le licentia del nota \"%1$s\" non es compatibile con le licentia del sito \"%"
+"2$s\"."
 
 #. TRANS: Page title for profile settings.
 msgid "Profile settings"
@@ -4606,18 +4596,6 @@ msgstr "Gruppo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Gruppo %1$s, pagina %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Nota"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Aliases"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Actiones del gruppo"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4727,6 +4705,10 @@ msgstr "Message de %1$s in %2$s"
 msgid "Notice deleted."
 msgstr "Nota delite."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Notas"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5259,7 +5241,6 @@ msgstr "Nulle parametro de ID."
 msgid "Tag %s"
 msgstr "Etiquetta %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Profilo del usator"
 
@@ -5970,6 +5951,49 @@ msgstr "Non pote trovar XRD pro %s."
 msgid "No AtomPub API service for %s."
 msgstr "Il non ha un servicio API AtomPub pro %s."
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Actiones de usator"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Deletion del usator in curso…"
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Modificar configuration de profilo"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Modificar"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Inviar un message directe a iste usator"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Message"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderar"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Rolo de usator"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrator"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderator"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6690,85 +6714,172 @@ 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:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"Commandos:\n"
-"on - activar notificationes\n"
-"off - disactivar notificationes\n"
-"help - monstrar iste adjuta\n"
-"follow <pseudonymo> - subscriber te al usator\n"
-"groups - listar le gruppos del quales tu es membro\n"
-"subscriptions - listar le personas que tu seque\n"
-"subscribers - listar le personas qui te seque\n"
-"leave <pseudonymo> - cancellar subscription al usator\n"
-"d <pseudonymo> <texto> - diriger un message al usator\n"
-"get <pseudonymo> - obtener le ultime nota del usator\n"
-"whois <pseudonymo> - obtener info de profilo del usator\n"
-"lose <pseudonymo> - fortiar le usator de cessar de sequer te\n"
-"fav <pseudonymo> - adder ultime nota del usator como favorite\n"
-"fav #<id_de_nota> - adder nota con le ID date como favorite\n"
-"repeat #<id_de_nota> - repeter le nota con le ID date\n"
-"repeat <pseudonymo> - repeter le ultime nota del usator\n"
-"reply #<id_de_nota> - responder al nota con le ID date\n"
-"reply <pseudonymo> - responder al ultime nota del usator\n"
-"join <gruppo> - facer te membro del gruppo\n"
-"login - obtener ligamine pro aperir session al interfacie web\n"
-"drop <gruppo> - quitar gruppo\n"
-"stats - obtener tu statisticas\n"
-"stop - como 'off'\n"
-"quit - como 'off'\n"
-"sub <pseudonymo> - como 'follow'\n"
-"unsub <pseudonymo> - como 'leave'\n"
-"last <pseudonymo> - como 'get'\n"
-"on <pseudonymo> - non ancora implementate.\n"
-"off <pseudonymo> - non ancora implementate.\n"
-"nudge <pseudonymo> - rememorar un usator de scriber alique.\n"
-"invite <numero de telephono> - non ancora implementate.\n"
-"track <parola> - non ancora implementate.\n"
-"untrack <parola> - non ancora implementate.\n"
-"track off - non ancora implementate.\n"
-"untrack all - non ancora implementate.\n"
-"tracks - non ancora implementate.\n"
-"tracking - non ancora implementate.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Resultatos del commando"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Non pote activar notification."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Non pote disactivar notification."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Subscriber a iste usator"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Cancellar subscription a iste usator"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Messages directe a %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Le profilo remote non es un gruppo!"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Repeter iste nota"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Responder a iste nota"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Gruppo incognite."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Deler gruppo"
+
+#. TRANS: Help message for IM/SMS command "stats"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr "Actualisar tu stato..."
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Commando non ancora implementate."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -6941,6 +7052,9 @@ msgid ""
 msgstr ""
 "Loco del gruppo, si existe, como \"Citate, Provincia (o Region), Pais\"."
 
+msgid "Aliases"
+msgstr "Aliases"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7021,6 +7135,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Adder o modificar apparentia de %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Actiones del gruppo"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Gruppos con le plus membros"
@@ -7590,6 +7708,7 @@ msgstr "Inviar un nota"
 msgid "What's up, %s?"
 msgstr "Como sta, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Annexar"
 
@@ -7658,7 +7777,7 @@ msgid "Notice repeated"
 msgstr "Nota repetite"
 
 msgid "Update your status..."
-msgstr ""
+msgstr "Actualisar tu stato..."
 
 msgid "Nudge this user"
 msgstr "Pulsar iste usator"
@@ -8047,52 +8166,6 @@ msgstr "Cancellar subscription"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Le usator %1$s (%2$d) non ha un registro de profilo."
 
-msgid "Edit Avatar"
-msgstr "Modificar avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Actiones de usator"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Deletion del usator in curso…"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Modificar configuration de profilo"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Modificar"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Inviar un message directe a iste usator"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Message"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderar"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Rolo de usator"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrator"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderator"
-
 msgid "Not allowed to log in."
 msgstr "Apertura de session non permittite."
 
@@ -8166,3 +8239,88 @@ msgstr "XML invalide, radice XRD mancante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtene copia de reserva ex file '%s'."
+
+#~ msgid "Note"
+#~ msgstr "Nota"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Commandos:\n"
+#~ "on - activar notificationes\n"
+#~ "off - disactivar notificationes\n"
+#~ "help - monstrar iste adjuta\n"
+#~ "follow <pseudonymo> - subscriber te al usator\n"
+#~ "groups - listar le gruppos del quales tu es membro\n"
+#~ "subscriptions - listar le personas que tu seque\n"
+#~ "subscribers - listar le personas qui te seque\n"
+#~ "leave <pseudonymo> - cancellar subscription al usator\n"
+#~ "d <pseudonymo> <texto> - diriger un message al usator\n"
+#~ "get <pseudonymo> - obtener le ultime nota del usator\n"
+#~ "whois <pseudonymo> - obtener info de profilo del usator\n"
+#~ "lose <pseudonymo> - fortiar le usator de cessar de sequer te\n"
+#~ "fav <pseudonymo> - adder ultime nota del usator como favorite\n"
+#~ "fav #<id_de_nota> - adder nota con le ID date como favorite\n"
+#~ "repeat #<id_de_nota> - repeter le nota con le ID date\n"
+#~ "repeat <pseudonymo> - repeter le ultime nota del usator\n"
+#~ "reply #<id_de_nota> - responder al nota con le ID date\n"
+#~ "reply <pseudonymo> - responder al ultime nota del usator\n"
+#~ "join <gruppo> - facer te membro del gruppo\n"
+#~ "login - obtener ligamine pro aperir session al interfacie web\n"
+#~ "drop <gruppo> - quitar gruppo\n"
+#~ "stats - obtener tu statisticas\n"
+#~ "stop - como 'off'\n"
+#~ "quit - como 'off'\n"
+#~ "sub <pseudonymo> - como 'follow'\n"
+#~ "unsub <pseudonymo> - como 'leave'\n"
+#~ "last <pseudonymo> - como 'get'\n"
+#~ "on <pseudonymo> - non ancora implementate.\n"
+#~ "off <pseudonymo> - non ancora implementate.\n"
+#~ "nudge <pseudonymo> - rememorar un usator de scriber alique.\n"
+#~ "invite <numero de telephono> - non ancora implementate.\n"
+#~ "track <parola> - non ancora implementate.\n"
+#~ "untrack <parola> - non ancora implementate.\n"
+#~ "track off - non ancora implementate.\n"
+#~ "untrack all - non ancora implementate.\n"
+#~ "tracks - non ancora implementate.\n"
+#~ "tracking - non ancora implementate.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Modificar avatar"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 78b07bbdfc..3306a48eaa 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:13+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:42+0000\n"
 "Language-Team: Italian <http://translatewiki.net/wiki/Portal:it>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -596,7 +596,7 @@ msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s."
 msgid "%s's groups"
 msgstr "Gruppi di %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Gruppi del sito %1$s a cui %2$s è iscritto."
@@ -4738,18 +4738,6 @@ msgstr "Gruppo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Gruppi di %1$s, pagina %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Nota"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Alias"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Azioni dei gruppi"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4861,6 +4849,10 @@ msgstr "Messaggio da %1$s su %2$s"
 msgid "Notice deleted."
 msgstr "Messaggio eliminato."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Messaggi"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5397,7 +5389,6 @@ msgstr "Nessun argomento ID."
 msgid "Tag %s"
 msgstr "Etichetta %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Profilo utente"
 
@@ -6122,6 +6113,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Azioni utente"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Eliminazione utente..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Modifica impostazioni del profilo"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Modifica"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Invia un messaggio diretto a questo utente"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Messaggio"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Modera"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Ruolo dell'utente"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Amministratore"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderatore"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6851,87 +6885,171 @@ 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:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"Comandi:\n"
-"on - abilita le notifiche\n"
-"off - disabilita le notifiche\n"
-"help - mostra questo aiuto\n"
-"follow <soprannome> - ti abbona all'utente\n"
-"groups - elenca i gruppi di cui fai parte\n"
-"subscriptions - elenca le persone che segui\n"
-"subscribers - elenca le persone che ti seguono\n"
-"leave <soprannome> - annulla l'abbonamento dall'utente\n"
-"d <soprannome> <testo> - invia un messaggio diretto all'utente\n"
-"get <soprannome> - recupera l'ultimo messaggio dell'utente\n"
-"whois <soprannome> - recupera le informazioni del profilo dell'utente\n"
-"lose <soprannome> - forza un utente nel non seguirti più\n"
-"fav <soprannome> - aggiunge l'ultimo messaggio dell'utente tra i tuoi "
-"preferiti\n"
-"fav #<ID_messaggio> - aggiunge un messaggio con quell'ID tra i tuoi "
-"preferiti\n"
-"repeat #<ID_messaggio> - ripete un messaggio con quell'ID\n"
-"repeat <soprannome> - ripete l'ultimo messaggio dell'utente\n"
-"reply #<ID_messaggio> - risponde al messaggio con quell'ID\n"
-"reply <soprannome> - risponde all'ultimo messaggio dell'utente\n"
-"join <gruppo> - ti iscrive al gruppo\n"
-"login - recupera un collegamento all'interfaccia web per eseguire l'accesso\n"
-"drop <gruppo> - annulla la tua iscrizione al gruppo\n"
-"stats - recupera il tuo stato\n"
-"stop - stessa azione del comando \"off\"\n"
-"quit - stessa azione del comando \"on\"\n"
-"sub <soprannome> - stessa azione del comando \"follow\"\n"
-"unsub <soprannome> - stessa azione del comando \"leave\"\n"
-"last <soprannome> - stessa azione del comando \"get\"\n"
-"on <soprannome> -non ancora implementato\n"
-"off <soprannome> - non ancora implementato\n"
-"nudge <soprannome> - ricorda a un utente di scrivere qualche cosa\n"
-"invite <numero di telefono> - non ancora implementato\n"
-"track <parola> - non ancora implementato\n"
-"untrack <parola> - non ancora implementato\n"
-"track off - non ancora implementato\n"
-"untrack all - non ancora implementato\n"
-"tracks - non ancora implementato\n"
-"tracking - non ancora implementato\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Risultati comando"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Impossibile attivare le notifiche."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Impossibile disattivare le notifiche."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Abbonati a questo utente"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Annulla l'abbonamento da questo utente"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Messaggi diretti a %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Informazioni sul profilo"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Ripeti questo messaggio"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Rispondi a questo messaggio"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Sconosciuto"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Elimina utente"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Comando non ancora implementato."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -7117,6 +7235,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Dove è situato il gruppo, tipo \"città, regione, stato\""
 
+msgid "Aliases"
+msgstr "Alias"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7196,6 +7317,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Aggiungi o modifica l'aspetto di %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Azioni dei gruppi"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "I gruppi più numerosi"
@@ -7767,6 +7892,7 @@ msgstr "Invia un messaggio"
 msgid "What's up, %s?"
 msgstr "Cosa succede, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Allega"
 
@@ -8228,52 +8354,6 @@ msgstr "Disabbonati"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "L'utente non ha un profilo."
 
-msgid "Edit Avatar"
-msgstr "Modifica immagine"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Azioni utente"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Eliminazione utente..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Modifica impostazioni del profilo"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Modifica"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Invia un messaggio diretto a questo utente"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Messaggio"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Modera"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Ruolo dell'utente"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Amministratore"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderatore"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Accesso non effettuato."
@@ -8349,3 +8429,91 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Nota"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Comandi:\n"
+#~ "on - abilita le notifiche\n"
+#~ "off - disabilita le notifiche\n"
+#~ "help - mostra questo aiuto\n"
+#~ "follow <soprannome> - ti abbona all'utente\n"
+#~ "groups - elenca i gruppi di cui fai parte\n"
+#~ "subscriptions - elenca le persone che segui\n"
+#~ "subscribers - elenca le persone che ti seguono\n"
+#~ "leave <soprannome> - annulla l'abbonamento dall'utente\n"
+#~ "d <soprannome> <testo> - invia un messaggio diretto all'utente\n"
+#~ "get <soprannome> - recupera l'ultimo messaggio dell'utente\n"
+#~ "whois <soprannome> - recupera le informazioni del profilo dell'utente\n"
+#~ "lose <soprannome> - forza un utente nel non seguirti più\n"
+#~ "fav <soprannome> - aggiunge l'ultimo messaggio dell'utente tra i tuoi "
+#~ "preferiti\n"
+#~ "fav #<ID_messaggio> - aggiunge un messaggio con quell'ID tra i tuoi "
+#~ "preferiti\n"
+#~ "repeat #<ID_messaggio> - ripete un messaggio con quell'ID\n"
+#~ "repeat <soprannome> - ripete l'ultimo messaggio dell'utente\n"
+#~ "reply #<ID_messaggio> - risponde al messaggio con quell'ID\n"
+#~ "reply <soprannome> - risponde all'ultimo messaggio dell'utente\n"
+#~ "join <gruppo> - ti iscrive al gruppo\n"
+#~ "login - recupera un collegamento all'interfaccia web per eseguire "
+#~ "l'accesso\n"
+#~ "drop <gruppo> - annulla la tua iscrizione al gruppo\n"
+#~ "stats - recupera il tuo stato\n"
+#~ "stop - stessa azione del comando \"off\"\n"
+#~ "quit - stessa azione del comando \"on\"\n"
+#~ "sub <soprannome> - stessa azione del comando \"follow\"\n"
+#~ "unsub <soprannome> - stessa azione del comando \"leave\"\n"
+#~ "last <soprannome> - stessa azione del comando \"get\"\n"
+#~ "on <soprannome> -non ancora implementato\n"
+#~ "off <soprannome> - non ancora implementato\n"
+#~ "nudge <soprannome> - ricorda a un utente di scrivere qualche cosa\n"
+#~ "invite <numero di telefono> - non ancora implementato\n"
+#~ "track <parola> - non ancora implementato\n"
+#~ "untrack <parola> - non ancora implementato\n"
+#~ "track off - non ancora implementato\n"
+#~ "untrack all - non ancora implementato\n"
+#~ "tracks - non ancora implementato\n"
+#~ "tracking - non ancora implementato\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Modifica immagine"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 00de07045f..2f58935de5 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:15+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:43+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -593,7 +593,7 @@ msgstr "ユーザ %1$s をグループ %2$s から削除できません。"
 msgid "%s's groups"
 msgstr "%s のグループ"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, fuzzy, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "グループ %s はメンバー"
@@ -4732,18 +4732,6 @@ msgstr "%s グループ"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s グループ、ページ %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "ノート"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "別名"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "グループアクション"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4855,6 +4843,10 @@ msgstr "%2$s 上の %1$s からのメッセージ"
 msgid "Notice deleted."
 msgstr "つぶやきを削除しました。"
 
+#, fuzzy
+msgid "Notice"
+msgstr "つぶやき"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5404,7 +5396,6 @@ msgstr "ID引数がありません。"
 msgid "Tag %s"
 msgstr "タグ %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "ユーザプロファイル"
 
@@ -6110,6 +6101,53 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "利用者アクション"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "プロファイル設定編集"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "編集"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "この利用者にダイレクトメッセージを送る"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "メッセージ"
+
+#. TRANS: Label text on user profile to select a user role.
+#, fuzzy
+msgid "Moderate"
+msgstr "管理"
+
+#. TRANS: Label text on user profile to select a user role.
+#, fuzzy
+msgid "User role"
+msgstr "ユーザプロファイル"
+
+#. TRANS: Role that can be set for a user profile.
+#, fuzzy
+msgctxt "role"
+msgid "Administrator"
+msgstr "管理者"
+
+#. TRANS: Role that can be set for a user profile.
+#, fuzzy
+msgctxt "role"
+msgid "Moderator"
+msgstr "管理"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6836,46 +6874,170 @@ msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "あなたはこのグループのメンバーではありません:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "コマンド結果"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "通知をオンできません。"
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "通知をオフできません。"
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "このユーザーをフォロー"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "この利用者からのフォローを解除する"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "%s へのダイレクトメッセージ"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "プロファイル情報"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "このつぶやきを繰り返す"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "このつぶやきへ返信"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "不明"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "ユーザ削除"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "コマンドはまだ実装されていません。"
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -7060,6 +7222,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "グループの場所, 例えば \"都市, 都道府県 (または 地域), 国\""
 
+msgid "Aliases"
+msgstr "別名"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7138,6 +7303,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "グループアクション"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "メンバー数が多いグループ"
@@ -7676,6 +7845,7 @@ msgstr "つぶやきを送る"
 msgid "What's up, %s?"
 msgstr "最近どう %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "添付"
 
@@ -8133,56 +8303,6 @@ msgstr "フォロー解除"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "ユーザはプロフィールをもっていません。"
 
-msgid "Edit Avatar"
-msgstr "アバターを編集する"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "利用者アクション"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "プロファイル設定編集"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "編集"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "この利用者にダイレクトメッセージを送る"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "メッセージ"
-
-#. TRANS: Label text on user profile to select a user role.
-#, fuzzy
-msgid "Moderate"
-msgstr "管理"
-
-#. TRANS: Label text on user profile to select a user role.
-#, fuzzy
-msgid "User role"
-msgstr "ユーザプロファイル"
-
-#. TRANS: Role that can be set for a user profile.
-#, fuzzy
-msgctxt "role"
-msgid "Administrator"
-msgstr "管理者"
-
-#. TRANS: Role that can be set for a user profile.
-#, fuzzy
-msgctxt "role"
-msgid "Moderator"
-msgstr "管理"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "ログインしていません。"
@@ -8254,3 +8374,9 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "ノート"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "アバターを編集する"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index c282ae94ac..2b54bf0f85 100644
--- a/locale/ka/LC_MESSAGES/statusnet.po
+++ b/locale/ka/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:16+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:45+0000\n"
 "Language-Team: Georgian <http://translatewiki.net/wiki/Portal:ka>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -584,7 +584,7 @@ msgstr "მომხმარებლ %1$s-ის გარიცხვა ჯ
 msgid "%s's groups"
 msgstr "%s-ს ჯგუფები"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s-ს ის ჯგუფები რომლებშიც გაერთიანებულია %2$s."
@@ -4680,18 +4680,6 @@ msgstr ""
 msgid "%1$s group, page %2$d"
 msgstr ""
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "შენიშვნა"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr ""
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4794,6 +4782,10 @@ msgstr ""
 msgid "Notice deleted."
 msgstr ""
 
+#, fuzzy
+msgid "Notice"
+msgstr "შეტყობინებები"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5321,7 +5313,6 @@ msgstr ""
 msgid "Tag %s"
 msgstr "სანიშნე %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "მომხმარებლის პროფილი"
 
@@ -6040,6 +6031,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "მომხმარებლის მოქმედებები"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "მომხმარებლის წაშლა პროგრესშია..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "პროფილის პარამეტრების რედაქტირება"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "რედაქტირება"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "გაუგზავნე პირდაპირი შეტყობინება ამ მომხმარებელს"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "შეტყობინება"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "მოდერაცია"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "მომხმარებლის როლი"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "ადმინისტრატორი"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "მოდერატორი"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6762,46 +6796,168 @@ msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "ბრძანების შედეგები"
+
+#. TRANS: Help message for IM/SMS command "on"
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "off"
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "გამოიწერე ეს მომხმარებელი"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "ამ მომხმარებლის გამოწერის გაუქმება"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "%s-სთვის გაგზავნილი პირდაპირი შეტყობინებები"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "ინფორმაცია პროფილზე"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "შეტყობინების გამეორება"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "უპასუხე ამ შეტყობინებას"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "უცნობი"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "მომხმარებლის წაშლა"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "ბრძანება ჯერ არ არის შემუშავებული."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6985,6 +7141,9 @@ msgstr ""
 "ჯგუფის მდებარეობა არსებობის შემთხვევაში. მაგ.: \"ქალაქი, ქვეყანა (ან რეგიონი)"
 "\""
 
+msgid "Aliases"
+msgstr ""
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7063,6 +7222,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr ""
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "ჯგუფები უმეტესი მომხმარებლებით"
@@ -7607,6 +7770,7 @@ msgstr "შეტყობინების გაგზავნა"
 msgid "What's up, %s?"
 msgstr "რა არის ახალი %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "ფაილის მიმაგრება"
 
@@ -8068,52 +8232,6 @@ msgstr "გამოწერის გაუქმება"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "მომხმარებელს პროფილი არ გააჩნია."
 
-msgid "Edit Avatar"
-msgstr "ავატარის რედაქტირება"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "მომხმარებლის მოქმედებები"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "მომხმარებლის წაშლა პროგრესშია..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "პროფილის პარამეტრების რედაქტირება"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "რედაქტირება"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "გაუგზავნე პირდაპირი შეტყობინება ამ მომხმარებელს"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "შეტყობინება"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "მოდერაცია"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "მომხმარებლის როლი"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "ადმინისტრატორი"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "მოდერატორი"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "ავტორიზებული არ ხართ."
@@ -8186,3 +8304,9 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "შენიშვნა"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "ავატარის რედაქტირება"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 8d0a52c16f..faead36164 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:17+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:46+0000\n"
 "Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -581,7 +581,7 @@ msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
 msgid "%s's groups"
 msgstr "%s의 그룹"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s 사이트의 그룹에 %2$s 사용자가 멤버입니다."
@@ -4635,18 +4635,6 @@ msgstr "%s 그룹"
 msgid "%1$s group, page %2$d"
 msgstr "그룹, %d페이지"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "설명"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "그룹 행동"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4753,6 +4741,10 @@ msgstr "%1$s에서 %2$s까지 메시지"
 msgid "Notice deleted."
 msgstr "게시글이 등록되었습니다."
 
+#, fuzzy
+msgid "Notice"
+msgstr "통지"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5272,7 +5264,6 @@ msgstr "첨부문서 없음"
 msgid "Tag %s"
 msgstr "태그 %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "이용자 프로필"
 
@@ -5984,6 +5975,50 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "사용자 동작"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "프로필 설정"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "편집"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "이 회원에게 직접 메시지를 보냅니다."
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "메시지"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+#, fuzzy
+msgid "User role"
+msgstr "이용자 프로필"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "관리자"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr ""
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6707,46 +6742,170 @@ msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다."
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "실행결과"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "알림을 켤 수 없습니다."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "알림을 끌 수 없습니다."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "이 회원을 구독합니다."
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "이 사용자로부터 구독취소합니다."
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "%s에게 직접 메시지"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "프로필 정보"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "이 게시글에 대해 답장하기"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "이 게시글에 대해 답장하기"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "알려지지 않은 행동"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "이용자 삭제"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "명령이 아직 실행되지 않았습니다."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6929,6 +7088,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "그룹의 위치, \"시/군/구, 도, 국가\""
 
+msgid "Aliases"
+msgstr ""
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7005,6 +7167,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "그룹 행동"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "가장 많은 회원수를 가진 그룹들"
@@ -7469,6 +7635,7 @@ msgstr "게시글 보내기"
 msgid "What's up, %s?"
 msgstr "뭐하세요 %s님?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "첨부"
 
@@ -7931,53 +8098,6 @@ msgstr "구독 해제"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
-msgid "Edit Avatar"
-msgstr "아바타 편집"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "사용자 동작"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "프로필 설정"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "편집"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "이 회원에게 직접 메시지를 보냅니다."
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "메시지"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr ""
-
-#. TRANS: Label text on user profile to select a user role.
-#, fuzzy
-msgid "User role"
-msgstr "이용자 프로필"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "관리자"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr ""
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "로그인하고 있지 않습니다."
@@ -8049,3 +8169,9 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "설명"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "아바타 편집"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 330d0022dc..f5298423de 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:18+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:47+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -593,7 +593,7 @@ msgstr "Не можев да го отстранам корисникот %1$s 
 msgid "%s's groups"
 msgstr "%s групи"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s групи кадешто членува %2$s."
@@ -1041,9 +1041,8 @@ msgid "Can only fave notices."
 msgstr "Може само да бендисува забелешки."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown notice."
-msgstr "Непозната белешка."
+msgstr "Непозната забелешка."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
 msgid "Already a favorite."
@@ -3090,9 +3089,8 @@ msgstr "Треба изворна URL-адреса."
 msgid "Could not create application."
 msgstr "Не можеше да се создаде програмот."
 
-#, fuzzy
 msgid "Invalid image."
-msgstr "Погрешна големина."
+msgstr "Неважечка слика."
 
 #. TRANS: Title for form to create a group.
 msgid "New group"
@@ -3381,10 +3379,9 @@ msgstr ""
 "имате испратено."
 
 #. TRANS: Title for page where to change password.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Change password"
-msgstr "Промени ја лозинката"
+msgstr "Смени лозинка"
 
 #. TRANS: Instructions for page where to change password.
 msgid "Change your password."
@@ -3409,7 +3406,6 @@ msgid "6 or more characters."
 msgstr "6 или повеќе знаци."
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Потврди"
@@ -3420,10 +3416,9 @@ msgid "Same as password above."
 msgstr "Исто како лозинката погоре."
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
-msgstr "Промени"
+msgstr "Измени"
 
 #. TRANS: Form validation error on page where to change password.
 msgid "Password must be 6 or more characters."
@@ -3433,9 +3428,8 @@ msgid "Passwords don't match."
 msgstr "Лозинките не се совпаѓаат."
 
 #. TRANS: Form validation error on page where to change password.
-#, fuzzy
 msgid "Incorrect old password."
-msgstr "Неточна стара лозинка"
+msgstr "Погрешна стара лозинка."
 
 #. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
@@ -3522,12 +3516,10 @@ msgid "Fancy URLs"
 msgstr "Интересни URL-адреси"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Use fancy URLs (more readable and memorable)?"
 msgstr "Да користам интересни (почитливи и повпечатливи) URL-адреси?"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Изглед"
@@ -3641,7 +3633,6 @@ msgid "Directory where attachments are located."
 msgstr "Директориумот кадешто се сместени прилозите."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
@@ -3726,7 +3717,6 @@ msgid "Enabled"
 msgstr "Овозможено"
 
 #. TRANS: Tab and title for plugins admin panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Приклучоци"
@@ -3757,7 +3747,7 @@ msgstr "Неважечка содржина на забелешката."
 
 #. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
 #. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 "Лиценцата на забелешката „%1$s“ не е соодветна на лиценцата на мрежното "
@@ -4624,18 +4614,6 @@ msgstr "Група %s"
 msgid "%1$s group, page %2$d"
 msgstr "Група %1$s, стр. %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Забелешка"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Алијаси"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Групни дејства"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4746,6 +4724,10 @@ msgstr "Порака од %1$s на %2$s"
 msgid "Notice deleted."
 msgstr "Избришана забелешка"
 
+#, fuzzy
+msgid "Notice"
+msgstr "Забелешки"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5282,7 +5264,6 @@ msgstr "Нема ID-аргумент."
 msgid "Tag %s"
 msgstr "Означи %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Кориснички профил"
 
@@ -5999,6 +5980,49 @@ msgstr "Не можам да најдам XRD за %s."
 msgid "No AtomPub API service for %s."
 msgstr "Нема служба за API на AtomPub за %s."
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Кориснички дејства"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Бришењето на корисникот е во тек..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Уреди нагодувања на профилот"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Уреди"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Испрати му директна порака на корисников"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Порака"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Модерирај"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Корисничка улога"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Администратор"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Модератор"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6718,84 +6742,172 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Не ни го испративте тој профил."
 msgstr[1] "Не ни го испративте тој профил."
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"Наредби:\n"
-"on - вклучи известувања\n"
-"off - исклучи известувања\n"
-"help - прикажи ја оваа помош\n"
-"follow <nickname> - претплати се на корисник\n"
-"groups - список на групи кадешто членувате\n"
-"subscriptions - список на луѓе кои ги следите\n"
-"subscribers - список на луѓе кои Ве следат\n"
-"leave <nickname> - откажи претплата на корисник\n"
-"d <nickname> <text> - директна порака за корисник\n"
-"get <nickname> - прикажи последна забелешка на корисник\n"
-"whois <nickname> - прикажи профилни информации за корисник\n"
-"fav <nickname> - додај ја последната забелешка на корисникот во бендисани\n"
-"fav #<notice_id> - додај забелешка со даден id како бендисана\n"
-"repeat #<notice_id> - повтори забелешка со даден id\n"
-"repeat <nickname> - повтори последна забелешка на корисник\n"
-"reply #<notice_id> - одговори на забелешка со даден id\n"
-"reply <nickname> - одговори на последна забелешка на корисник\n"
-"join <group> - зачлени се во група\n"
-"login - Дај врска за најавување на посредникот\n"
-"drop <group> - напушти група\n"
-"stats - прикажи мои статистики\n"
-"stop - исто што и 'off'\n"
-"quit - исто што и 'off'\n"
-"sub <nickname> - исто што и 'follow'\n"
-"unsub <nickname> - исто што и 'leave'\n"
-"last <nickname> - исто што и 'get'\n"
-"on <nickname> - сè уште не е имплементирано.\n"
-"off <nickname> - сè уште не е имплементирано.\n"
-"nudge <nickname> - потсети корисник да поднови.\n"
-"invite <phone number> - сè уште не е имплементирано.\n"
-"track <word> - сè уште не е имплементирано.\n"
-"untrack <word> - сè уште не е имплементирано.\n"
-"track off - сè уште не е имплементирано.\n"
-"untrack all - сè уште не е имплементирано.\n"
-"tracks - сè уште не е имплементирано.\n"
-"tracking - сè уште не е имплементирано.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Резултати од наредбата"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Не можам да вклучам известување."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Не можам да исклучам известување."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Претплати се на корисников"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Откажи претплата од овој корсиник"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Директни пораки до %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Далечинскиот профил не е група!"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Повтори ја забелешкава"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Одговори на забелешкава"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Непозната група."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Избриши група"
+
+#. TRANS: Help message for IM/SMS command "stats"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr "Подновете си го статусот..."
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Наредбата сè уште не е имплементирана."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -6968,6 +7080,9 @@ msgid ""
 msgstr ""
 "Местоположба на групата (ако има). На пр. „Град, Сој. држава/област, Земја“"
 
+msgid "Aliases"
+msgstr "Алијаси"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7049,6 +7164,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Додавање или уредување на изгледот на групата „%s“"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Групни дејства"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Групи со највеќе членови"
@@ -7621,6 +7740,7 @@ msgstr "Испрати забелешка"
 msgid "What's up, %s?"
 msgstr "Што има ново, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Приложи"
 
@@ -7689,7 +7809,7 @@ msgid "Notice repeated"
 msgstr "Забелешката е повторена"
 
 msgid "Update your status..."
-msgstr ""
+msgstr "Подновете си го статусот..."
 
 msgid "Nudge this user"
 msgstr "Подбуцни го корисников"
@@ -8073,52 +8193,6 @@ msgstr "Откажи ја претплатата"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Корисникот %1$s (%2$d) нема профилен запис."
 
-msgid "Edit Avatar"
-msgstr "Уреди аватар"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Кориснички дејства"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Бришењето на корисникот е во тек..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Уреди нагодувања на профилот"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Уреди"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Испрати му директна порака на корисников"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Порака"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Модерирај"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Корисничка улога"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Администратор"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Модератор"
-
 msgid "Not allowed to log in."
 msgstr "Не Ви е дозволено да се најавите."
 
@@ -8193,3 +8267,88 @@ msgstr "Неважечки XML. Нема XRD-корен."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Земам резерва на податотеката „%s“."
+
+#~ msgid "Note"
+#~ msgstr "Забелешка"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Наредби:\n"
+#~ "on - вклучи известувања\n"
+#~ "off - исклучи известувања\n"
+#~ "help - прикажи ја оваа помош\n"
+#~ "follow <nickname> - претплати се на корисник\n"
+#~ "groups - список на групи кадешто членувате\n"
+#~ "subscriptions - список на луѓе кои ги следите\n"
+#~ "subscribers - список на луѓе кои Ве следат\n"
+#~ "leave <nickname> - откажи претплата на корисник\n"
+#~ "d <nickname> <text> - директна порака за корисник\n"
+#~ "get <nickname> - прикажи последна забелешка на корисник\n"
+#~ "whois <nickname> - прикажи профилни информации за корисник\n"
+#~ "fav <nickname> - додај ја последната забелешка на корисникот во "
+#~ "бендисани\n"
+#~ "fav #<notice_id> - додај забелешка со даден id како бендисана\n"
+#~ "repeat #<notice_id> - повтори забелешка со даден id\n"
+#~ "repeat <nickname> - повтори последна забелешка на корисник\n"
+#~ "reply #<notice_id> - одговори на забелешка со даден id\n"
+#~ "reply <nickname> - одговори на последна забелешка на корисник\n"
+#~ "join <group> - зачлени се во група\n"
+#~ "login - Дај врска за најавување на посредникот\n"
+#~ "drop <group> - напушти група\n"
+#~ "stats - прикажи мои статистики\n"
+#~ "stop - исто што и 'off'\n"
+#~ "quit - исто што и 'off'\n"
+#~ "sub <nickname> - исто што и 'follow'\n"
+#~ "unsub <nickname> - исто што и 'leave'\n"
+#~ "last <nickname> - исто што и 'get'\n"
+#~ "on <nickname> - сè уште не е имплементирано.\n"
+#~ "off <nickname> - сè уште не е имплементирано.\n"
+#~ "nudge <nickname> - потсети корисник да поднови.\n"
+#~ "invite <phone number> - сè уште не е имплементирано.\n"
+#~ "track <word> - сè уште не е имплементирано.\n"
+#~ "untrack <word> - сè уште не е имплементирано.\n"
+#~ "track off - сè уште не е имплементирано.\n"
+#~ "untrack all - сè уште не е имплементирано.\n"
+#~ "tracks - сè уште не е имплементирано.\n"
+#~ "tracking - сè уште не е имплементирано.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Уреди аватар"
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index 11c70d96e5..a3e79892f0 100644
--- a/locale/ml/LC_MESSAGES/statusnet.po
+++ b/locale/ml/LC_MESSAGES/statusnet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:19+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:48+0000\n"
 "Language-Team: Malayalam <http://translatewiki.net/wiki/Portal:ml>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ml\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -573,7 +573,7 @@ msgstr "%2$s എന്ന സംഘത്തിൽ നിന്നും %1$s  
 msgid "%s's groups"
 msgstr "%s എന്ന ഉപയോക്താവിന്റെ സംഘങ്ങൾ"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%2$s അംഗമായ %1$s സംഘങ്ങൾ."
@@ -4482,18 +4482,6 @@ msgstr "%s സംഘം"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s സംഘം, താൾ %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "കുറിപ്പ്"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "സംഘത്തിന്റെ പ്രവൃത്തികൾ"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4594,6 +4582,10 @@ msgstr "%2$s സംരംഭത്തിൽ %1$s അയച്ച സന്ദേ
 msgid "Notice deleted."
 msgstr "അറിയിപ്പ് മായ്ച്ചിരിക്കുന്നു."
 
+#, fuzzy
+msgid "Notice"
+msgstr "അറിയിപ്പുകൾ"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5111,7 +5103,6 @@ msgstr ""
 msgid "Tag %s"
 msgstr "റ്റാഗ് %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr ""
 
@@ -5784,6 +5775,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "ഉപയോക്തൃ പ്രവൃത്തികൾ"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "ഉപയോക്താവിനെ നീക്കം ചെയ്യൽ പുരോഗമിക്കുന്നു..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "ക്രമീകരണങ്ങളുടെ സജ്ജീകരണം മാറ്റുക"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "തിരുത്തുക"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "ഈ ഉപയോക്താവിന് നേരിട്ട് സന്ദേശമയയ്ക്കുക"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "സന്ദേശം"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "മാദ്ധ്യസ്ഥം വഹിക്കുക"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr ""
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "കാര്യനിർവ്വാഹക(ൻ)"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "മദ്ധ്യസ്ഥ(ൻ)"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6488,46 +6522,166 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "താങ്കൾ ഈ സംഘത്തിലെ അംഗമാണ്:"
 msgstr[1] "താങ്കൾ ഈ സംഘങ്ങളിലെ അംഗമാണ്:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on"
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "off"
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "ഈ ഉപയോക്താവിന്റെ വരിക്കാരൻ/വരിക്കാരി ആകുക"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "ഈ ഉപയോക്താവിന്റെ വരിക്കാരൻ/വരിക്കാരി ആകുക"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "%s എന്ന ഉപയോക്താവിന് നേരിട്ടുള്ള സന്ദേശങ്ങൾ"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "ഈ അറിയിപ്പ് ആവർത്തിക്കുക"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "ഈ അറിയിപ്പിന് മറുപടിയിടുക"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "അജ്ഞാത സംഘം."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "സംഘം മായ്ക്കുക"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "പ്രാവർത്തികമാക്കിയിട്ടില്ല."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6704,6 +6858,9 @@ msgstr ""
 "സംഘത്തിന്റെ പ്രദേശം, അങ്ങനെയൊന്നുണ്ടെങ്കിൽ - ഉദാ: \"പട്ടണം, സംസ്ഥാനം (അഥവാ പ്രദേശം), "
 "രാജ്യം\"."
 
+msgid "Aliases"
+msgstr ""
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -6781,6 +6938,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "%s എന്ന സംഘത്തിനു രൂപകല്പന കൂട്ടിച്ചേർക്കുക അല്ലെങ്കിൽ മാറ്റം വരുത്തുക"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "സംഘത്തിന്റെ പ്രവൃത്തികൾ"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr ""
@@ -7248,6 +7409,7 @@ msgstr "അറിയിപ്പ് അയയ്ക്കുക"
 msgid "What's up, %s?"
 msgstr "എന്തൊക്കെയുണ്ട്, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "ചേർത്തുവെയ്ക്കുക"
 
@@ -7707,52 +7869,6 @@ msgstr ""
 msgid "User %1$s (%2$d) has no profile record."
 msgstr ""
 
-msgid "Edit Avatar"
-msgstr ""
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "ഉപയോക്തൃ പ്രവൃത്തികൾ"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "ഉപയോക്താവിനെ നീക്കം ചെയ്യൽ പുരോഗമിക്കുന്നു..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "ക്രമീകരണങ്ങളുടെ സജ്ജീകരണം മാറ്റുക"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "തിരുത്തുക"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "ഈ ഉപയോക്താവിന് നേരിട്ട് സന്ദേശമയയ്ക്കുക"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "സന്ദേശം"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "മാദ്ധ്യസ്ഥം വഹിക്കുക"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr ""
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "കാര്യനിർവ്വാഹക(ൻ)"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "മദ്ധ്യസ്ഥ(ൻ)"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "ലോഗിൻ ചെയ്തിട്ടില്ല"
@@ -7827,3 +7943,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "കുറിപ്പ്"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 9898feb7be..55d575a366 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:21+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:51+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -589,7 +589,7 @@ msgstr "Kunne ikke fjerne bruker %1$s fra gruppe %2$s."
 msgid "%s's groups"
 msgstr "%s sine grupper"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s grupper %2$s er et medlem av."
@@ -4662,18 +4662,6 @@ msgstr "%s gruppe"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s gruppe, side %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Merk"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Alias"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Gruppehandlinger"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4784,6 +4772,10 @@ msgstr "Melding fra %1$s på %2$s"
 msgid "Notice deleted."
 msgstr "Notis slettet."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Notiser"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5314,7 +5306,6 @@ msgstr "Ingen vedlegg."
 msgid "Tag %s"
 msgstr "Merk %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Brukerprofil"
 
@@ -6011,6 +6002,50 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#, fuzzy
+msgid "User actions"
+msgstr "Gruppehandlinger"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Endre profilinnstillinger"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Rediger"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Send en direktemelding til denne brukeren"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Melding"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderer"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Brukerrolle"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrator"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderator"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6741,46 +6776,170 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Du er allerede logget inn!"
 msgstr[1] "Du er allerede logget inn!"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Kommandoresultat"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Kan ikke gjenta din egen notis."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Kan ikke gjenta din egen notis."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Abonner på denne brukeren"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Abonner på denne brukeren"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Direktemeldinger til %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Profilinformasjon"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Repeter denne notisen"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Svar på denne notisen"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Ukjent"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Slett gruppe"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Beklager, denne kommandoen er ikke implementert ennå."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6968,6 +7127,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
 
+msgid "Aliases"
+msgstr "Alias"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7045,6 +7207,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Gruppehandlinger"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grupper med flest medlemmer"
@@ -7609,6 +7775,7 @@ msgstr "Send en notis"
 msgid "What's up, %s?"
 msgstr "Hva skjer %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Legg ved"
 
@@ -8082,54 +8249,6 @@ msgstr "Abonner"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Brukeren har ingen profil."
 
-#, fuzzy
-msgid "Edit Avatar"
-msgstr "Brukerbilde"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-#, fuzzy
-msgid "User actions"
-msgstr "Gruppehandlinger"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Endre profilinnstillinger"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Rediger"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Send en direktemelding til denne brukeren"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Melding"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderer"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Brukerrolle"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrator"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderator"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Ikke logget inn."
@@ -8205,3 +8324,10 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Merk"
+
+#, fuzzy
+#~ msgid "Edit Avatar"
+#~ msgstr "Brukerbilde"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index e8907c1baf..c427d1e703 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:20+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:49+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -597,7 +597,7 @@ msgstr "Het was niet mogelijk gebruiker %1$s uit de groep %2$s te verwijderen."
 msgid "%s's groups"
 msgstr "Groepen van %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Groepen op de site %1$s waar %2$s lid van is."
@@ -1054,9 +1054,8 @@ msgid "Can only fave notices."
 msgstr "Het is alleen mogelijk om mededelingen als favoriet aan te merken."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown notice."
-msgstr "Onbekend mededeling."
+msgstr "Onbekende mededeling."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
 msgid "Already a favorite."
@@ -3116,9 +3115,8 @@ msgstr "Een bron-URL is verplicht."
 msgid "Could not create application."
 msgstr "Het was niet mogelijk de applicatie aan te maken."
 
-#, fuzzy
 msgid "Invalid image."
-msgstr "Ongeldige afmetingen."
+msgstr "Ongeldige afbeelding."
 
 #. TRANS: Title for form to create a group.
 msgid "New group"
@@ -3409,7 +3407,6 @@ msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Dit is uw Postvak UIT waarin de door u verzonden privéberichten staan."
 
 #. TRANS: Title for page where to change password.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Change password"
 msgstr "Wachtwoord wijzigen"
@@ -3437,7 +3434,6 @@ msgid "6 or more characters."
 msgstr "Zes of meer tekens"
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Bevestigen"
@@ -3448,7 +3444,6 @@ msgid "Same as password above."
 msgstr "Gelijk aan het wachtwoord hierboven."
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
 msgstr "Wijzigen"
@@ -3461,9 +3456,8 @@ msgid "Passwords don't match."
 msgstr "De wachtwoorden komen niet overeen."
 
 #. TRANS: Form validation error on page where to change password.
-#, fuzzy
 msgid "Incorrect old password."
-msgstr "Het oude wachtwoord is onjuist"
+msgstr "Het oude wachtwoord is onjuist."
 
 #. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
@@ -3550,12 +3544,10 @@ msgid "Fancy URLs"
 msgstr "Nette URL's"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Use fancy URLs (more readable and memorable)?"
-msgstr "Nette URL's (meer leesbaar en beter te onthouden) gebruiken?"
+msgstr "Nette URL's gebruiken (beter leesbaar en beter te onthouden)?"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Vormgeving"
@@ -3669,7 +3661,6 @@ msgid "Directory where attachments are located."
 msgstr "Map waar bijlagen worden opgeslagen."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
@@ -3754,7 +3745,6 @@ msgid "Enabled"
 msgstr "Ingeschakeld"
 
 #. TRANS: Tab and title for plugins admin panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Plug-ins"
@@ -3786,7 +3776,7 @@ msgstr "Ongeldige mededelinginhoud."
 
 #. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
 #. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr ""
 "De mededelingenlicentie \"%1$s\" is niet compatibel met de licentie \"%2$s\" "
@@ -4656,18 +4646,6 @@ msgstr "%s groep"
 msgid "%1$s group, page %2$d"
 msgstr "Groep %1$s, pagina %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Opmerking"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Aliassen"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Groepshandelingen"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4778,6 +4756,10 @@ msgstr "Bericht van %1$s op %2$s"
 msgid "Notice deleted."
 msgstr "Deze mededeling is verwijderd."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Mededelingen"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5319,7 +5301,6 @@ msgstr "Geen ID-argument."
 msgid "Tag %s"
 msgstr "Label %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Gebruikersprofiel"
 
@@ -6042,6 +6023,49 @@ msgstr "Er is geen XSD aangetroffen voor %s."
 msgid "No AtomPub API service for %s."
 msgstr "Er is geen AtomPub API-dienst voor %s."
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Gebruikershandelingen"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Bezig met het verwijderen van de gebruiker..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Profielinstellingen bewerken"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Bewerken"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Deze gebruiker een direct bericht zenden"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Bericht"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Modereren"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Gebruikersrol"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Beheerder"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderator"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6777,87 +6801,172 @@ 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:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"Commando's:\n"
-"on - notificaties inschakelen\n"
-"off - notificaties uitschakelen\n"
-"help - deze hulptekst weergeven\n"
-"follow <gebruiker> - abonneren op gebruiker\n"
-"groups - geef uw groepslidmaatschappen weer\n"
-"subscriptions - geeft uw gebruikersabonnenmenten weer\n"
-"subscribers - geeft de gebruikers die een abonnement op u hebben weer\n"
-"leave <gebruiker> - abonnement op gebruiker opzeggen\n"
-"d <gebruiker> <tekst> - direct bericht aan gebruiker\n"
-"get <gebruiker> - laatste mededeling van gebruiker opvragen\n"
-"whois <gebruiker> - profielinformatie van gebruiker opvragen\n"
-"lose <gebruiker> - zorgt ervoor dat de gebruiker u niet meer volgt\n"
-"fav <gebruiker> - laatste mededeling van gebruiker op favorietenlijst "
-"zetten\n"
-"fav #<mededeling-ID> - mededelingen met aangegeven ID op favorietenlijst "
-"zetten\n"
-"repeat #<mededeling-ID> - herhaal een mededelingen met een opgegeven ID\n"
-"repeat <gebruiker> - herhaal de laatste mededelingen van gebruiker\n"
-"reply #<mededeling-ID> - antwoorden op de mededeling met het aangegeven ID\n"
-"reply <gebruiker> - antwoorden op de laatste mededeling van gebruiker\n"
-"join <groep> - lid worden van groep\n"
-"login - verwijzing opvragen naar de webpagina voor aanmelden\n"
-"drop <groep> - groepslidmaatschap opzeggen\n"
-"stats - uw statistieken opvragen\n"
-"stop - zelfde als 'off'\n"
-"quit - zelfde als 'off'\n"
-"sub <gebruiker> - zelfde als 'follow'\n"
-"unsub <gebruiker> - zelfde als 'leave'\n"
-"last <gebruiker> - zelfde als 'get'\n"
-"on <gebruiker> - nog niet beschikbaar\n"
-"off <gebruiker> - nog niet beschikbaar\n"
-"nudge <gebruiker> - gebruiker porren\n"
-"invite <phone number> - nog niet beschikbaar\n"
-"track <word> - nog niet beschikbaar\n"
-"untrack <word> - nog niet beschikbaar\n"
-"track off - nog niet beschikbaar\n"
-"untrack all - nog niet beschikbaar\n"
-"tracks - nog niet beschikbaar\n"
-"tracking - nog niet beschikbaar\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Commandoresultaten"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Het is niet mogelijk de notificatie uit te schakelen."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Het is niet mogelijk de mededelingen uit te schakelen."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Abonneren op deze gebruiker"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Uitschrijven van deze gebruiker"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Privéberichten aan %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Het profiel op de andere server is geen groep!"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Deze mededeling herhalen"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Op deze mededeling antwoorden"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Onbekende groep."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Groep verwijderen"
+
+#. TRANS: Help message for IM/SMS command "stats"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr "Werk uw status bij..."
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Dit commando is nog niet geïmplementeerd."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -7031,6 +7140,9 @@ msgid ""
 msgstr ""
 "Locatie voor de groep - als relevant. Iets als \"Plaats, regio, land\"."
 
+msgid "Aliases"
+msgstr "Aliassen"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7110,6 +7222,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Vormgeving van de groep %s toevoegen of aanpassen"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Groepshandelingen"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Groepen met de meeste leden"
@@ -7683,6 +7799,7 @@ msgstr "Mededeling verzenden"
 msgid "What's up, %s?"
 msgstr "Hallo, %s."
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Toevoegen"
 
@@ -7751,7 +7868,7 @@ msgid "Notice repeated"
 msgstr "Mededeling herhaald"
 
 msgid "Update your status..."
-msgstr ""
+msgstr "Werk uw status bij..."
 
 msgid "Nudge this user"
 msgstr "Deze gebruiker porren"
@@ -8142,52 +8259,6 @@ msgstr "Abonnement opheffen"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Gebruiker %1$s (%2$d) heeft geen profielrecord."
 
-msgid "Edit Avatar"
-msgstr "Avatar bewerken"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Gebruikershandelingen"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Bezig met het verwijderen van de gebruiker..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Profielinstellingen bewerken"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Bewerken"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Deze gebruiker een direct bericht zenden"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Bericht"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Modereren"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Gebruikersrol"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Beheerder"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderator"
-
 msgid "Not allowed to log in."
 msgstr "Aanmelden is niet toegestaan."
 
@@ -8261,3 +8332,91 @@ msgstr "Ongeldige XML. De XRD-root mist."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "De back-up wordt uit het bestand \"%s\" geladen."
+
+#~ msgid "Note"
+#~ msgstr "Opmerking"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Commando's:\n"
+#~ "on - notificaties inschakelen\n"
+#~ "off - notificaties uitschakelen\n"
+#~ "help - deze hulptekst weergeven\n"
+#~ "follow <gebruiker> - abonneren op gebruiker\n"
+#~ "groups - geef uw groepslidmaatschappen weer\n"
+#~ "subscriptions - geeft uw gebruikersabonnenmenten weer\n"
+#~ "subscribers - geeft de gebruikers die een abonnement op u hebben weer\n"
+#~ "leave <gebruiker> - abonnement op gebruiker opzeggen\n"
+#~ "d <gebruiker> <tekst> - direct bericht aan gebruiker\n"
+#~ "get <gebruiker> - laatste mededeling van gebruiker opvragen\n"
+#~ "whois <gebruiker> - profielinformatie van gebruiker opvragen\n"
+#~ "lose <gebruiker> - zorgt ervoor dat de gebruiker u niet meer volgt\n"
+#~ "fav <gebruiker> - laatste mededeling van gebruiker op favorietenlijst "
+#~ "zetten\n"
+#~ "fav #<mededeling-ID> - mededelingen met aangegeven ID op favorietenlijst "
+#~ "zetten\n"
+#~ "repeat #<mededeling-ID> - herhaal een mededelingen met een opgegeven ID\n"
+#~ "repeat <gebruiker> - herhaal de laatste mededelingen van gebruiker\n"
+#~ "reply #<mededeling-ID> - antwoorden op de mededeling met het aangegeven "
+#~ "ID\n"
+#~ "reply <gebruiker> - antwoorden op de laatste mededeling van gebruiker\n"
+#~ "join <groep> - lid worden van groep\n"
+#~ "login - verwijzing opvragen naar de webpagina voor aanmelden\n"
+#~ "drop <groep> - groepslidmaatschap opzeggen\n"
+#~ "stats - uw statistieken opvragen\n"
+#~ "stop - zelfde als 'off'\n"
+#~ "quit - zelfde als 'off'\n"
+#~ "sub <gebruiker> - zelfde als 'follow'\n"
+#~ "unsub <gebruiker> - zelfde als 'leave'\n"
+#~ "last <gebruiker> - zelfde als 'get'\n"
+#~ "on <gebruiker> - nog niet beschikbaar\n"
+#~ "off <gebruiker> - nog niet beschikbaar\n"
+#~ "nudge <gebruiker> - gebruiker porren\n"
+#~ "invite <phone number> - nog niet beschikbaar\n"
+#~ "track <word> - nog niet beschikbaar\n"
+#~ "untrack <word> - nog niet beschikbaar\n"
+#~ "track off - nog niet beschikbaar\n"
+#~ "untrack all - nog niet beschikbaar\n"
+#~ "tracks - nog niet beschikbaar\n"
+#~ "tracking - nog niet beschikbaar\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Avatar bewerken"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index b874633a6e..c656fd64bd 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 - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:23+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:52+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ 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.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -601,7 +601,7 @@ msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s."
 msgid "%s's groups"
 msgstr "Grupy użytkownika %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%2$s jest członkiem grup %1$s."
@@ -4667,18 +4667,6 @@ msgstr "Grupa %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupa %1$s, strona %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Wpis"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Aliasy"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Działania grupy"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4789,6 +4777,10 @@ msgstr "Wiadomość od użytkownika %1$s na %2$s"
 msgid "Notice deleted."
 msgstr "Usunięto wpis."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Wpisy"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5326,7 +5318,6 @@ msgstr "Brak parametru identyfikatora."
 msgid "Tag %s"
 msgstr "Znacznik %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Profil użytkownika"
 
@@ -6054,6 +6045,49 @@ msgstr "Nie można odnaleźć XRD dla %s."
 msgid "No AtomPub API service for %s."
 msgstr "Brak API usługi AtomPub dla %s."
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Czynności użytkownika"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Trwa usuwanie użytkownika..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Zmodyfikuj ustawienia profilu"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Edycja"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Wiadomość"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderuj"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Rola użytkownika"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrator"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderator"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6778,87 +6812,171 @@ msgstr[0] "Jesteś członkiem tej grupy:"
 msgstr[1] "Jesteś członkiem tych grup:"
 msgstr[2] "Jesteś członkiem tych grup:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"Polecenia:\n"
-"on - włącza powiadomienia\n"
-"off - wyłącza powiadomienia\n"
-"help - wyświetla tę pomoc\n"
-"follow <pseudonim> - subskrybuje użytkownika\n"
-"groups - wyświetla listę grup, do których dołączyłeś\n"
-"subscriptions - wyświetla listę obserwowanych osób\n"
-"subscribers - wyświetla listę osób, które cię obserwują\n"
-"leave <pseudonim> - usuwa subskrypcję użytkownika\n"
-"d <pseudonim> <tekst> - bezpośrednia wiadomość do użytkownika\n"
-"get <pseudonim> - zwraca ostatni wpis użytkownika\n"
-"whois <pseudonim> - zwraca informacje o profilu użytkownika\n"
-"lose <pseudonim> - wymusza użytkownika do zatrzymania obserwowania cię\n"
-"fav <pseudonim> - dodaje ostatni wpis użytkownika jako \"ulubiony\"\n"
-"fav #<identyfikator_wpisu> - dodaje wpis z podanym identyfikatorem jako "
-"\"ulubiony\"\n"
-"repeat #<identyfikator_wpisu> - powtarza wiadomość z zadanym "
-"identyfikatorem\n"
-"repeat <pseudonim> - powtarza ostatnią wiadomość od użytkownika\n"
-"reply #<identyfikator_wpisu> - odpowiada na wpis z podanym identyfikatorem\n"
-"reply <pseudonim> - odpowiada na ostatni wpis użytkownika\n"
-"join <grupa> - dołącza do grupy\n"
-"login - pobiera odnośnik do zalogowania się do interfejsu WWW\n"
-"drop <grupa> - opuszcza grupę\n"
-"stats - pobiera statystyki\n"
-"stop - to samo co \"off\"\n"
-"quit - to samo co \"off\"\n"
-"sub <pseudonim> - to samo co \"follow\"\n"
-"unsub <pseudonim> - to samo co \"leave\"\n"
-"last <pseudonim> - to samo co \"get\"\n"
-"on <pseudonim> - jeszcze nie zaimplementowano\n"
-"off <pseudonim> - jeszcze nie zaimplementowano\n"
-"nudge <pseudonim> - przypomina użytkownikowi o aktualizacji\n"
-"invite <numer telefonu> - jeszcze nie zaimplementowano\n"
-"track <wyraz> - jeszcze nie zaimplementowano\n"
-"untrack <wyraz> - jeszcze nie zaimplementowano\n"
-"track off - jeszcze nie zaimplementowano\n"
-"untrack all - jeszcze nie zaimplementowano\n"
-"tracks - jeszcze nie zaimplementowano\n"
-"tracking - jeszcze nie zaimplementowano\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Wyniki polecenia"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Nie można włączyć powiadomień."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Nie można wyłączyć powiadomień."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Subskrybuj tego użytkownika"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Zrezygnuj z subskrypcji tego użytkownika"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Bezpośrednia wiadomość do użytkownika %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Zdalny profil nie jest grupą."
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Powtórz ten wpis"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Odpowiedz na ten wpis"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Nieznana grupa."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Usuń grupę"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Nie zaimplementowano polecenia."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -7034,6 +7152,9 @@ msgstr ""
 "Położenie grupy, jeśli istnieje, np. \"miasto, województwo (lub region), kraj"
 "\"."
 
+msgid "Aliases"
+msgstr "Aliasy"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7118,6 +7239,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Dodanie lub modyfikacja wyglądu grupy %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Działania grupy"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grupy z największą liczbą członków"
@@ -7689,6 +7814,7 @@ msgstr "Wyślij wpis"
 msgid "What's up, %s?"
 msgstr "Co słychać, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Załącz"
 
@@ -8153,52 +8279,6 @@ msgstr "Zrezygnuj z subskrypcji"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Użytkownik%1$s (%2$d) nie posiada wpisu profilu."
 
-msgid "Edit Avatar"
-msgstr "Zmodyfikuj awatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Czynności użytkownika"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Trwa usuwanie użytkownika..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Zmodyfikuj ustawienia profilu"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Edycja"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Wiadomość"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderuj"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Rola użytkownika"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrator"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderator"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Niezalogowany."
@@ -8279,3 +8359,91 @@ msgstr "Nieprawidłowy kod XML, brak głównego XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Pobieranie kopii zapasowej z pliku \"%s\"."
+
+#~ msgid "Note"
+#~ msgstr "Wpis"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Polecenia:\n"
+#~ "on - włącza powiadomienia\n"
+#~ "off - wyłącza powiadomienia\n"
+#~ "help - wyświetla tę pomoc\n"
+#~ "follow <pseudonim> - subskrybuje użytkownika\n"
+#~ "groups - wyświetla listę grup, do których dołączyłeś\n"
+#~ "subscriptions - wyświetla listę obserwowanych osób\n"
+#~ "subscribers - wyświetla listę osób, które cię obserwują\n"
+#~ "leave <pseudonim> - usuwa subskrypcję użytkownika\n"
+#~ "d <pseudonim> <tekst> - bezpośrednia wiadomość do użytkownika\n"
+#~ "get <pseudonim> - zwraca ostatni wpis użytkownika\n"
+#~ "whois <pseudonim> - zwraca informacje o profilu użytkownika\n"
+#~ "lose <pseudonim> - wymusza użytkownika do zatrzymania obserwowania cię\n"
+#~ "fav <pseudonim> - dodaje ostatni wpis użytkownika jako \"ulubiony\"\n"
+#~ "fav #<identyfikator_wpisu> - dodaje wpis z podanym identyfikatorem jako "
+#~ "\"ulubiony\"\n"
+#~ "repeat #<identyfikator_wpisu> - powtarza wiadomość z zadanym "
+#~ "identyfikatorem\n"
+#~ "repeat <pseudonim> - powtarza ostatnią wiadomość od użytkownika\n"
+#~ "reply #<identyfikator_wpisu> - odpowiada na wpis z podanym "
+#~ "identyfikatorem\n"
+#~ "reply <pseudonim> - odpowiada na ostatni wpis użytkownika\n"
+#~ "join <grupa> - dołącza do grupy\n"
+#~ "login - pobiera odnośnik do zalogowania się do interfejsu WWW\n"
+#~ "drop <grupa> - opuszcza grupę\n"
+#~ "stats - pobiera statystyki\n"
+#~ "stop - to samo co \"off\"\n"
+#~ "quit - to samo co \"off\"\n"
+#~ "sub <pseudonim> - to samo co \"follow\"\n"
+#~ "unsub <pseudonim> - to samo co \"leave\"\n"
+#~ "last <pseudonim> - to samo co \"get\"\n"
+#~ "on <pseudonim> - jeszcze nie zaimplementowano\n"
+#~ "off <pseudonim> - jeszcze nie zaimplementowano\n"
+#~ "nudge <pseudonim> - przypomina użytkownikowi o aktualizacji\n"
+#~ "invite <numer telefonu> - jeszcze nie zaimplementowano\n"
+#~ "track <wyraz> - jeszcze nie zaimplementowano\n"
+#~ "untrack <wyraz> - jeszcze nie zaimplementowano\n"
+#~ "track off - jeszcze nie zaimplementowano\n"
+#~ "untrack all - jeszcze nie zaimplementowano\n"
+#~ "tracks - jeszcze nie zaimplementowano\n"
+#~ "tracking - jeszcze nie zaimplementowano\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Zmodyfikuj awatar"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 8cba1b643c..1b1e41be95 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -17,17 +17,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:24+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:53+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -595,7 +595,7 @@ msgstr "Não foi possível remover %1$s do grupo %2$s."
 msgid "%s's groups"
 msgstr "Grupos de %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Grupos de %1$s de que %2$s é membro."
@@ -4652,18 +4652,6 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, página %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Anotação"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Nomes alternativos"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Acções do grupo"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4774,6 +4762,10 @@ msgstr "Mensagem de %1$s a %2$s"
 msgid "Notice deleted."
 msgstr "Avatar actualizado."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Notas"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5310,7 +5302,6 @@ msgstr "Argumento de identificação (ID) em falta."
 msgid "Tag %s"
 msgstr "Categoria %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Perfil"
 
@@ -6028,6 +6019,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Acções do utilizador"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "A apagar o utilizador..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Editar configurações do perfil"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Editar"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Enviar mensagem directa a este utilizador"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Mensagem"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderar"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Função"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Gestor"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderador"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6752,85 +6786,171 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Está no grupo:"
 msgstr[1] "Está nos grupos:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"Comandos:\n"
-"on - ligar notificações\n"
-"off - desligar notificações\n"
-"help - mostrar esta ajuda\n"
-"follow <utilizador> - subscrever este utilizador\n"
-"groups - lista os grupos a que se juntou\n"
-"subscriptions - lista as pessoas que está a seguir\n"
-"subscribers - lista as pessoas que estão a segui-lo(a)\n"
-"leave <utilizador> - deixar de subscrever este utilizador\n"
-"d <utilizador> <texto> - mensagem directa para o utilizador\n"
-"get <utilizador> - receber última nota do utilizador\n"
-"whois <utilizador> - receber perfil do utilizador\n"
-"lose <utilizador> - obrigar o utilizador a deixar de subscrevê-lo\n"
-"fav <utilizador> - adicionar última nota do utilizador às favoritas\n"
-"fav #<id_da_nota> - adicionar nota com esta identificação às favoritas\n"
-"repeat #<id_da_nota> - repetir uma nota com uma certa identificação\n"
-"repeat <utilizador> - repetir a última nota do utilizador\n"
-"reply #<id_da_nota> - responder à nota com esta identificação\n"
-"reply <utilizador> - responder à última nota do utilizador\n"
-"join <grupo> - juntar-se ao grupo\n"
-"login - Receber uma ligação para iniciar sessão na interface web\n"
-"drop <grupo> - afastar-se do grupo\n"
-"stats - receber as suas estatísticas\n"
-"stop - o mesmo que 'off'\n"
-"quit - o mesmo que 'off'\n"
-"sub <utilizador> - o mesmo que 'follow'\n"
-"unsub <utilizador> - o mesmo que 'leave'\n"
-"last <utilizador> - o mesmo que 'get'\n"
-"on <utilizador> - ainda não implementado.\n"
-"off <utilizador> - ainda não implementado.\n"
-"nudge <utilizador> - relembrar um utilizador para actualizar.\n"
-"invite <número de telefone> - ainda não implementado.\n"
-"track <palavra> - ainda não implementado.\n"
-"untrack <palavra> - ainda não implementado.\n"
-"track off - ainda não implementado.\n"
-"untrack all - ainda não implementado.\n"
-"tracks - ainda não implementado.\n"
-"tracking - ainda não implementado.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Resultados do comando"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Não foi possível ligar a notificação."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Não foi possível desligar a notificação."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Subscrever este utilizador"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Deixar de subscrever este utilizador"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Mensagens directas para %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Informação do perfil"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Repetir esta nota"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Responder a esta nota"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Grupo desconhecido."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Apagar grupo"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Comando ainda não implementado."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -7012,6 +7132,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Localidade do grupo, se aplicável, por ex. \"Cidade, Região, País\""
 
+msgid "Aliases"
+msgstr "Nomes alternativos"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7091,6 +7214,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Adicionar ou editar o design de %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Acções do grupo"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grupos com mais membros"
@@ -7661,6 +7788,7 @@ msgstr "Enviar uma nota"
 msgid "What's up, %s?"
 msgstr "Novidades, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Anexar"
 
@@ -8122,52 +8250,6 @@ msgstr "Abandonar"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Utilizador não tem perfil."
 
-msgid "Edit Avatar"
-msgstr "Editar Avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Acções do utilizador"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "A apagar o utilizador..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Editar configurações do perfil"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Editar"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Enviar mensagem directa a este utilizador"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Mensagem"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderar"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Função"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Gestor"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderador"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Não iniciou sessão."
@@ -8243,3 +8325,88 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Anotação"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Comandos:\n"
+#~ "on - ligar notificações\n"
+#~ "off - desligar notificações\n"
+#~ "help - mostrar esta ajuda\n"
+#~ "follow <utilizador> - subscrever este utilizador\n"
+#~ "groups - lista os grupos a que se juntou\n"
+#~ "subscriptions - lista as pessoas que está a seguir\n"
+#~ "subscribers - lista as pessoas que estão a segui-lo(a)\n"
+#~ "leave <utilizador> - deixar de subscrever este utilizador\n"
+#~ "d <utilizador> <texto> - mensagem directa para o utilizador\n"
+#~ "get <utilizador> - receber última nota do utilizador\n"
+#~ "whois <utilizador> - receber perfil do utilizador\n"
+#~ "lose <utilizador> - obrigar o utilizador a deixar de subscrevê-lo\n"
+#~ "fav <utilizador> - adicionar última nota do utilizador às favoritas\n"
+#~ "fav #<id_da_nota> - adicionar nota com esta identificação às favoritas\n"
+#~ "repeat #<id_da_nota> - repetir uma nota com uma certa identificação\n"
+#~ "repeat <utilizador> - repetir a última nota do utilizador\n"
+#~ "reply #<id_da_nota> - responder à nota com esta identificação\n"
+#~ "reply <utilizador> - responder à última nota do utilizador\n"
+#~ "join <grupo> - juntar-se ao grupo\n"
+#~ "login - Receber uma ligação para iniciar sessão na interface web\n"
+#~ "drop <grupo> - afastar-se do grupo\n"
+#~ "stats - receber as suas estatísticas\n"
+#~ "stop - o mesmo que 'off'\n"
+#~ "quit - o mesmo que 'off'\n"
+#~ "sub <utilizador> - o mesmo que 'follow'\n"
+#~ "unsub <utilizador> - o mesmo que 'leave'\n"
+#~ "last <utilizador> - o mesmo que 'get'\n"
+#~ "on <utilizador> - ainda não implementado.\n"
+#~ "off <utilizador> - ainda não implementado.\n"
+#~ "nudge <utilizador> - relembrar um utilizador para actualizar.\n"
+#~ "invite <número de telefone> - ainda não implementado.\n"
+#~ "track <palavra> - ainda não implementado.\n"
+#~ "untrack <palavra> - ainda não implementado.\n"
+#~ "track off - ainda não implementado.\n"
+#~ "untrack all - ainda não implementado.\n"
+#~ "tracks - ainda não implementado.\n"
+#~ "tracking - ainda não implementado.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Editar Avatar"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 66957c90c9..fc2eacbe50 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:25+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:54+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -601,7 +601,7 @@ msgstr "Não foi possível remover o usuário %1$s do grupo %2$s."
 msgid "%s's groups"
 msgstr "Grupos de %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Grupos de %1$s nos quais %2$s é membro."
@@ -4720,18 +4720,6 @@ msgstr "Grupo %s"
 msgid "%1$s group, page %2$d"
 msgstr "Grupo %1$s, pág. %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Mensagem"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Apelidos"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Ações do grupo"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4842,6 +4830,10 @@ msgstr "Mensagem de %1$s no %2$s"
 msgid "Notice deleted."
 msgstr "A mensagem excluída."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Mensagens"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5377,7 +5369,6 @@ msgstr "Nenhum argumento de ID."
 msgid "Tag %s"
 msgstr "Etiqueta %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Perfil do usuário"
 
@@ -6095,6 +6086,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Ações do usuário"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Exclusão do usuário em andamento..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Editar as configurações do perfil"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Editar"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Enviar uma mensagem para este usuário."
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Mensagem"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderar"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Papel do usuário"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administrador"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderador"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6829,86 +6863,171 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "Você é membro deste grupo:"
 msgstr[1] "Você é membro destes grupos:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"Comandos:\n"
-"on - ativa as notificações\n"
-"off - desativa as notificações\n"
-"help - exibe esta ajuda\n"
-"follow <identificação> - assina o usuário\n"
-"groups - lista os grupos aos quais você se associou\n"
-"subscriptions - lista as pessoas que você segue\n"
-"subscribers - lista as pessoas que seguem você\n"
-"leave <identificação> - deixa de assinar o usuário\n"
-"d <identificação> <texto> - mensagem direta para o usuário\n"
-"get <identificação> - obtém a última mensagem do usuário\n"
-"whois <identificação> - obtém as informações do perfil do usuário\n"
-"lose <identificação> - obriga o usuário a deixar de segui-lo\n"
-"fav <identificação> - adiciona a último mensagem do usuário como uma "
-"'favorita'\n"
-"fav #<id_da_mensagem> - adiciona a mensagem identificada como 'favorita'\n"
-"repeat #<id_da_mensagem> - repete a mensagem identificada\n"
-"repeat <identificação> - repete a última mensagem do usuário\n"
-"reply #<id_da_mensagem> - responde a mensagem identificada\n"
-"reply <identificação> - responde a última mensagem do usuário\n"
-"join <grupo> - associa-se ao grupo\n"
-"login - obtém um link para se autenticar na interface web\n"
-"drop <grupo> - deixa o grupo\n"
-"stats - obtém suas estatísticas\n"
-"stop - o mesmo que 'off'\n"
-"quit - o mesmo que 'off'\n"
-"sub <identificação> - o mesmo que 'follow'\n"
-"unsub <identificação> - o mesmo que 'leave'\n"
-"last <identificação> - o mesmo que 'get'\n"
-"on <identificação> - não implementado ainda\n"
-"off <identificação> - não implementado ainda\n"
-"nudge <identificação> - chama a atenção do usuário\n"
-"invite <número_de_ telefone> - não implementado ainda\n"
-"track <palavra> - não implementado ainda\n"
-"untrack <palavra> - não implementado ainda\n"
-"track off -  não implementado ainda\n"
-"untrack all -  não implementado ainda\n"
-"tracks -  não implementado ainda\n"
-"tracking -  não implementado ainda\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Resultados do comando"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Não é possível ligar a notificação."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Não é possível desligar a notificação."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Assinar este usuário"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Cancelar a assinatura deste usuário"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Mensagens diretas para %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Informações do perfil"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Repetir esta mensagem"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Responder a esta mensagem"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Grupo desconhecido."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Excluir o grupo"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "O comando não foi implementado ainda."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -7092,6 +7211,9 @@ msgstr ""
 "Localização do grupo, caso tenha alguma, como \"cidade, estado (ou região), "
 "país\""
 
+msgid "Aliases"
+msgstr "Apelidos"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7171,6 +7293,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Adicionar ou editar a aparência de %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Ações do grupo"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grupos com mais membros"
@@ -7743,6 +7869,7 @@ msgstr "Enviar uma mensagem"
 msgid "What's up, %s?"
 msgstr "E aí, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Anexo"
 
@@ -8202,52 +8329,6 @@ msgstr "Cancelar"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "O usuário não tem perfil."
 
-msgid "Edit Avatar"
-msgstr "Editar o avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Ações do usuário"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Exclusão do usuário em andamento..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Editar as configurações do perfil"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Editar"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Enviar uma mensagem para este usuário."
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Mensagem"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderar"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Papel do usuário"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administrador"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderador"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Você não está autenticado."
@@ -8323,3 +8404,89 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Mensagem"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Comandos:\n"
+#~ "on - ativa as notificações\n"
+#~ "off - desativa as notificações\n"
+#~ "help - exibe esta ajuda\n"
+#~ "follow <identificação> - assina o usuário\n"
+#~ "groups - lista os grupos aos quais você se associou\n"
+#~ "subscriptions - lista as pessoas que você segue\n"
+#~ "subscribers - lista as pessoas que seguem você\n"
+#~ "leave <identificação> - deixa de assinar o usuário\n"
+#~ "d <identificação> <texto> - mensagem direta para o usuário\n"
+#~ "get <identificação> - obtém a última mensagem do usuário\n"
+#~ "whois <identificação> - obtém as informações do perfil do usuário\n"
+#~ "lose <identificação> - obriga o usuário a deixar de segui-lo\n"
+#~ "fav <identificação> - adiciona a último mensagem do usuário como uma "
+#~ "'favorita'\n"
+#~ "fav #<id_da_mensagem> - adiciona a mensagem identificada como 'favorita'\n"
+#~ "repeat #<id_da_mensagem> - repete a mensagem identificada\n"
+#~ "repeat <identificação> - repete a última mensagem do usuário\n"
+#~ "reply #<id_da_mensagem> - responde a mensagem identificada\n"
+#~ "reply <identificação> - responde a última mensagem do usuário\n"
+#~ "join <grupo> - associa-se ao grupo\n"
+#~ "login - obtém um link para se autenticar na interface web\n"
+#~ "drop <grupo> - deixa o grupo\n"
+#~ "stats - obtém suas estatísticas\n"
+#~ "stop - o mesmo que 'off'\n"
+#~ "quit - o mesmo que 'off'\n"
+#~ "sub <identificação> - o mesmo que 'follow'\n"
+#~ "unsub <identificação> - o mesmo que 'leave'\n"
+#~ "last <identificação> - o mesmo que 'get'\n"
+#~ "on <identificação> - não implementado ainda\n"
+#~ "off <identificação> - não implementado ainda\n"
+#~ "nudge <identificação> - chama a atenção do usuário\n"
+#~ "invite <número_de_ telefone> - não implementado ainda\n"
+#~ "track <palavra> - não implementado ainda\n"
+#~ "untrack <palavra> - não implementado ainda\n"
+#~ "track off -  não implementado ainda\n"
+#~ "untrack all -  não implementado ainda\n"
+#~ "tracks -  não implementado ainda\n"
+#~ "tracking -  não implementado ainda\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Editar o avatar"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 69cfbaaae3..115aad39de 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -18,18 +18,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:26+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:55+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -607,7 +607,7 @@ msgstr "Не удаётся удалить пользователя %1$s из г
 msgid "%s's groups"
 msgstr "Группы %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Группы %1$s, в которых состоит %2$s."
@@ -4712,18 +4712,6 @@ msgstr "Группа %s"
 msgid "%1$s group, page %2$d"
 msgstr "Группа %1$s, страница %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Запись"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Алиасы"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Действия группы"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4834,6 +4822,10 @@ msgstr "Сообщение от %1$s на %2$s"
 msgid "Notice deleted."
 msgstr "Запись удалена."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Записи"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5373,7 +5365,6 @@ msgstr "Нет аргумента ID."
 msgid "Tag %s"
 msgstr "Теги %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Профиль пользователя"
 
@@ -6093,6 +6084,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Действия пользователя"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Идёт удаление пользователя…"
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Изменение настроек профиля"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Редактировать"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Послать приватное сообщение этому пользователю."
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Сообщение"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Модерировать"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Роль пользователя"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Администратор"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Модератор"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6826,85 +6860,171 @@ msgstr[0] "Вы являетесь участником следующих гр
 msgstr[1] "Вы являетесь участником следующих групп:"
 msgstr[2] "Вы являетесь участником следующих групп:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"Команды:\n"
-"on — включить уведомления\n"
-"off — отключить уведомления\n"
-"help — показать эту справку\n"
-"follow <nickname> — подписаться на пользователя\n"
-"groups — список групп, к которым вы присоединены\n"
-"subscriptions — список людей, за которыми вы следите\n"
-"subscribers — список людей, следящих на вами\n"
-"leave <nickname> — отписаться от пользователя\n"
-"d <nickname> <text> — прямое сообщение пользователю\n"
-"get <nickname> — получить последнюю запись от пользователя\n"
-"whois <nickname> — получить информацию из профиля пользователя\n"
-"lose <nickname> — отменить подписку пользователя на вас\n"
-"fav <nickname> — добавить последнюю запись пользователя в число любимых\n"
-"fav #<notice_id> — добавить запись с заданным id в число любимых\n"
-"repeat #<notice_id> — повторить уведомление с заданным id\n"
-"repeat <nickname> — повторить последнее уведомление от пользователя\n"
-"reply #<notice_id> — ответить на запись с заданным id\n"
-"reply <nickname> — ответить на последнюю запись пользователя\n"
-"join <group> — присоединиться к группе\n"
-"login — получить ссылку на вход в веб-интрефейсе\n"
-"drop <group> — покинуть группу\n"
-"stats — получить свою статистику\n"
-"stop — то же, что и 'off'\n"
-"quit — то же, что и 'off'\n"
-"sub <nickname> — то же, что и 'follow'\n"
-"unsub <nickname> — то же, что и 'leave'\n"
-"last <nickname> — то же, что и 'get'\n"
-"on <nickname> — пока не реализовано.\n"
-"off <nickname> — пока не реализовано.\n"
-"nudge <nickname> — напомнить пользователю обновиться.\n"
-"invite <phone number> — пока не реализовано.\n"
-"track <word> — пока не реализовано.\n"
-"untrack <word> — пока не реализовано.\n"
-"track off — пока не реализовано.\n"
-"untrack all — пока не реализовано.\n"
-"tracks — пока не реализовано.\n"
-"tracking — пока не реализовано.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Команда исполнена"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Есть оповещение."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Нет оповещения."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Подписаться на этого пользователя"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Отписаться от этого пользователя"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Прямые сообщения для %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Информация профиля"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Повторить эту запись"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Ответить на эту запись"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Неизвестно"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Удалить группу"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Команда ещё не выполнена."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -7083,6 +7203,9 @@ msgstr ""
 "Местонахождение группы, если есть, например «Город, область (или регион), "
 "страна»."
 
+msgid "Aliases"
+msgstr "Алиасы"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7167,6 +7290,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Добавить или изменить оформление %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Действия группы"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Группы с наибольшим количеством участников"
@@ -7234,7 +7361,7 @@ msgid "%dB"
 msgid_plural "%dB"
 msgstr[0] "%dБ"
 msgstr[1] "%dБ"
-msgstr[2] ""
+msgstr[2] "%dБ"
 
 #, php-format
 msgid ""
@@ -7739,6 +7866,7 @@ msgstr "Послать запись"
 msgid "What's up, %s?"
 msgstr "Что нового, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Прикрепить"
 
@@ -8201,52 +8329,6 @@ msgstr "Отписаться"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "У пользователя %1$s (%2$d) нет записи профиля."
 
-msgid "Edit Avatar"
-msgstr "Изменить аватару"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Действия пользователя"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Идёт удаление пользователя…"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Изменение настроек профиля"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Редактировать"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Послать приватное сообщение этому пользователю."
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Сообщение"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Модерировать"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Роль пользователя"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Администратор"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Модератор"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Не авторизован."
@@ -8327,3 +8409,88 @@ msgstr "Неверный XML, отсутствует корень XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Получение резервной копии из файла «%s»."
+
+#~ msgid "Note"
+#~ msgstr "Запись"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Команды:\n"
+#~ "on — включить уведомления\n"
+#~ "off — отключить уведомления\n"
+#~ "help — показать эту справку\n"
+#~ "follow <nickname> — подписаться на пользователя\n"
+#~ "groups — список групп, к которым вы присоединены\n"
+#~ "subscriptions — список людей, за которыми вы следите\n"
+#~ "subscribers — список людей, следящих на вами\n"
+#~ "leave <nickname> — отписаться от пользователя\n"
+#~ "d <nickname> <text> — прямое сообщение пользователю\n"
+#~ "get <nickname> — получить последнюю запись от пользователя\n"
+#~ "whois <nickname> — получить информацию из профиля пользователя\n"
+#~ "lose <nickname> — отменить подписку пользователя на вас\n"
+#~ "fav <nickname> — добавить последнюю запись пользователя в число любимых\n"
+#~ "fav #<notice_id> — добавить запись с заданным id в число любимых\n"
+#~ "repeat #<notice_id> — повторить уведомление с заданным id\n"
+#~ "repeat <nickname> — повторить последнее уведомление от пользователя\n"
+#~ "reply #<notice_id> — ответить на запись с заданным id\n"
+#~ "reply <nickname> — ответить на последнюю запись пользователя\n"
+#~ "join <group> — присоединиться к группе\n"
+#~ "login — получить ссылку на вход в веб-интрефейсе\n"
+#~ "drop <group> — покинуть группу\n"
+#~ "stats — получить свою статистику\n"
+#~ "stop — то же, что и 'off'\n"
+#~ "quit — то же, что и 'off'\n"
+#~ "sub <nickname> — то же, что и 'follow'\n"
+#~ "unsub <nickname> — то же, что и 'leave'\n"
+#~ "last <nickname> — то же, что и 'get'\n"
+#~ "on <nickname> — пока не реализовано.\n"
+#~ "off <nickname> — пока не реализовано.\n"
+#~ "nudge <nickname> — напомнить пользователю обновиться.\n"
+#~ "invite <phone number> — пока не реализовано.\n"
+#~ "track <word> — пока не реализовано.\n"
+#~ "untrack <word> — пока не реализовано.\n"
+#~ "track off — пока не реализовано.\n"
+#~ "untrack all — пока не реализовано.\n"
+#~ "tracks — пока не реализовано.\n"
+#~ "tracking — пока не реализовано.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Изменить аватару"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 8ffd6aab4d..ad93b2765c 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: 2011-03-11 18:15+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+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"
@@ -176,7 +176,7 @@ msgstr ""
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
 #: actions/all.php:94 actions/all.php:185 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/adminpanelnav.php:70 lib/personalgroupnav.php:72 lib/settingsnav.php:71
+#: lib/adminpanelnav.php:70 lib/personalgroupnav.php:75 lib/settingsnav.php:71
 #, php-format
 msgid "%s and friends"
 msgstr ""
@@ -228,7 +228,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:149 actions/replies.php:198 actions/showstream.php:221
+#: actions/all.php:149 actions/replies.php:198 actions/showstream.php:219
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -759,7 +759,7 @@ msgstr ""
 msgid "%s's groups"
 msgstr ""
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
@@ -1028,7 +1028,7 @@ msgstr ""
 #. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
 #: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
-#: actions/shownotice.php:92
+#: actions/shownotice.php:95
 msgid "No such notice."
 msgstr ""
 
@@ -1230,39 +1230,39 @@ msgid "Atom post must not be empty."
 msgstr ""
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
-#: actions/apitimelineuser.php:328
+#: actions/apitimelineuser.php:331
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:334 actions/atompubfavoritefeed.php:228
+#: actions/apitimelineuser.php:337 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
-#: actions/apitimelineuser.php:345
+#: actions/apitimelineuser.php:348
 msgid "Can only handle POST activities."
 msgstr ""
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:356
+#: actions/apitimelineuser.php:359
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#: actions/apitimelineuser.php:390
+#: actions/apitimelineuser.php:393
 #, php-format
 msgid "No content for notice %d."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#: actions/apitimelineuser.php:419
+#: actions/apitimelineuser.php:422
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
@@ -1902,7 +1902,7 @@ msgstr ""
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1409
+#: lib/action.php:1448
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -2679,7 +2679,7 @@ msgstr ""
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:88
+#: lib/personalgroupnav.php:91
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
@@ -3757,7 +3757,7 @@ msgstr ""
 
 #. TRANS: Page title after an AJAX error occurred on the "send direct message" page.
 #. TRANS: Page title after an AJAX error occurs on the send notice page.
-#: actions/newmessage.php:227 actions/newnotice.php:264
+#: actions/newmessage.php:227 actions/newnotice.php:264 lib/error.php:117
 msgid "Ajax Error"
 msgstr ""
 
@@ -3922,12 +3922,12 @@ msgid "Notice %s not found."
 msgstr ""
 
 #. TRANS: Server error displayed in oEmbed action when notice has not profile.
-#: actions/oembed.php:85 actions/shownotice.php:100
+#: actions/oembed.php:85 actions/shownotice.php:103
 msgid "Notice has no profile."
 msgstr ""
 
 #. TRANS: oEmbed title. %1$s is the author name, %2$s is the creation date.
-#: actions/oembed.php:89 actions/shownotice.php:172
+#: actions/oembed.php:89 actions/shownotice.php:175
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr ""
@@ -5080,8 +5080,8 @@ msgid "URL of your profile on another compatible microblogging service."
 msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
-#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:406
+#: actions/remotesubscribe.php:136 lib/accountprofileblock.php:288
+#: lib/subscribeform.php:139
 msgid "Subscribe"
 msgstr ""
 
@@ -5127,7 +5127,7 @@ msgstr ""
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:83
+#: lib/personalgroupnav.php:86
 #, php-format
 msgid "Replies to %s"
 msgstr ""
@@ -5437,47 +5437,32 @@ msgstr ""
 msgid "%1$s group, page %2$d"
 msgstr ""
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:266
-msgid "Note"
-msgstr ""
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:277 lib/groupeditform.php:180
-msgid "Aliases"
-msgstr ""
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:294
-msgid "Group actions"
-msgstr ""
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:338
+#: actions/showgroup.php:221
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:228
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
+#: actions/showgroup.php:235
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:358
+#: actions/showgroup.php:241
 #, php-format
 msgid "FOAF for %s group"
 msgstr ""
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:395
+#: actions/showgroup.php:278
 msgid "Members"
 msgstr ""
 
@@ -5485,30 +5470,30 @@ msgstr ""
 #. TRANS: Text for user subscription statistics if the user has no subscriptions.
 #. TRANS: Text for user subscriber statistics if user has no subscribers.
 #. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#: actions/showgroup.php:401 lib/profileaction.php:137
+#: actions/showgroup.php:284 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:123 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr ""
 
 #. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:410
+#: actions/showgroup.php:293
 msgid "All members"
 msgstr ""
 
 #. TRANS: Header for group statistics on a group page (h2).
 #. TRANS: H2 text for user statistics.
-#: actions/showgroup.php:441 lib/profileaction.php:205
+#: actions/showgroup.php:324 lib/profileaction.php:205
 msgid "Statistics"
 msgstr ""
 
-#: actions/showgroup.php:444
+#: actions/showgroup.php:327
 msgctxt "LABEL"
 msgid "Created"
 msgstr ""
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:449
+#: actions/showgroup.php:332
 msgctxt "LABEL"
 msgid "Members"
 msgstr ""
@@ -5517,7 +5502,7 @@ msgstr ""
 #. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:464
+#: actions/showgroup.php:347
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5530,7 +5515,7 @@ msgstr ""
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
 #. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:474
+#: actions/showgroup.php:357
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5540,7 +5525,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:503
+#: actions/showgroup.php:386
 msgid "Admins"
 msgstr ""
 
@@ -5568,71 +5553,75 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/shownotice.php:90
+#: actions/shownotice.php:93
 msgid "Notice deleted."
 msgstr ""
 
+#: actions/shownotice.php:248
+msgid "Notice"
+msgstr ""
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#: actions/showstream.php:70
+#: actions/showstream.php:69
 #, php-format
 msgid "%1$s tagged %2$s"
 msgstr ""
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
-#: actions/showstream.php:74
+#: actions/showstream.php:73
 #, php-format
 msgid "%1$s tagged %2$s, page %3$d"
 msgstr ""
 
 #. TRANS: Extended page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$d is the page number.
-#: actions/showstream.php:82
+#: actions/showstream.php:81
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
-#: actions/showstream.php:127
+#: actions/showstream.php:131
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:136
+#: actions/showstream.php:140
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#: actions/showstream.php:145
+#: actions/showstream.php:149
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/showstream.php:152
+#: actions/showstream.php:156
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
 #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
-#: actions/showstream.php:159
+#: actions/showstream.php:163
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
-#: actions/showstream.php:205
+#: actions/showstream.php:203
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
 #. TRANS: Second sentence of empty list message for a stream for the user themselves.
-#: actions/showstream.php:211
+#: actions/showstream.php:209
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -5640,7 +5629,7 @@ msgstr ""
 
 #. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:215
+#: actions/showstream.php:213
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -5649,7 +5638,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:258
+#: actions/showstream.php:256
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5660,7 +5649,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/showstream.php:265
+#: actions/showstream.php:263
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5669,7 +5658,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
-#: actions/showstream.php:322
+#: actions/showstream.php:327
 #, php-format
 msgid "Repeat of %s"
 msgstr ""
@@ -6183,8 +6172,7 @@ msgstr ""
 msgid "Tag %s"
 msgstr ""
 
-#. TRANS: H2 for user profile information.
-#: actions/tagother.php:77 lib/userprofile.php:76
+#: actions/tagother.php:77
 msgid "User profile"
 msgstr ""
 
@@ -6339,7 +6327,7 @@ msgstr ""
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/personalgroupnav.php:76
+#: actions/useradminpanel.php:215 lib/personalgroupnav.php:79
 #: lib/settingsnav.php:83 lib/subgroupnav.php:79
 msgid "Profile"
 msgstr ""
@@ -6834,25 +6822,25 @@ msgid "Problem saving notice."
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:937
+#: classes/Notice.php:944
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1036
+#: classes/Notice.php:1043
 msgid "Problem saving group inbox."
 msgstr ""
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1152
+#: classes/Notice.php:1159
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 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:1671
+#: classes/Notice.php:1678
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6993,35 +6981,88 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/accountprofileblock.php:103 lib/accountprofileblock.php:118
+msgid "User actions"
+msgstr ""
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/accountprofileblock.php:107
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+#: lib/accountprofileblock.php:134
+msgid "Edit profile settings"
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+#: lib/accountprofileblock.php:136
+msgid "Edit"
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+#: lib/accountprofileblock.php:160
+msgid "Send a direct message to this user"
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+#: lib/accountprofileblock.php:162
+msgid "Message"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+#: lib/accountprofileblock.php:204
+msgid "Moderate"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+#: lib/accountprofileblock.php:243
+msgid "User role"
+msgstr ""
+
+#. TRANS: Role that can be set for a user profile.
+#: lib/accountprofileblock.php:246
+msgctxt "role"
+msgid "Administrator"
+msgstr ""
+
+#. TRANS: Role that can be set for a user profile.
+#: lib/accountprofileblock.php:248
+msgctxt "role"
+msgid "Moderator"
+msgstr ""
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:161
+#: lib/action.php:166
 #, php-format
 msgid "%1$s - %2$s"
 msgstr ""
 
 #. TRANS: Page title for a page without a title set.
-#: lib/action.php:177
+#: lib/action.php:182
 msgid "Untitled page"
 msgstr ""
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:338
+#: lib/action.php:355
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#: lib/action.php:341
+#: lib/action.php:358
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr ""
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
-#: lib/action.php:344
+#: lib/action.php:361 lib/threadednoticelist.php:317
 msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:590
+#: lib/action.php:607
 msgid "Status"
 msgstr ""
 
@@ -7029,7 +7070,7 @@ msgstr ""
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:939
+#: lib/action.php:978
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7037,7 +7078,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:942
+#: lib/action.php:981
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7046,7 +7087,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:949
+#: lib/action.php:988
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7056,39 +7097,39 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:967
+#: lib/action.php:1006
 #, 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:974
+#: lib/action.php:1013
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:978
+#: lib/action.php:1017
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %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:1010
+#: lib/action.php:1049
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1353
+#: lib/action.php:1392
 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1363
+#: lib/action.php:1402
 msgid "Before"
 msgstr ""
 
@@ -7211,7 +7252,7 @@ msgid "Unable to delete design setting."
 msgstr ""
 
 #: lib/adminpanelnav.php:65 lib/adminpanelnav.php:69
-#: lib/defaultlocalnav.php:58 lib/personalgroupnav.php:71
+#: lib/defaultlocalnav.php:58 lib/personalgroupnav.php:74
 #: lib/settingsnav.php:66 lib/settingsnav.php:70
 msgid "Home"
 msgstr ""
@@ -7245,7 +7286,7 @@ msgid "User configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelnav.php:102 lib/personalgroupnav.php:88
+#: lib/adminpanelnav.php:102 lib/personalgroupnav.php:91
 msgid "User"
 msgstr ""
 
@@ -7833,47 +7874,189 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 msgstr[1] ""
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:916
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#: lib/command.php:915
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on"
+#: lib/command.php:917
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "off"
+#: lib/command.php:919
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "help"
+#: lib/command.php:921
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#: lib/command.php:923
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "groups"
+#: lib/command.php:925
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+#: lib/command.php:927
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+#: lib/command.php:929
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#: lib/command.php:931
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#: lib/command.php:933
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+#: lib/command.php:935
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#: lib/command.php:937
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+#: lib/command.php:939
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+#: lib/command.php:941
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+#: lib/command.php:943
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+#: lib/command.php:945
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#: lib/command.php:947
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+#: lib/command.php:949
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#: lib/command.php:951
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#: lib/command.php:953
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "login"
+#: lib/command.php:955
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#: lib/command.php:957
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stats"
+#: lib/command.php:959
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+#: lib/command.php:961 lib/command.php:963
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+#: lib/command.php:965
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+#: lib/command.php:967
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+#: lib/command.php:969
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#: lib/command.php:971 lib/command.php:973 lib/command.php:977
+#: lib/command.php:979 lib/command.php:981 lib/command.php:983
+#: lib/command.php:985 lib/command.php:987 lib/command.php:989
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+#: lib/command.php:975
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -8087,6 +8270,10 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 
+#: lib/groupeditform.php:180
+msgid "Aliases"
+msgstr ""
+
 #: lib/groupeditform.php:183
 #, php-format
 msgid ""
@@ -8176,6 +8363,11 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+#: lib/groupprofileblock.php:94
+msgid "Group actions"
+msgstr ""
+
 #. TRANS: Title for groups with the most members section.
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
@@ -8563,7 +8755,7 @@ msgstr ""
 msgid "Inbox"
 msgstr ""
 
-#: lib/mailboxmenu.php:60 lib/personalgroupnav.php:99
+#: lib/mailboxmenu.php:60 lib/personalgroupnav.php:102
 msgid "Your incoming messages"
 msgstr ""
 
@@ -8658,7 +8850,7 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr ""
 
-#: lib/messagelist.php:77 lib/personalgroupnav.php:98
+#: lib/messagelist.php:77 lib/personalgroupnav.php:101
 msgid "Messages"
 msgstr ""
 
@@ -8666,19 +8858,19 @@ msgstr ""
 msgid "from"
 msgstr ""
 
-#: lib/microappplugin.php:302
+#: lib/microappplugin.php:340
 msgid "Can't get author for activity."
 msgstr ""
 
-#: lib/microappplugin.php:339
+#: lib/microappplugin.php:377
 msgid "Bookmark not posted to this group."
 msgstr ""
 
-#: lib/microappplugin.php:352
+#: lib/microappplugin.php:390
 msgid "Object not posted to this user."
 msgstr ""
 
-#: lib/microappplugin.php:356
+#: lib/microappplugin.php:394
 msgid "Don't know how to handle this kind of target."
 msgstr ""
 
@@ -8827,15 +9019,15 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#: lib/personalgroupnav.php:77
+#: lib/personalgroupnav.php:80
 msgid "Your profile"
 msgstr ""
 
-#: lib/personalgroupnav.php:82
+#: lib/personalgroupnav.php:85
 msgid "Replies"
 msgstr ""
 
-#: lib/personalgroupnav.php:87
+#: lib/personalgroupnav.php:90
 msgid "Favorites"
 msgstr ""
 
@@ -9234,7 +9426,7 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr ""
 
-#: lib/threadednoticelist.php:270
+#: lib/threadednoticelist.php:273
 #, php-format
 msgid "Show %d reply"
 msgid_plural "Show all %d replies"
@@ -9282,79 +9474,22 @@ msgstr ""
 msgid "User %1$s (%2$d) has no profile record."
 msgstr ""
 
-#: lib/userprofile.php:118
-msgid "Edit Avatar"
-msgstr ""
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:220 lib/userprofile.php:236
-msgid "User actions"
-msgstr ""
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:224
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:252
-msgid "Edit profile settings"
-msgstr ""
-
-#. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:254
-msgid "Edit"
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:278
-msgid "Send a direct message to this user"
-msgstr ""
-
-#. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:280
-msgid "Message"
-msgstr ""
-
-#. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:322
-msgid "Moderate"
-msgstr ""
-
-#. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:361
-msgid "User role"
-msgstr ""
-
-#. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:364
-msgctxt "role"
-msgid "Administrator"
-msgstr ""
-
-#. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:366
-msgctxt "role"
-msgid "Moderator"
-msgstr ""
-
 #: lib/util.php:321
 msgid "Not allowed to log in."
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1337
+#: lib/util.php:1331
 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1340
+#: lib/util.php:1334
 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1344
+#: lib/util.php:1338
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9362,12 +9497,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1347
+#: lib/util.php:1341
 msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1351
+#: lib/util.php:1345
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9375,12 +9510,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1354
+#: lib/util.php:1348
 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1358
+#: lib/util.php:1352
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9388,12 +9523,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1361
+#: lib/util.php:1355
 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1365
+#: lib/util.php:1359
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9401,7 +9536,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1368
+#: lib/util.php:1362
 msgid "about a year ago"
 msgstr ""
 
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 8550a1fdd8..289b4b09f7 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -13,17 +13,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:27+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:57+0000\n"
 "Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -592,7 +592,7 @@ msgstr "Kunde inte ta bort användare %1$s från grupp %2$s."
 msgid "%s's groups"
 msgstr "%ss grupper"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s grupper %2$s är en medlem i."
@@ -4691,18 +4691,6 @@ msgstr "%s grupp"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s grupp, sida %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Notis"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Alias"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Åtgärder för grupp"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4812,6 +4800,10 @@ msgstr "Meddelande från %1$s på %2$s"
 msgid "Notice deleted."
 msgstr "Notis borttagen."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Notiser"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5346,7 +5338,6 @@ msgstr "Inget ID-argument."
 msgid "Tag %s"
 msgstr "Tagg %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Användarprofil"
 
@@ -6067,6 +6058,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Åtgärder för användare"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Borttagning av användare pågår..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Redigera profilinställningar"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Redigera"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Skicka ett direktmeddelande till denna användare"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Meddelande"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Moderera"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Användarroll"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administratör"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderator"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6786,85 +6820,171 @@ 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:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"Kommandon:\n"
-"on - sätt på notifikationer\n"
-"off - stäng av notifikationer\n"
-"help - visa denna hjälp\n"
-"follow <smeknamn> - prenumerera på användare\n"
-"groups - lista grupperna du tillhör\n"
-"subscriptions - lista personerna du följer\n"
-"subscribers - lista personerna som följer dig\n"
-"leave <smeknamn> - avsluta prenumeration på användare\n"
-"d <smeknamn> <text> - direktmeddelande till användare\n"
-"get <smeknamn> - hämta senaste notis från användare\n"
-"whois <smeknamn> - hämta profilinformation om användare\n"
-"lose <smeknamn> - tvinga användare att sluta följa dig\n"
-"fav <smeknamn> - lägg till användarens senaste notis som favorit\n"
-"fav #<notisid> - lägg till notis med given id som favorit\n"
-"repeat #<notisid> - upprepa en notis med en given id\n"
-"repeat <smeknamn> - upprepa den senaste notisen från användare\n"
-"reply #<notisid> - svara på notis med en given id\n"
-"reply <smeknamn> - svara på den senaste notisen från användare\n"
-"join <grupp> - gå med i grupp\n"
-"login - hämta en länk till webbgränssnittets inloggningssida\n"
-"drop <grupp> - lämna grupp\n"
-"stats - hämta din statistik\n"
-"stop - samma som 'off'\n"
-"quit - samma som 'off'\n"
-"sub <smeknamn> - samma som 'follow'\n"
-"unsub <smeknamn> - samma som 'leave'\n"
-"last <smeknamn> - samma som 'get'\n"
-"on <smeknamn> - inte implementerat än.\n"
-"off <smeknamn> - inte implementerat än.\n"
-"nudge <smeknamn> - påminn en användare om att uppdatera\n"
-"invite <telefonnummer> - inte implementerat än.\n"
-"track <ord> - inte implementerat än.\n"
-"untrack <ord> - inte implementerat än.\n"
-"track off - inte implementerat än.\n"
-"untrack all - inte implementerat än.\n"
-"tracks - inte implementerat än.\n"
-"tracking - inte implementerat än.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Resultat av kommando"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Kan inte stänga av notifikation."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Kan inte sätta på notifikation."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Prenumerera på denna användare"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Avsluta prenumerationen på denna användare"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Direktmeddelande till %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Profilinformation"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Upprepa denna notis"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Svara på denna notis"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Okänd grupp."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Ta bort grupp"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Kommando inte implementerat än."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #, fuzzy
@@ -7045,6 +7165,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Plats för gruppen, om den finns, såsom \"Stad, Län, Land\""
 
+msgid "Aliases"
+msgstr "Alias"
+
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7124,6 +7247,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Lägg till eller redigera %s utseende"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Åtgärder för grupp"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Grupper med flest medlemmar"
@@ -7691,6 +7818,7 @@ msgstr "Skicka en notis"
 msgid "What's up, %s?"
 msgstr "Vad är på gång, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Bifoga"
 
@@ -8148,52 +8276,6 @@ msgstr "Avsluta pren."
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Användaren har ingen profil."
 
-msgid "Edit Avatar"
-msgstr "Redigera avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Åtgärder för användare"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Borttagning av användare pågår..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Redigera profilinställningar"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Redigera"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Skicka ett direktmeddelande till denna användare"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Meddelande"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Moderera"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Användarroll"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Administratör"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Moderator"
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Inte inloggad."
@@ -8269,3 +8351,88 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Notis"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Kommandon:\n"
+#~ "on - sätt på notifikationer\n"
+#~ "off - stäng av notifikationer\n"
+#~ "help - visa denna hjälp\n"
+#~ "follow <smeknamn> - prenumerera på användare\n"
+#~ "groups - lista grupperna du tillhör\n"
+#~ "subscriptions - lista personerna du följer\n"
+#~ "subscribers - lista personerna som följer dig\n"
+#~ "leave <smeknamn> - avsluta prenumeration på användare\n"
+#~ "d <smeknamn> <text> - direktmeddelande till användare\n"
+#~ "get <smeknamn> - hämta senaste notis från användare\n"
+#~ "whois <smeknamn> - hämta profilinformation om användare\n"
+#~ "lose <smeknamn> - tvinga användare att sluta följa dig\n"
+#~ "fav <smeknamn> - lägg till användarens senaste notis som favorit\n"
+#~ "fav #<notisid> - lägg till notis med given id som favorit\n"
+#~ "repeat #<notisid> - upprepa en notis med en given id\n"
+#~ "repeat <smeknamn> - upprepa den senaste notisen från användare\n"
+#~ "reply #<notisid> - svara på notis med en given id\n"
+#~ "reply <smeknamn> - svara på den senaste notisen från användare\n"
+#~ "join <grupp> - gå med i grupp\n"
+#~ "login - hämta en länk till webbgränssnittets inloggningssida\n"
+#~ "drop <grupp> - lämna grupp\n"
+#~ "stats - hämta din statistik\n"
+#~ "stop - samma som 'off'\n"
+#~ "quit - samma som 'off'\n"
+#~ "sub <smeknamn> - samma som 'follow'\n"
+#~ "unsub <smeknamn> - samma som 'leave'\n"
+#~ "last <smeknamn> - samma som 'get'\n"
+#~ "on <smeknamn> - inte implementerat än.\n"
+#~ "off <smeknamn> - inte implementerat än.\n"
+#~ "nudge <smeknamn> - påminn en användare om att uppdatera\n"
+#~ "invite <telefonnummer> - inte implementerat än.\n"
+#~ "track <ord> - inte implementerat än.\n"
+#~ "untrack <ord> - inte implementerat än.\n"
+#~ "track off - inte implementerat än.\n"
+#~ "untrack all - inte implementerat än.\n"
+#~ "tracks - inte implementerat än.\n"
+#~ "tracking - inte implementerat än.\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Redigera avatar"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index a9718f4c01..afc3188748 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:29+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:58+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -580,7 +580,7 @@ msgstr "వాడుకరి %1$sని %2$s గుంపు నుండి 
 msgid "%s's groups"
 msgstr "%s యొక్క గుంపులు"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%2$s సభ్యులుగా ఉన్న %2$s గుంపులు."
@@ -621,9 +621,8 @@ msgstr "పేరులో చిన్నబడి అక్షరాలు మ
 
 #. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
-msgstr "మారుపేరు పేరుతో సమానంగా ఉండకూడదు."
+msgstr "మారుపేరు ముద్దుపేరూ ఒకటే కాకూడదు."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
 msgid "Upload failed."
@@ -1244,9 +1243,8 @@ msgid "No file uploaded."
 msgstr "ఏ దస్త్రమూ ఎక్కింపబడలేదు."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#, fuzzy
 msgid "Pick a square area of the image to be your avatar."
-msgstr "మీ అవతారానికి గానూ ఈ చిత్రం నుండి ఒక చతురస్రపు ప్రదేశాన్ని ఎంచుకోండి"
+msgstr "మీ అవతారంగా ఉండాల్సిన చతురస్రపు ప్రదేశాన్ని బొమ్మ నుండి ఎంచుకోండి."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
@@ -4598,18 +4596,6 @@ msgstr "%s గుంపు"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s గుంపు , %2$dవ పేజీ"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "గమనిక"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "మారుపేర్లు"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "గుంపు చర్యలు"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4723,6 +4709,10 @@ msgstr "%2$sలో %1$sకి స్పందనలు!"
 msgid "Notice deleted."
 msgstr "నోటీసుని తొలగించాం."
 
+#, fuzzy
+msgid "Notice"
+msgstr "సందేశాలు"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5252,7 +5242,6 @@ msgstr "జోడింపులు లేవు."
 msgid "Tag %s"
 msgstr "ట్యాగులు"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "వాడుకరి ప్రొఫైలు"
 
@@ -5933,6 +5922,50 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "వాడుకరి చర్యలు"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "వాడుకరి తొలగింపు కొనసాగుతూంది..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "ఫ్రొఫైలు అమరికలని మార్చు"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "మార్చు"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "ఈ వాడుకరికి ఒక నేరు సందేశాన్ని పంపించండి"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "సందేశం"
+
+#. TRANS: Label text on user profile to select a user role.
+#, fuzzy
+msgid "Moderate"
+msgstr "సమన్వయకర్త"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "వాడుకరి పాత్ర"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "నిర్వాహకులు"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "సమన్వయకర్త"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6657,46 +6690,170 @@ msgid_plural "You are a member of these groups:"
 msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "ఆదేశ ఫలితాలు"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "ఈ వాడుకరికి చందాచేరు"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "ఈ వాడుకరి నుండి చందామాను"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "%s కి నేరు సందేశాలు"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "ప్రొఫైలు సమాచారం"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "ఈ నోటీసుని పునరావృతించు"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "ఈ నోటీసుపై స్పందించండి"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "గుర్తుతెలియని గుంపు."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "గుంపు తొలగింపు"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "క్షమించండి, ఈ ఆదేశం ఇంకా అమలుపరచబడలేదు."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6879,6 +7036,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "గుంపు యొక్క ప్రాంతం, ఉంటే, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
+msgid "Aliases"
+msgstr "మారుపేర్లు"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -6956,6 +7116,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "గుంపు చర్యలు"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "ఎక్కువమంది సభ్యులున్న గుంపులు"
@@ -7510,6 +7674,7 @@ msgstr "సైటు గమనిక"
 msgid "What's up, %s?"
 msgstr "%s, ఏమిటి సంగతులు?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "జోడించు"
 
@@ -7967,53 +8132,6 @@ msgstr "చందామాను"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 
-msgid "Edit Avatar"
-msgstr "అవతారాన్ని మార్చు"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "వాడుకరి చర్యలు"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "వాడుకరి తొలగింపు కొనసాగుతూంది..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "ఫ్రొఫైలు అమరికలని మార్చు"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "మార్చు"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "ఈ వాడుకరికి ఒక నేరు సందేశాన్ని పంపించండి"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "సందేశం"
-
-#. TRANS: Label text on user profile to select a user role.
-#, fuzzy
-msgid "Moderate"
-msgstr "సమన్వయకర్త"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "వాడుకరి పాత్ర"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "నిర్వాహకులు"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "సమన్వయకర్త"
-
 msgid "Not allowed to log in."
 msgstr "ప్రవేశించడానికి అనుమతి లేదు."
 
@@ -8087,3 +8205,9 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "గమనిక"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "అవతారాన్ని మార్చు"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 89e5b94c84..db1e94fb57 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:30+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:49:59+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -589,7 +589,7 @@ msgstr "%1$s kullanıcısı, %2$s grubundan silinemedi."
 msgid "%s's groups"
 msgstr "%s kullanıcısının grupları"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%2$s kullanıcısının üye olduğu %1$s grupları."
@@ -4633,18 +4633,6 @@ msgstr ""
 msgid "%1$s group, page %2$d"
 msgstr "Bütün abonelikler"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Not"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Diğerisimler"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr ""
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, fuzzy, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4747,6 +4735,10 @@ msgstr ""
 msgid "Notice deleted."
 msgstr "Durum mesajı silindi."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Durum mesajları"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
 msgid "%1$s tagged %2$s"
@@ -5275,7 +5267,6 @@ msgstr "Böyle bir belge yok."
 msgid "Tag %s"
 msgstr ""
 
-#. TRANS: H2 for user profile information.
 #, fuzzy
 msgid "User profile"
 msgstr "Kullanıcının profili yok."
@@ -5971,6 +5962,51 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr ""
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Profil ayarları"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+#, fuzzy
+msgid "User role"
+msgstr "Kullanıcının profili yok."
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr ""
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr ""
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, fuzzy, php-format
 msgid "%1$s - %2$s"
@@ -6696,46 +6732,167 @@ 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"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on"
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "off"
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Bize o profili yollamadınız"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Bize o profili yollamadınız"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "%s kullanıcısına özel mesaj"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Profil ayarları"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Böyle bir durum mesajı yok."
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Böyle bir kullanıcı yok."
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Yeni grup"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Kullanıcıyı sil"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "showForm() gerçeklenmemiş."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
@@ -6922,6 +7079,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
 
+msgid "Aliases"
+msgstr "Diğerisimler"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -6998,6 +7158,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr ""
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr ""
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr ""
@@ -7469,6 +7633,7 @@ msgstr "Yeni durum mesajı"
 msgid "What's up, %s?"
 msgstr "N'aber %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr ""
 
@@ -7942,55 +8107,6 @@ msgstr "Aboneliği sonlandır"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Kullanıcının profili yok."
 
-#, fuzzy
-msgid "Edit Avatar"
-msgstr "Avatar"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr ""
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-#, fuzzy
-msgid "Edit profile settings"
-msgstr "Profil ayarları"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr ""
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr ""
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr ""
-
-#. TRANS: Label text on user profile to select a user role.
-#, fuzzy
-msgid "User role"
-msgstr "Kullanıcının profili yok."
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr ""
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr ""
-
 #, fuzzy
 msgid "Not allowed to log in."
 msgstr "Giriş yapılmadı."
@@ -8062,3 +8178,10 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Note"
+#~ msgstr "Not"
+
+#, fuzzy
+#~ msgid "Edit Avatar"
+#~ msgstr "Avatar"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index f2f3cdd6df..c4fe7648b3 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -12,18 +12,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:31+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:00+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -602,7 +602,7 @@ msgstr "Не вдалось видалити користувача %1$s зі с
 msgid "%s's groups"
 msgstr "Спільноти %s"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "Спільноти на %1$s, до яких долучився %2$s."
@@ -1060,9 +1060,8 @@ msgid "Can only fave notices."
 msgstr "Можна лише додавати дописи до обраних."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown notice."
-msgstr "Невідома примітка"
+msgstr "Невідомий допис."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
 msgid "Already a favorite."
@@ -3110,9 +3109,8 @@ msgstr "Потрібна URL-адреса."
 msgid "Could not create application."
 msgstr "Не вдалося створити додаток."
 
-#, fuzzy
 msgid "Invalid image."
-msgstr "Недійсний розмір."
+msgstr "Неприпустиме зображення."
 
 #. TRANS: Title for form to create a group.
 msgid "New group"
@@ -3400,7 +3398,6 @@ msgstr ""
 "приватно."
 
 #. TRANS: Title for page where to change password.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Change password"
 msgstr "Змінити пароль"
@@ -3428,7 +3425,6 @@ msgid "6 or more characters."
 msgstr "6 або більше знаків."
 
 #. TRANS: Field label on page where to change password. In this field the new password should be typed a second time.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Confirm"
 msgstr "Підтвердити"
@@ -3439,7 +3435,6 @@ msgid "Same as password above."
 msgstr "Такий само, як і пароль вище."
 
 #. TRANS: Button text on page where to change password.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Change"
 msgstr "Змінити"
@@ -3452,9 +3447,8 @@ msgid "Passwords don't match."
 msgstr "Паролі не співпадають."
 
 #. TRANS: Form validation error on page where to change password.
-#, fuzzy
 msgid "Incorrect old password."
-msgstr "Старий пароль є неточним"
+msgstr "Неправильний старий пароль."
 
 #. TRANS: Form validation error on page where to change password.
 msgid "Error saving user; invalid."
@@ -3541,12 +3535,11 @@ msgid "Fancy URLs"
 msgstr "Надзвичайні URL-адреси"
 
 #. TRANS: Field title in Paths admin panel.
-#, fuzzy
 msgid "Use fancy URLs (more readable and memorable)?"
-msgstr "Використовувати надзвичайні (найбільш пам’ятні і визначні) URL-адреси?"
+msgstr ""
+"Використовувати короткі (що їх легше прочитати і запам’ятати) URL-адреси?"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Theme"
 msgstr "Тема"
@@ -3660,10 +3653,9 @@ msgid "Directory where attachments are located."
 msgstr "Директорія, в якій знаходяться вкладення."
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "SSL"
-msgstr "SSL-шифрування"
+msgstr "SSL"
 
 #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
 msgid "Never"
@@ -3745,7 +3737,6 @@ msgid "Enabled"
 msgstr "Увімкнений"
 
 #. TRANS: Tab and title for plugins admin panel.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Plugins"
 msgstr "Додатки"
@@ -3776,7 +3767,7 @@ msgstr "Недійсний зміст допису."
 
 #. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license.
 #. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
 msgstr "Ліцензія допису «%1$s» є несумісною з ліцензією сайту «%2$s»."
 
@@ -4631,18 +4622,6 @@ msgstr "Спільнота %s"
 msgid "%1$s group, page %2$d"
 msgstr "Спільнота %1$s, сторінка %2$d"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "Зауваження"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "Додаткові імена"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "Дії спільноти"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4753,6 +4732,10 @@ msgstr "Повідомлення від %1$s на %2$s"
 msgid "Notice deleted."
 msgstr "Допис видалено."
 
+#, fuzzy
+msgid "Notice"
+msgstr "Дописи"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5286,7 +5269,6 @@ msgstr "Немає ID аргументу."
 msgid "Tag %s"
 msgstr "Позначити %s"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "Профіль користувача."
 
@@ -5996,6 +5978,49 @@ msgstr "Не вдається знайти XRD для %s."
 msgid "No AtomPub API service for %s."
 msgstr "Немає послуги AtomPub API для %s."
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "Діяльність користувача"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "Видалення користувача у процесі..."
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "Налаштування профілю"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Правка"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "Надіслати пряме повідомлення цьому користувачеві"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "Повідомлення"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "Модерувати"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "Роль користувача"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "Адміністратор"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "Модератор"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6721,82 +6746,172 @@ msgstr[0] "Ви є учасником спільноти:"
 msgstr[1] "Ви є учасником таких спільнот:"
 msgstr[2] "Ви є учасником таких спільнот:"
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-msgstr ""
-"Команди:\n"
-"on — увімкнути сповіщення\n"
-"off — вимкнути сповіщення\n"
-"help — список команд\n"
-"follow <nickname> — підписатись до користувача\n"
-"groups — спільноти, до яких ви входите\n"
-"subscriptions — користувачі, до яких ви підписані\n"
-"subscribers — користувачі, які підписані до вас\n"
-"leave <nickname> — відписатись від користувача\n"
-"d <nickname> <text> — надіслати особисте повідомлення\n"
-"get <nickname> — отримати останній допис користувача\n"
-"whois <nickname> — інфо про користувача\n"
-"fav <nickname> — додати останній допис користувача до обраних\n"
-"fav #<notice_id> — додати допис до обраних\n"
-"reply #<notice_id> — відповісти на допис\n"
-"reply <nickname> — відповісти на останній допис користувача\n"
-"join <group> — приєднатися до спільноти\n"
-"login — отримати посилання входу до веб-інтерфейсу\n"
-"drop <group> — залишити спільноту\n"
-"stats — отримати статистику\n"
-"stop — те саме що і 'off'\n"
-"quit — те саме що і 'off'\n"
-"sub <nickname> — те саме що і 'follow'\n"
-"unsub <nickname> — те саме що і 'leave'\n"
-"last <nickname> — те саме що і 'get'\n"
-"on <nickname> — наразі не виконується\n"
-"off <nickname> — наразі не виконується\n"
-"nudge <nickname> — «розштовхати»\n"
-"invite <phone number> — наразі не виконується\n"
-"track <word> — наразі не виконується\n"
-"untrack <word> — наразі не виконується\n"
-"track off — наразі не виконується\n"
-"untrack all — наразі не виконується\n"
-"tracks — наразі не виконується\n"
-"tracking — наразі не виконується\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "Результати команди"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "Не можна увімкнути сповіщення."
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "Не можна вимкнути сповіщення."
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "Підписатись до цього користувача"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "Відписатись від цього користувача"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "Пряме повідомлення до %s"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "Віддалений профіль не є спільнотою!"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "Повторити цей допис"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "Відповісти на цей допис"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "Невідома спільнота."
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "Видалити спільноту"
+
+#. TRANS: Help message for IM/SMS command "stats"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr "Оновити свій статус..."
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "Виконання команди ще не завершено."
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
+msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -6970,6 +7085,9 @@ msgid ""
 msgstr ""
 "Розташування спільноти, на кшталт «Місто, область (або регіон), країна»."
 
+msgid "Aliases"
+msgstr "Додаткові імена"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7054,6 +7172,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "Додати або редагувати дизайн %s"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "Дії спільноти"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "Спільноти з найбільшою кількістю учасників"
@@ -7630,6 +7752,7 @@ msgstr "Надіслати допис"
 msgid "What's up, %s?"
 msgstr "Що нового, %s?"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "Вкласти"
 
@@ -7698,7 +7821,7 @@ msgid "Notice repeated"
 msgstr "Допис повторили"
 
 msgid "Update your status..."
-msgstr ""
+msgstr "Оновити свій статус..."
 
 msgid "Nudge this user"
 msgstr "«Розштовхати» користувача"
@@ -8089,52 +8212,6 @@ msgstr "Відписатись"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Користувач %1$s (%2$d) не має профілю."
 
-msgid "Edit Avatar"
-msgstr "Аватара"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "Діяльність користувача"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "Видалення користувача у процесі..."
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "Налаштування профілю"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Правка"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "Надіслати пряме повідомлення цьому користувачеві"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "Повідомлення"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "Модерувати"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "Роль користувача"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "Адміністратор"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "Модератор"
-
 msgid "Not allowed to log in."
 msgstr "Вхід до системи не дозволено."
 
@@ -8212,3 +8289,85 @@ msgstr "Неправильний XML, корінь XRD відсутній."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Отримання резервної копії файлу «%s»."
+
+#~ msgid "Note"
+#~ msgstr "Зауваження"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "tracks - not yet implemented.\n"
+#~ "tracking - not yet implemented.\n"
+#~ msgstr ""
+#~ "Команди:\n"
+#~ "on — увімкнути сповіщення\n"
+#~ "off — вимкнути сповіщення\n"
+#~ "help — список команд\n"
+#~ "follow <nickname> — підписатись до користувача\n"
+#~ "groups — спільноти, до яких ви входите\n"
+#~ "subscriptions — користувачі, до яких ви підписані\n"
+#~ "subscribers — користувачі, які підписані до вас\n"
+#~ "leave <nickname> — відписатись від користувача\n"
+#~ "d <nickname> <text> — надіслати особисте повідомлення\n"
+#~ "get <nickname> — отримати останній допис користувача\n"
+#~ "whois <nickname> — інфо про користувача\n"
+#~ "fav <nickname> — додати останній допис користувача до обраних\n"
+#~ "fav #<notice_id> — додати допис до обраних\n"
+#~ "reply #<notice_id> — відповісти на допис\n"
+#~ "reply <nickname> — відповісти на останній допис користувача\n"
+#~ "join <group> — приєднатися до спільноти\n"
+#~ "login — отримати посилання входу до веб-інтерфейсу\n"
+#~ "drop <group> — залишити спільноту\n"
+#~ "stats — отримати статистику\n"
+#~ "stop — те саме що і 'off'\n"
+#~ "quit — те саме що і 'off'\n"
+#~ "sub <nickname> — те саме що і 'follow'\n"
+#~ "unsub <nickname> — те саме що і 'leave'\n"
+#~ "last <nickname> — те саме що і 'get'\n"
+#~ "on <nickname> — наразі не виконується\n"
+#~ "off <nickname> — наразі не виконується\n"
+#~ "nudge <nickname> — «розштовхати»\n"
+#~ "invite <phone number> — наразі не виконується\n"
+#~ "track <word> — наразі не виконується\n"
+#~ "untrack <word> — наразі не виконується\n"
+#~ "track off — наразі не виконується\n"
+#~ "untrack all — наразі не виконується\n"
+#~ "tracks — наразі не виконується\n"
+#~ "tracking — наразі не виконується\n"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "Аватара"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 022e28922e..1b63db606d 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:17:32+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:02+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-08 01:25:01+0000\n"
+"X-POT-Import-Date: 2011-03-11 18:52:41+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -581,7 +581,7 @@ msgstr "无法把用户%1$s从%2$s小组删除"
 msgid "%s's groups"
 msgstr "%s 的小组"
 
-#. TRANS: Used as subtitle in check for group membership. %1$s is a user name, %2$s is the site name.
+#. TRANS: Used as subtitle in check for group membership. %1$s is the site name, %2$s is a user name.
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 msgstr "%1$s 的小组，%2$s 是小组成员。"
@@ -4493,18 +4493,6 @@ msgstr "%s 小组"
 msgid "%1$s group, page %2$d"
 msgstr "%1$s小组，第%2$d页"
 
-#. TRANS: Label for group description or group note (dt). Text hidden by default.
-msgid "Note"
-msgstr "注释"
-
-#. TRANS: Label for group aliases (dt). Text hidden by default.
-msgid "Aliases"
-msgstr "别名"
-
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "小组动作"
-
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -4614,6 +4602,10 @@ msgstr "来自 %1$s 的 %2$s 消息"
 msgid "Notice deleted."
 msgstr "消息已删除"
 
+#, fuzzy
+msgid "Notice"
+msgstr "消息"
+
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "%1$s tagged %2$s"
@@ -5129,7 +5121,6 @@ msgstr "没有 ID 冲突。"
 msgid "Tag %s"
 msgstr "将%s加为标签"
 
-#. TRANS: H2 for user profile information.
 msgid "User profile"
 msgstr "用户页面"
 
@@ -5803,6 +5794,49 @@ msgstr ""
 msgid "No AtomPub API service for %s."
 msgstr ""
 
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+msgid "User actions"
+msgstr "用户动作"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+msgid "User deletion in progress..."
+msgstr "用户删除处理中……"
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit profile settings"
+msgstr "编辑个人信息设置"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "编辑"
+
+#. TRANS: Link title for link on user profile.
+msgid "Send a direct message to this user"
+msgstr "给该用户发送私信"
+
+#. TRANS: Link text for link on user profile.
+msgid "Message"
+msgstr "私信"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "Moderate"
+msgstr "审核"
+
+#. TRANS: Label text on user profile to select a user role.
+msgid "User role"
+msgstr "用户权限"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Administrator"
+msgstr "管理员"
+
+#. TRANS: Role that can be set for a user profile.
+msgctxt "role"
+msgid "Moderator"
+msgstr "审核员"
+
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6501,85 +6535,171 @@ msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "你是该小组成员："
 
-#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-msgid ""
-"Commands:\n"
-"on - turn on notifications\n"
-"off - turn off notifications\n"
-"help - show this help\n"
-"follow <nickname> - subscribe to user\n"
-"groups - lists the groups you have joined\n"
-"subscriptions - list the people you follow\n"
-"subscribers - list the people that follow you\n"
-"leave <nickname> - unsubscribe from user\n"
-"d <nickname> <text> - direct message to user\n"
-"get <nickname> - get last notice from user\n"
-"whois <nickname> - get profile info on user\n"
-"lose <nickname> - force user to stop following you\n"
-"fav <nickname> - add user's last notice as a 'fave'\n"
-"fav #<notice_id> - add notice with the given id as a 'fave'\n"
-"repeat #<notice_id> - repeat a notice with a given id\n"
-"repeat <nickname> - repeat the last notice from user\n"
-"reply #<notice_id> - reply to notice with a given id\n"
-"reply <nickname> - reply to the last notice from user\n"
-"join <group> - join group\n"
-"login - Get a link to login to the web interface\n"
-"drop <group> - leave group\n"
-"stats - get your stats\n"
-"stop - same as 'off'\n"
-"quit - same as 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
+#. TRANS: Header line of help text for commands.
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "Commands:"
+msgstr "执行结果"
+
+#. TRANS: Help message for IM/SMS command "on"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn on notifications"
+msgstr "无法开启通知。"
+
+#. TRANS: Help message for IM/SMS command "off"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "turn off notifications"
+msgstr "无法关闭通知。"
+
+#. TRANS: Help message for IM/SMS command "help"
+msgctxt "COMMANDHELP"
+msgid "show this help"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "follow <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "subscribe to user"
+msgstr "关注这个用户"
+
+#. TRANS: Help message for IM/SMS command "groups"
+msgctxt "COMMANDHELP"
+msgid "lists the groups you have joined"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscriptions"
+msgctxt "COMMANDHELP"
+msgid "list the people you follow"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "subscribers"
+msgctxt "COMMANDHELP"
+msgid "list the people that follow you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "leave <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "unsubscribe from user"
+msgstr "取消关注这个用户"
+
+#. TRANS: Help message for IM/SMS command "d <nickname> <text>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "direct message to user"
+msgstr "发给%s的私信"
+
+#. TRANS: Help message for IM/SMS command "get <nickname>"
+msgctxt "COMMANDHELP"
+msgid "get last notice from user"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "whois <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "get profile info on user"
+msgstr "远程配置文件不是一个组 ！"
+
+#. TRANS: Help message for IM/SMS command "lose <nickname>"
+msgctxt "COMMANDHELP"
+msgid "force user to stop following you"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav <nickname>"
+msgctxt "COMMANDHELP"
+msgid "add user's last notice as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "fav #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "add notice with the given id as a 'fave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "repeat a notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "repeat <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "repeat the last notice from user"
+msgstr "转发"
+
+#. TRANS: Help message for IM/SMS command "reply #<notice_id>"
+msgctxt "COMMANDHELP"
+msgid "reply to notice with a given id"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "reply <nickname>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "reply to the last notice from user"
+msgstr "回复"
+
+#. TRANS: Help message for IM/SMS command "join <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "join group"
+msgstr "未知的组。"
+
+#. TRANS: Help message for IM/SMS command "login"
+msgctxt "COMMANDHELP"
+msgid "Get a link to login to the web interface"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "drop <group>"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "leave group"
+msgstr "删除小组"
+
+#. TRANS: Help message for IM/SMS command "stats"
+msgctxt "COMMANDHELP"
+msgid "get your stats"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "stop"
+#. TRANS: Help message for IM/SMS command "quit"
+msgctxt "COMMANDHELP"
+msgid "same as 'off'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "sub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'follow'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "unsub <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'leave'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "last <nickname>"
+msgctxt "COMMANDHELP"
+msgid "same as 'get'"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "on <nickname>"
+#. TRANS: Help message for IM/SMS command "off <nickname>"
+#. TRANS: Help message for IM/SMS command "invite <phone number>"
+#. TRANS: Help message for IM/SMS command "track <word>"
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#, fuzzy
+msgctxt "COMMANDHELP"
+msgid "not yet implemented."
+msgstr "命令尚未实现。"
+
+#. TRANS: Help message for IM/SMS command "nudge <nickname>"
+msgctxt "COMMANDHELP"
+msgid "remind a user to update."
 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 #<消息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"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgid "No configuration file found."
@@ -6750,6 +6870,9 @@ msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "小组的地理位置，例如“国家、省份、城市”。"
 
+msgid "Aliases"
+msgstr "别名"
+
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -6826,6 +6949,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
 msgstr "添加或编辑 %s 外观"
 
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "小组动作"
+
 #. TRANS: Title for groups with the most members section.
 msgid "Groups with most members"
 msgstr "人气最旺的小组"
@@ -7381,6 +7508,7 @@ msgstr "发送一个通知"
 msgid "What's up, %s?"
 msgstr "%s，最近怎么样？"
 
+#. TRANS: Input label in notice form for adding an attachment.
 msgid "Attach"
 msgstr "附件"
 
@@ -7829,52 +7957,6 @@ msgstr "取消关注"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "用户 %1$s (%2$d) 没有个人信息记录。"
 
-msgid "Edit Avatar"
-msgstr "编辑头像"
-
-#. TRANS: H2 for user actions in a profile.
-#. TRANS: H2 for entity actions in a profile.
-msgid "User actions"
-msgstr "用户动作"
-
-#. TRANS: Text shown in user profile of not yet compeltely deleted users.
-msgid "User deletion in progress..."
-msgstr "用户删除处理中……"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit profile settings"
-msgstr "编辑个人信息设置"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "编辑"
-
-#. TRANS: Link title for link on user profile.
-msgid "Send a direct message to this user"
-msgstr "给该用户发送私信"
-
-#. TRANS: Link text for link on user profile.
-msgid "Message"
-msgstr "私信"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "Moderate"
-msgstr "审核"
-
-#. TRANS: Label text on user profile to select a user role.
-msgid "User role"
-msgstr "用户权限"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Administrator"
-msgstr "管理员"
-
-#. TRANS: Role that can be set for a user profile.
-msgctxt "role"
-msgid "Moderator"
-msgstr "审核员"
-
 msgid "Not allowed to log in."
 msgstr "不允许登录。"
 
@@ -7944,3 +8026,88 @@ msgstr "不合法的XML, 缺少XRD根"
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "从文件'%s'获取备份。"
+
+#~ msgid "Note"
+#~ msgstr "注释"
+
+#~ msgid ""
+#~ "Commands:\n"
+#~ "on - turn on notifications\n"
+#~ "off - turn off notifications\n"
+#~ "help - show this help\n"
+#~ "follow <nickname> - subscribe to user\n"
+#~ "groups - lists the groups you have joined\n"
+#~ "subscriptions - list the people you follow\n"
+#~ "subscribers - list the people that follow you\n"
+#~ "leave <nickname> - unsubscribe from user\n"
+#~ "d <nickname> <text> - direct message to user\n"
+#~ "get <nickname> - get last notice from user\n"
+#~ "whois <nickname> - get profile info on user\n"
+#~ "lose <nickname> - force user to stop following you\n"
+#~ "fav <nickname> - add user's last notice as a 'fave'\n"
+#~ "fav #<notice_id> - add notice with the given id as a 'fave'\n"
+#~ "repeat #<notice_id> - repeat a notice with a given id\n"
+#~ "repeat <nickname> - repeat the last notice from user\n"
+#~ "reply #<notice_id> - reply to notice with a given id\n"
+#~ "reply <nickname> - reply to the last notice from user\n"
+#~ "join <group> - join group\n"
+#~ "login - Get a link to login to the web interface\n"
+#~ "drop <group> - leave group\n"
+#~ "stats - get your stats\n"
+#~ "stop - same as 'off'\n"
+#~ "quit - same as 'off'\n"
+#~ "sub <nickname> - same as 'follow'\n"
+#~ "unsub <nickname> - same as 'leave'\n"
+#~ "last <nickname> - same as 'get'\n"
+#~ "on <nickname> - not yet implemented.\n"
+#~ "off <nickname> - not yet implemented.\n"
+#~ "nudge <nickname> - remind a user to update.\n"
+#~ "invite <phone number> - not yet implemented.\n"
+#~ "track <word> - not yet implemented.\n"
+#~ "untrack <word> - not yet implemented.\n"
+#~ "track off - not yet implemented.\n"
+#~ "untrack all - not yet implemented.\n"
+#~ "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 #<消息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"
+
+#~ msgid "Edit Avatar"
+#~ msgstr "编辑头像"
diff --git a/plugins/Directory/locale/ia/LC_MESSAGES/Directory.po b/plugins/Directory/locale/ia/LC_MESSAGES/Directory.po
new file mode 100644
index 0000000000..e1e04c8ca8
--- /dev/null
+++ b/plugins/Directory/locale/ia/LC_MESSAGES/Directory.po
@@ -0,0 +1,54 @@
+# Translation of StatusNet - Directory to Interlingua (Interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Directory\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:27+0000\n"
+"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:57:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-directory\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, php-format
+msgid "User Directory, page %d"
+msgstr "Catalogo de usatores, pagina %d"
+
+msgid "User directory"
+msgstr "Catalogo de usatores"
+
+#, php-format
+msgid "User directory - %s"
+msgstr "Catalogo de usatores - %s"
+
+#, php-format
+msgid "User directory - %s, page %d"
+msgstr "Catalogo de usatores - %s, pagina %d"
+
+msgctxt "BUTTON"
+msgid "Search"
+msgstr "Cercar"
+
+#, php-format
+msgid "No users starting with %s"
+msgstr "Il non ha usatores de qui le nomine comencia con \"%s\""
+
+msgid "Add a user directory."
+msgstr "Adder un catalogo de usatores."
+
+msgid "Nickname"
+msgstr "Pseudonymo"
+
+msgid "Created"
+msgstr "Create le"
diff --git a/plugins/Directory/locale/mk/LC_MESSAGES/Directory.po b/plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
new file mode 100644
index 0000000000..727c85c1ec
--- /dev/null
+++ b/plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
@@ -0,0 +1,54 @@
+# Translation of StatusNet - Directory to Macedonian (Македонски)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Directory\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:27+0000\n"
+"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:57:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-directory\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#, php-format
+msgid "User Directory, page %d"
+msgstr "Кориснички именик, стр. %d"
+
+msgid "User directory"
+msgstr "Кориснички именик"
+
+#, php-format
+msgid "User directory - %s"
+msgstr "Кориснички именик - %s"
+
+#, php-format
+msgid "User directory - %s, page %d"
+msgstr "Кориснички именик - %s, стр. %d"
+
+msgctxt "BUTTON"
+msgid "Search"
+msgstr "Пребарај"
+
+#, php-format
+msgid "No users starting with %s"
+msgstr "Нема корисници што почнуваат на %s"
+
+msgid "Add a user directory."
+msgstr "Додај кориснички именик."
+
+msgid "Nickname"
+msgstr "Прекар"
+
+msgid "Created"
+msgstr "Создадено"
diff --git a/plugins/Directory/locale/nl/LC_MESSAGES/Directory.po b/plugins/Directory/locale/nl/LC_MESSAGES/Directory.po
new file mode 100644
index 0000000000..62c9b48418
--- /dev/null
+++ b/plugins/Directory/locale/nl/LC_MESSAGES/Directory.po
@@ -0,0 +1,55 @@
+# Translation of StatusNet - Directory to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Directory\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:27+0000\n"
+"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:57:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-directory\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#, php-format
+msgid "User Directory, page %d"
+msgstr "Gebruikerslijst, pagina %d"
+
+msgid "User directory"
+msgstr "Gebruikerslijst"
+
+#, php-format
+msgid "User directory - %s"
+msgstr "Gebruikerslijst - %s"
+
+#, php-format
+msgid "User directory - %s, page %d"
+msgstr "Gebruikerslijst - %s, pagina %d"
+
+msgctxt "BUTTON"
+msgid "Search"
+msgstr "Zoeken"
+
+#, php-format
+msgid "No users starting with %s"
+msgstr "Er zijn geen gebruikers wiens naam begint met \"%s\""
+
+msgid "Add a user directory."
+msgstr "Een gebruikerslijst toevoegen."
+
+msgid "Nickname"
+msgstr "Gebruikersnaam"
+
+msgid "Created"
+msgstr "Aangemaakt"
diff --git a/plugins/Directory/locale/uk/LC_MESSAGES/Directory.po b/plugins/Directory/locale/uk/LC_MESSAGES/Directory.po
new file mode 100644
index 0000000000..fe4bd127f7
--- /dev/null
+++ b/plugins/Directory/locale/uk/LC_MESSAGES/Directory.po
@@ -0,0 +1,55 @@
+# Translation of StatusNet - Directory to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Directory\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:27+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:57:51+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-directory\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#, php-format
+msgid "User Directory, page %d"
+msgstr "Каталог користувача, сторінка %d"
+
+msgid "User directory"
+msgstr "Каталог користувача"
+
+#, php-format
+msgid "User directory - %s"
+msgstr "Каталог користувача — %s"
+
+#, php-format
+msgid "User directory - %s, page %d"
+msgstr "Каталог користувача — %s, сторінка %d"
+
+msgctxt "BUTTON"
+msgid "Search"
+msgstr "Пошук"
+
+#, php-format
+msgid "No users starting with %s"
+msgstr "Немає користувачів, починаючи з %s"
+
+msgid "Add a user directory."
+msgstr "Додати каталог користувача."
+
+msgid "Nickname"
+msgstr "Псевдонім"
+
+msgid "Created"
+msgstr "Створено"
diff --git a/plugins/Event/locale/Event.pot b/plugins/Event/locale/Event.pot
index 5bc2222982..f20adc453e 100644
--- a/plugins/Event/locale/Event.pot
+++ b/plugins/Event/locale/Event.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+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"
@@ -21,17 +21,17 @@ msgctxt "BUTTON"
 msgid "Cancel"
 msgstr ""
 
-#: rsvpform.php:116
+#: rsvpform.php:117
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr ""
 
-#: rsvpform.php:117
+#: rsvpform.php:118
 msgctxt "BUTTON"
 msgid "No"
 msgstr ""
 
-#: rsvpform.php:118
+#: rsvpform.php:119
 msgctxt "BUTTON"
 msgid "Maybe"
 msgstr ""
diff --git a/plugins/Event/locale/ia/LC_MESSAGES/Event.po b/plugins/Event/locale/ia/LC_MESSAGES/Event.po
new file mode 100644
index 0000000000..375f447dae
--- /dev/null
+++ b/plugins/Event/locale/ia/LC_MESSAGES/Event.po
@@ -0,0 +1,48 @@
+# Translation of StatusNet - Event to Interlingua (Interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Event\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:35+0000\n"
+"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:57:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-event\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Cancellar"
+
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "Si"
+
+msgctxt "BUTTON"
+msgid "No"
+msgstr "No"
+
+msgctxt "BUTTON"
+msgid "Maybe"
+msgstr "Forsan"
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salveguardar"
+
+msgid "Event invitations and RSVPs."
+msgstr "Invitationes a eventos e responsas a illos."
+
+msgid "Event"
+msgstr "Evento"
diff --git a/plugins/Event/locale/mk/LC_MESSAGES/Event.po b/plugins/Event/locale/mk/LC_MESSAGES/Event.po
new file mode 100644
index 0000000000..e00dab09fc
--- /dev/null
+++ b/plugins/Event/locale/mk/LC_MESSAGES/Event.po
@@ -0,0 +1,48 @@
+# Translation of StatusNet - Event to Macedonian (Македонски)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Event\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:35+0000\n"
+"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:57:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-event\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Откажи"
+
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "Да"
+
+msgctxt "BUTTON"
+msgid "No"
+msgstr "Не"
+
+msgctxt "BUTTON"
+msgid "Maybe"
+msgstr "Можеби"
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Зачувај"
+
+msgid "Event invitations and RSVPs."
+msgstr "Покани и одговори за настани"
+
+msgid "Event"
+msgstr "Настан"
diff --git a/plugins/Event/locale/nl/LC_MESSAGES/Event.po b/plugins/Event/locale/nl/LC_MESSAGES/Event.po
new file mode 100644
index 0000000000..6eb1afdf3d
--- /dev/null
+++ b/plugins/Event/locale/nl/LC_MESSAGES/Event.po
@@ -0,0 +1,48 @@
+# Translation of StatusNet - Event to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Event\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:35+0000\n"
+"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:57:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-event\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Annuleren"
+
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "Ja"
+
+msgctxt "BUTTON"
+msgid "No"
+msgstr "Nee"
+
+msgctxt "BUTTON"
+msgid "Maybe"
+msgstr "Misschien"
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Opslaan"
+
+msgid "Event invitations and RSVPs."
+msgstr "Uitnodigingen en RVSP's."
+
+msgid "Event"
+msgstr "Gebeurtenis"
diff --git a/plugins/Event/locale/te/LC_MESSAGES/Event.po b/plugins/Event/locale/te/LC_MESSAGES/Event.po
new file mode 100644
index 0000000000..c5d6d3c0ce
--- /dev/null
+++ b/plugins/Event/locale/te/LC_MESSAGES/Event.po
@@ -0,0 +1,48 @@
+# Translation of StatusNet - Event to Telugu (తెలుగు)
+# Exported from translatewiki.net
+#
+# Author: Veeven
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Event\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:35+0000\n"
+"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:57:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: te\n"
+"X-Message-Group: #out-statusnet-plugin-event\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "రద్దుచేయి"
+
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "అవును"
+
+msgctxt "BUTTON"
+msgid "No"
+msgstr "కాదు"
+
+msgctxt "BUTTON"
+msgid "Maybe"
+msgstr "కావొచ్చు"
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "భద్రపరచు"
+
+msgid "Event invitations and RSVPs."
+msgstr ""
+
+msgid "Event"
+msgstr ""
diff --git a/plugins/Event/locale/uk/LC_MESSAGES/Event.po b/plugins/Event/locale/uk/LC_MESSAGES/Event.po
new file mode 100644
index 0000000000..865f4fc01d
--- /dev/null
+++ b/plugins/Event/locale/uk/LC_MESSAGES/Event.po
@@ -0,0 +1,49 @@
+# Translation of StatusNet - Event to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Event\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:35+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:57:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-event\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Відміна"
+
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "Так"
+
+msgctxt "BUTTON"
+msgid "No"
+msgstr "Ні"
+
+msgctxt "BUTTON"
+msgid "Maybe"
+msgstr "Можливо"
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Зберегти"
+
+msgid "Event invitations and RSVPs."
+msgstr "Запрошення на заходи та RSVP (підтвердження прийняття запрошення)."
+
+msgid "Event"
+msgstr "Подія"
diff --git a/plugins/ExtendedProfile/locale/ExtendedProfile.pot b/plugins/ExtendedProfile/locale/ExtendedProfile.pot
index 89a6880e24..76634319a5 100644
--- a/plugins/ExtendedProfile/locale/ExtendedProfile.pot
+++ b/plugins/ExtendedProfile/locale/ExtendedProfile.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"POT-Creation-Date: 2011-03-17 09:47+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"
@@ -16,101 +16,163 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ExtendedProfilePlugin.php:40
-msgid "UI extensions for additional profile fields."
+#: actions/profiledetailsettings.php:29
+msgid "Extended profile settings"
+msgstr ""
+
+#: actions/profiledetailsettings.php:63
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Message given submitting a form with an unknown action
+#: actions/profiledetailsettings.php:74
+msgid "Unexpected form submission."
+msgstr ""
+
+#: actions/profiledetailsettings.php:145
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr ""
+
+#: actions/profiledetailsettings.php:155
+#, php-format
+msgid "Invalid date entered for \"%s\": %s"
+msgstr ""
+
+#: actions/profiledetailsettings.php:269
+#, php-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+#: actions/profiledetailsettings.php:517 actions/profiledetailsettings.php:529
+msgid "Could not save profile details."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#: actions/profiledetailsettings.php:574
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+#: actions/profiledetail.php:52
+msgid "Edit extended profile settings"
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: ExtendedProfilePlugin.php:108
-msgid "Details"
+#. TRANS: Link text for link on user profile.
+#: actions/profiledetail.php:54
+msgid "Edit"
 msgstr ""
 
-#: ExtendedProfilePlugin.php:116
+#: ExtendedProfilePlugin.php:41
+msgid "UI extensions for additional profile fields."
+msgstr ""
+
+#: ExtendedProfilePlugin.php:123
 msgid "More details..."
 msgstr ""
 
-#: extendedprofile.php:49 extendedprofile.php:103
-msgid "Personal"
+#: lib/extendedprofilewidget.php:317 lib/extendedprofilewidget.php:359
+msgid "Company"
 msgstr ""
 
-#: extendedprofile.php:52
-msgid "Full name"
+#: lib/extendedprofilewidget.php:322 lib/extendedprofilewidget.php:366
+#: lib/extendedprofilewidget.php:407 lib/extendedprofilewidget.php:457
+msgid "Start"
 msgstr ""
 
-#: extendedprofile.php:57
-msgid "Title"
+#: lib/extendedprofilewidget.php:329 lib/extendedprofilewidget.php:373
+#: lib/extendedprofilewidget.php:414 lib/extendedprofilewidget.php:464
+msgid "End"
 msgstr ""
 
-#: extendedprofile.php:61
-msgid "Manager"
+#: lib/extendedprofilewidget.php:341 lib/extendedprofilewidget.php:387
+msgid "Current"
 msgstr ""
 
-#: extendedprofile.php:66
-msgid "Location"
+#: lib/extendedprofilewidget.php:399 lib/extendedprofilewidget.php:435
+#: lib/extendedprofile.php:242 lib/extendedprofile.php:254
+msgid "Institution"
 msgstr ""
 
-#: extendedprofile.php:70
-msgid "Bio"
+#: lib/extendedprofilewidget.php:403 lib/extendedprofilewidget.php:442
+msgid "Degree"
 msgstr ""
 
-#: extendedprofile.php:75
-msgid "Tags"
+#: lib/extendedprofilewidget.php:405 lib/extendedprofilewidget.php:449
+msgid "Description"
 msgstr ""
 
-#: extendedprofile.php:82
-msgid "Contact"
+#: lib/extendedprofilewidget.php:618
+msgctxt "BUTTON"
+msgid "Save"
 msgstr ""
 
-#: extendedprofile.php:85
+#: lib/extendedprofile.php:119 lib/extendedprofile.php:129
 msgid "Phone"
 msgstr ""
 
-#: extendedprofile.php:91
+#: lib/extendedprofile.php:150 lib/extendedprofile.php:156
 msgid "IM"
 msgstr ""
 
-#: extendedprofile.php:96
-msgid "Websites"
+#: lib/extendedprofile.php:176 lib/extendedprofile.php:182
+msgid "Website"
 msgstr ""
 
-#: extendedprofile.php:106
-msgid "Birthday"
+#: lib/extendedprofile.php:205 lib/extendedprofile.php:216
+msgid "Employer"
 msgstr ""
 
-#: extendedprofile.php:111
-msgid "Spouse's name"
+#: lib/extendedprofile.php:278 lib/extendedprofile.php:319
+msgid "Personal"
 msgstr ""
 
-#: extendedprofile.php:115
-msgid "Kids' names"
+#: lib/extendedprofile.php:281
+msgid "Full name"
 msgstr ""
 
-#: extendedprofile.php:120
-msgid "Work experience"
+#: lib/extendedprofile.php:286
+msgid "Title"
 msgstr ""
 
-#: extendedprofile.php:124
-msgid "Employer"
+#: lib/extendedprofile.php:290
+msgid "Manager"
 msgstr ""
 
-#: extendedprofile.php:129
-msgid "Education"
+#: lib/extendedprofile.php:295
+msgid "Location"
 msgstr ""
 
-#: extendedprofile.php:133
-msgid "Institution"
+#: lib/extendedprofile.php:299
+msgid "Bio"
 msgstr ""
 
-#. TRANS: Link title for link on user profile.
-#: profiledetailaction.php:61
-msgid "Edit extended profile settings"
+#: lib/extendedprofile.php:304
+msgid "Tags"
 msgstr ""
 
-#. TRANS: Link text for link on user profile.
-#: profiledetailaction.php:63
-msgid "Edit"
+#: lib/extendedprofile.php:311
+msgid "Contact"
 msgstr ""
 
-#: profiledetailsettingsaction.php:29
-msgid "Extended profile settings"
+#: lib/extendedprofile.php:322
+msgid "Birthday"
+msgstr ""
+
+#: lib/extendedprofile.php:327
+msgid "Spouse's name"
+msgstr ""
+
+#: lib/extendedprofile.php:331
+msgid "Kids' names"
+msgstr ""
+
+#: lib/extendedprofile.php:336
+msgid "Work experience"
+msgstr ""
+
+#: lib/extendedprofile.php:342
+msgid "Education"
 msgstr ""
diff --git a/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po
index 3d8743fc1f..7811b90c57 100644
--- a/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/br/LC_MESSAGES/ExtendedProfile.po
@@ -9,28 +9,101 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:37:09+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 20:42:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-msgid "UI extensions for additional profile fields."
+msgid "Extended profile settings"
+msgstr "Arventennoù ledanet ar profil"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Message given submitting a form with an unknown action
+msgid "Unexpected form submission."
+msgstr ""
+
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr ""
+
+#, php-format
+msgid "Invalid date entered for \"%s\": %s"
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-msgid "Details"
-msgstr "Munudoù"
+#, php-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+msgid "Could not save profile details."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Aozañ arventennoù ledanet ar profil"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Aozañ"
+
+msgid "UI extensions for additional profile fields."
+msgstr ""
 
 msgid "More details..."
 msgstr "Muoic'h a vunudoù..."
 
+msgid "Company"
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "End"
+msgstr ""
+
+msgid "Current"
+msgstr ""
+
+msgid "Institution"
+msgstr "Ensavadur"
+
+msgid "Degree"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+msgid "Phone"
+msgstr "Pellgomz"
+
+msgid "IM"
+msgstr "IM"
+
+#, fuzzy
+msgid "Website"
+msgstr "Lec'hiennoù web"
+
+msgid "Employer"
+msgstr ""
+
 msgid "Personal"
 msgstr "Personel"
 
@@ -55,15 +128,6 @@ msgstr "Balizennoù"
 msgid "Contact"
 msgstr "Darempred"
 
-msgid "Phone"
-msgstr "Pellgomz"
-
-msgid "IM"
-msgstr "IM"
-
-msgid "Websites"
-msgstr "Lec'hiennoù web"
-
 msgid "Birthday"
 msgstr "Deiz-ha-bloaz"
 
@@ -76,22 +140,8 @@ msgstr "Anv ar vugale"
 msgid "Work experience"
 msgstr "Skiant-prenet"
 
-msgid "Employer"
-msgstr ""
-
 msgid "Education"
 msgstr "Deskadurezh"
 
-msgid "Institution"
-msgstr "Ensavadur"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit extended profile settings"
-msgstr "Aozañ arventennoù ledanet ar profil"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Aozañ"
-
-msgid "Extended profile settings"
-msgstr "Arventennoù ledanet ar profil"
+#~ msgid "Details"
+#~ msgstr "Munudoù"
diff --git a/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po
index 6c1e781b7d..3db39dee2f 100644
--- a/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/ia/LC_MESSAGES/ExtendedProfile.po
@@ -9,28 +9,101 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:37:09+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 20:42:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Extended profile settings"
+msgstr "Configuration extendite del profilo"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Message given submitting a form with an unknown action
+msgid "Unexpected form submission."
+msgstr ""
+
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr ""
+
+#, php-format
+msgid "Invalid date entered for \"%s\": %s"
+msgstr ""
+
+#, php-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+msgid "Could not save profile details."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Modificar configuration extendite del profilo"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Modificar"
+
 msgid "UI extensions for additional profile fields."
 msgstr "Extensiones del IU pro additional campos de profilo."
 
-#. TRANS: Link description in user account settings menu.
-msgid "Details"
-msgstr "Detalios"
-
 msgid "More details..."
 msgstr "Plus detalios..."
 
+msgid "Company"
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "End"
+msgstr ""
+
+msgid "Current"
+msgstr ""
+
+msgid "Institution"
+msgstr "Institution"
+
+msgid "Degree"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+msgid "Phone"
+msgstr "Telephono"
+
+msgid "IM"
+msgstr "MI"
+
+#, fuzzy
+msgid "Website"
+msgstr "Sitos web"
+
+msgid "Employer"
+msgstr "Empleator"
+
 msgid "Personal"
 msgstr "Personal"
 
@@ -55,15 +128,6 @@ msgstr "Etiquettas"
 msgid "Contact"
 msgstr "Contacto"
 
-msgid "Phone"
-msgstr "Telephono"
-
-msgid "IM"
-msgstr "MI"
-
-msgid "Websites"
-msgstr "Sitos web"
-
 msgid "Birthday"
 msgstr "Anniversario"
 
@@ -76,22 +140,8 @@ msgstr "Nomines del infantes"
 msgid "Work experience"
 msgstr "Experientia professional"
 
-msgid "Employer"
-msgstr "Empleator"
-
 msgid "Education"
 msgstr "Education"
 
-msgid "Institution"
-msgstr "Institution"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit extended profile settings"
-msgstr "Modificar configuration extendite del profilo"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Modificar"
-
-msgid "Extended profile settings"
-msgstr "Configuration extendite del profilo"
+#~ msgid "Details"
+#~ msgstr "Detalios"
diff --git a/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po
index 15e6fb507a..895be3757e 100644
--- a/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/mk/LC_MESSAGES/ExtendedProfile.po
@@ -9,28 +9,101 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:37:09+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 20:42:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
+msgid "Extended profile settings"
+msgstr "Проширени профилни нагодувања"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Message given submitting a form with an unknown action
+msgid "Unexpected form submission."
+msgstr ""
+
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr ""
+
+#, php-format
+msgid "Invalid date entered for \"%s\": %s"
+msgstr ""
+
+#, php-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+msgid "Could not save profile details."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Уреди проширени профилни нагодувања"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Уреди"
+
 msgid "UI extensions for additional profile fields."
 msgstr "Посреднички дадатоци за дополнителни полиња во профилот."
 
-#. TRANS: Link description in user account settings menu.
-msgid "Details"
-msgstr "Подробности"
-
 msgid "More details..."
 msgstr "Поподробно..."
 
+msgid "Company"
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "End"
+msgstr ""
+
+msgid "Current"
+msgstr ""
+
+msgid "Institution"
+msgstr "Установа"
+
+msgid "Degree"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+msgid "Phone"
+msgstr "Телефон"
+
+msgid "IM"
+msgstr "IM"
+
+#, fuzzy
+msgid "Website"
+msgstr "Мрежни места"
+
+msgid "Employer"
+msgstr "Работодавач"
+
 msgid "Personal"
 msgstr "Лично"
 
@@ -55,15 +128,6 @@ msgstr "Ознаки"
 msgid "Contact"
 msgstr "Контакт"
 
-msgid "Phone"
-msgstr "Телефон"
-
-msgid "IM"
-msgstr "IM"
-
-msgid "Websites"
-msgstr "Мрежни места"
-
 msgid "Birthday"
 msgstr "Роденден"
 
@@ -76,22 +140,8 @@ msgstr "Имиња на децата"
 msgid "Work experience"
 msgstr "Работно искуство"
 
-msgid "Employer"
-msgstr "Работодавач"
-
 msgid "Education"
 msgstr "Образование"
 
-msgid "Institution"
-msgstr "Установа"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit extended profile settings"
-msgstr "Уреди проширени профилни нагодувања"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Уреди"
-
-msgid "Extended profile settings"
-msgstr "Проширени профилни нагодувања"
+#~ msgid "Details"
+#~ msgstr "Подробности"
diff --git a/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po
index 5e34c2f79f..1adbdc93ec 100644
--- a/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/nl/LC_MESSAGES/ExtendedProfile.po
@@ -9,28 +9,101 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:37:09+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 20:42:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "Extended profile settings"
+msgstr "Uitgebreide profielinstellingen"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Message given submitting a form with an unknown action
+msgid "Unexpected form submission."
+msgstr ""
+
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr ""
+
+#, php-format
+msgid "Invalid date entered for \"%s\": %s"
+msgstr ""
+
+#, php-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+msgid "Could not save profile details."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Uitgebreide profielinstellingen bewerken"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Bewerken"
+
 msgid "UI extensions for additional profile fields."
 msgstr "UI-uitbreidingen voor extra profielvelden."
 
-#. TRANS: Link description in user account settings menu.
-msgid "Details"
-msgstr "Details"
-
 msgid "More details..."
 msgstr "Meer details..."
 
+msgid "Company"
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "End"
+msgstr ""
+
+msgid "Current"
+msgstr ""
+
+msgid "Institution"
+msgstr "Instelling"
+
+msgid "Degree"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+msgid "Phone"
+msgstr "Telefoonnummer"
+
+msgid "IM"
+msgstr "IM"
+
+#, fuzzy
+msgid "Website"
+msgstr "Websites"
+
+msgid "Employer"
+msgstr "Werkgever"
+
 msgid "Personal"
 msgstr "Persoonlijk"
 
@@ -55,15 +128,6 @@ msgstr "Labels"
 msgid "Contact"
 msgstr "Contact"
 
-msgid "Phone"
-msgstr "Telefoonnummer"
-
-msgid "IM"
-msgstr "IM"
-
-msgid "Websites"
-msgstr "Websites"
-
 msgid "Birthday"
 msgstr "Geboortedatum"
 
@@ -76,22 +140,8 @@ msgstr "Namen van kinderen"
 msgid "Work experience"
 msgstr "Werkervaring"
 
-msgid "Employer"
-msgstr "Werkgever"
-
 msgid "Education"
 msgstr "Opleiding"
 
-msgid "Institution"
-msgstr "Instelling"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit extended profile settings"
-msgstr "Uitgebreide profielinstellingen bewerken"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Bewerken"
-
-msgid "Extended profile settings"
-msgstr "Uitgebreide profielinstellingen"
+#~ msgid "Details"
+#~ msgstr "Details"
diff --git a/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po
index 98224ba955..f935d8de42 100644
--- a/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/sv/LC_MESSAGES/ExtendedProfile.po
@@ -9,28 +9,101 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:18:04+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
 "Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-08 01:22:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "UI extensions for additional profile fields."
+msgid "Extended profile settings"
+msgstr "Utökade profilinställningar"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Message given submitting a form with an unknown action
+msgid "Unexpected form submission."
+msgstr ""
+
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr ""
+
+#, php-format
+msgid "Invalid date entered for \"%s\": %s"
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-msgid "Details"
-msgstr "Detaljer"
+#, php-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+msgid "Could not save profile details."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Redigera utökade profilinställningar"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Redigera"
+
+msgid "UI extensions for additional profile fields."
+msgstr ""
 
 msgid "More details..."
 msgstr "Mer detaljer..."
 
+msgid "Company"
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "End"
+msgstr ""
+
+msgid "Current"
+msgstr ""
+
+msgid "Institution"
+msgstr "Institution"
+
+msgid "Degree"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+msgid "Phone"
+msgstr "Telefon"
+
+msgid "IM"
+msgstr ""
+
+#, fuzzy
+msgid "Website"
+msgstr "Webbsidor"
+
+msgid "Employer"
+msgstr "Arbetsgivare"
+
 msgid "Personal"
 msgstr "Personlig"
 
@@ -55,15 +128,6 @@ msgstr "Taggar"
 msgid "Contact"
 msgstr "Kontakt"
 
-msgid "Phone"
-msgstr "Telefon"
-
-msgid "IM"
-msgstr ""
-
-msgid "Websites"
-msgstr "Webbsidor"
-
 msgid "Birthday"
 msgstr "Födelsedag"
 
@@ -76,22 +140,8 @@ msgstr "Barnens namn"
 msgid "Work experience"
 msgstr "Arbetserfarenhet"
 
-msgid "Employer"
-msgstr "Arbetsgivare"
-
 msgid "Education"
 msgstr "Utbildning"
 
-msgid "Institution"
-msgstr "Institution"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit extended profile settings"
-msgstr "Redigera utökade profilinställningar"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Redigera"
-
-msgid "Extended profile settings"
-msgstr "Utökade profilinställningar"
+#~ msgid "Details"
+#~ msgstr "Detaljer"
diff --git a/plugins/ExtendedProfile/locale/te/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/te/LC_MESSAGES/ExtendedProfile.po
index cda6454eaf..c8fd432a17 100644
--- a/plugins/ExtendedProfile/locale/te/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/te/LC_MESSAGES/ExtendedProfile.po
@@ -9,28 +9,101 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
-"PO-Revision-Date: 2011-03-11 18:18:04+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-08 01:22:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83703); Translate extension (2011-03-11)\n"
+"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "UI extensions for additional profile fields."
+msgid "Extended profile settings"
+msgstr ""
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Message given submitting a form with an unknown action
+msgid "Unexpected form submission."
+msgstr ""
+
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr ""
+
+#, php-format
+msgid "Invalid date entered for \"%s\": %s"
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-msgid "Details"
-msgstr "వివరాలు"
+#, php-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+msgid "Could not save profile details."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr ""
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "మార్చు"
+
+msgid "UI extensions for additional profile fields."
+msgstr ""
 
 msgid "More details..."
 msgstr "మరిన్ని వివరాలు..."
 
+msgid "Company"
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "End"
+msgstr ""
+
+msgid "Current"
+msgstr ""
+
+msgid "Institution"
+msgstr ""
+
+msgid "Degree"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+msgid "Phone"
+msgstr ""
+
+msgid "IM"
+msgstr ""
+
+#, fuzzy
+msgid "Website"
+msgstr "జాలగూళ్ళు"
+
+msgid "Employer"
+msgstr ""
+
 msgid "Personal"
 msgstr "వ్యక్తిగతం"
 
@@ -55,15 +128,6 @@ msgstr "ట్యాగులు"
 msgid "Contact"
 msgstr "సంప్రదించండి"
 
-msgid "Phone"
-msgstr ""
-
-msgid "IM"
-msgstr ""
-
-msgid "Websites"
-msgstr "జాలగూళ్ళు"
-
 msgid "Birthday"
 msgstr "పుట్టినరోజు"
 
@@ -76,22 +140,8 @@ msgstr "పిల్లల పేర్లు"
 msgid "Work experience"
 msgstr "ఉద్యోగ అనుభవం"
 
-msgid "Employer"
-msgstr ""
-
 msgid "Education"
 msgstr "చదువు"
 
-msgid "Institution"
-msgstr ""
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit extended profile settings"
-msgstr ""
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "మార్చు"
-
-msgid "Extended profile settings"
-msgstr ""
+#~ msgid "Details"
+#~ msgstr "వివరాలు"
diff --git a/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po
index b98ce66ca3..9cb239b9b3 100644
--- a/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po
+++ b/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po
@@ -9,29 +9,102 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ExtendedProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-08 01:03+0000\n"
-"PO-Revision-Date: 2011-03-08 01:06:03+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:50:37+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-06 02:17:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-POT-Import-Date: 2011-03-11 18:53:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
+msgid "Extended profile settings"
+msgstr "Розширені налаштування профілю"
+
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#. TRANS: Message given submitting a form with an unknown action
+msgid "Unexpected form submission."
+msgstr ""
+
+#, php-format
+msgid "You must supply a date for \"%s\"."
+msgstr ""
+
+#, php-format
+msgid "Invalid date entered for \"%s\": %s"
+msgstr ""
+
+#, php-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+msgid "Could not save profile details."
+msgstr ""
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#, php-format
+msgid "Invalid tag: \"%s\"."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Змінити розширені налаштування профілю"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Змінити"
+
 msgid "UI extensions for additional profile fields."
 msgstr "Розширення інтерфейсу для додаткових полів у профілі."
 
-#. TRANS: Link description in user account settings menu.
-msgid "Details"
-msgstr "Деталі"
-
 msgid "More details..."
 msgstr "Детальніше..."
 
+msgid "Company"
+msgstr ""
+
+msgid "Start"
+msgstr ""
+
+msgid "End"
+msgstr ""
+
+msgid "Current"
+msgstr ""
+
+msgid "Institution"
+msgstr "Установа"
+
+msgid "Degree"
+msgstr ""
+
+msgid "Description"
+msgstr ""
+
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+msgid "Phone"
+msgstr "Телефон"
+
+msgid "IM"
+msgstr "ІМ"
+
+#, fuzzy
+msgid "Website"
+msgstr "Сайти"
+
+msgid "Employer"
+msgstr "Роботодавець"
+
 msgid "Personal"
 msgstr "Профіль"
 
@@ -56,15 +129,6 @@ msgstr "Теґи"
 msgid "Contact"
 msgstr "Контакти"
 
-msgid "Phone"
-msgstr "Телефон"
-
-msgid "IM"
-msgstr "ІМ"
-
-msgid "Websites"
-msgstr "Сайти"
-
 msgid "Birthday"
 msgstr "День народження"
 
@@ -77,22 +141,8 @@ msgstr "Імена дітей"
 msgid "Work experience"
 msgstr "Досвід роботи"
 
-msgid "Employer"
-msgstr "Роботодавець"
-
 msgid "Education"
 msgstr "Освіта"
 
-msgid "Institution"
-msgstr "Установа"
-
-#. TRANS: Link title for link on user profile.
-msgid "Edit extended profile settings"
-msgstr "Змінити розширені налаштування профілю"
-
-#. TRANS: Link text for link on user profile.
-msgid "Edit"
-msgstr "Змінити"
-
-msgid "Extended profile settings"
-msgstr "Розширені налаштування профілю"
+#~ msgid "Details"
+#~ msgstr "Деталі"
diff --git a/plugins/Msn/locale/el/LC_MESSAGES/Msn.po b/plugins/Msn/locale/el/LC_MESSAGES/Msn.po
new file mode 100644
index 0000000000..cc3e8ab390
--- /dev/null
+++ b/plugins/Msn/locale/el/LC_MESSAGES/Msn.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - Msn to Greek (Ελληνικά)
+# Exported from translatewiki.net
+#
+# Author: Evropi
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Msn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:51:13+0000\n"
+"Language-Team: Greek <http://translatewiki.net/wiki/Portal:el>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:53:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: el\n"
+"X-Message-Group: #out-statusnet-plugin-msn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "MSN"
+msgstr "MSN"
+
+msgid ""
+"The MSN plugin allows users to send and receive notices over the MSN network."
+msgstr ""
diff --git a/plugins/Poll/locale/Poll.pot b/plugins/Poll/locale/Poll.pot
index 85b1b74dc1..09a9626291 100644
--- a/plugins/Poll/locale/Poll.pot
+++ b/plugins/Poll/locale/Poll.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 18:15+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+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"
@@ -72,24 +72,24 @@ msgid "Simple extension for supporting basic polls."
 msgstr ""
 
 #. TRANS: Exception thrown trying to respond to a poll without a poll reference.
-#: PollPlugin.php:234
+#: PollPlugin.php:230
 msgid "Invalid poll response: no poll reference."
 msgstr ""
 
 #. TRANS: Exception thrown trying to respond to a non-existing poll.
-#: PollPlugin.php:239
+#: PollPlugin.php:235
 msgid "Invalid poll response: poll is unknown."
 msgstr ""
 
 #. TRANS: Exception thrown when performing an unexpected action on a poll.
 #. TRANS: %s is the unpexpected object type.
-#: PollPlugin.php:266 PollPlugin.php:371
+#: PollPlugin.php:262 PollPlugin.php:420
 #, php-format
 msgid "Unexpected type for poll plugin: %s."
 msgstr ""
 
 #. TRANS: Application title.
-#: PollPlugin.php:432
+#: PollPlugin.php:481
 msgctxt "APPTITLE"
 msgid "Poll"
 msgstr ""
diff --git a/plugins/Poll/locale/ia/LC_MESSAGES/Poll.po b/plugins/Poll/locale/ia/LC_MESSAGES/Poll.po
new file mode 100644
index 0000000000..f8ae3a9010
--- /dev/null
+++ b/plugins/Poll/locale/ia/LC_MESSAGES/Poll.po
@@ -0,0 +1,152 @@
+# Translation of StatusNet - Poll to Interlingua (Interlingua)
+# Exported from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Poll\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:51:40+0000\n"
+"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:58:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-poll\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown trying to view a non-existing poll.
+msgid "No such poll."
+msgstr "Iste sondage non existe."
+
+#. TRANS: Client exception thrown trying to view a non-existing poll notice.
+msgid "No such poll notice."
+msgstr "Iste nota de sondage non existe."
+
+#. TRANS: Client exception thrown trying to view a poll of a non-existing user.
+msgid "No such user."
+msgstr "Iste usator non existe."
+
+#. TRANS: Server exception thrown trying to view a poll for a user for which the profile could not be loaded.
+msgid "User without a profile."
+msgstr "Usator sin profilo."
+
+#. TRANS: Page title for a poll.
+#. TRANS: %1$s is the nickname of the user that created the poll, %2$s is the poll question.
+#, php-format
+msgid "%1$s's poll: %2$s"
+msgstr "Le sondage de %1$s: %2$s"
+
+#. TRANS: Field label on the page to create a poll.
+msgid "Question"
+msgstr "Question"
+
+#. TRANS: Field title on the page to create a poll.
+msgid "What question are people answering?"
+msgstr "A qual question responde le gente?"
+
+#. TRANS: Field label for an answer option on the page to create a poll.
+#. TRANS: %d is the option number.
+#, php-format
+msgid "Option %d"
+msgstr "Option %d"
+
+#. TRANS: Button text for saving a new poll.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salveguardar"
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting basic polls."
+msgstr "Extension simple pro supportar sondages basic."
+
+#. TRANS: Exception thrown trying to respond to a poll without a poll reference.
+msgid "Invalid poll response: no poll reference."
+msgstr "Responsa invalide a sondage: sin referentia a un sondage."
+
+#. TRANS: Exception thrown trying to respond to a non-existing poll.
+msgid "Invalid poll response: poll is unknown."
+msgstr "Responsa invalide a sondage: le sondage es incognite."
+
+#. TRANS: Exception thrown when performing an unexpected action on a poll.
+#. TRANS: %s is the unpexpected object type.
+#, php-format
+msgid "Unexpected type for poll plugin: %s."
+msgstr "Typo inexpectate pro le plug-in de sondages: %s."
+
+#. TRANS: Application title.
+msgctxt "APPTITLE"
+msgid "Poll"
+msgstr "Sondage"
+
+#. TRANS: Client exception thrown when responding to a poll with an invalid option.
+#. TRANS: Client exception thrown responding to a poll with an invalid answer.
+msgid "Invalid poll selection."
+msgstr "Selection de sondage invalide."
+
+#. TRANS: Notice content voting for a poll.
+#. TRANS: %s is the chosen option in the poll.
+#. TRANS: Rendered version of the notice content voting for a poll.
+#. TRANS: %s a link to the poll with the chosen option as link description.
+#, php-format
+msgid "voted for \"%s\""
+msgstr "votava pro \"%s\""
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Submitter"
+
+#. TRANS: Notice content creating a poll.
+#. TRANS: %1$s is the poll question, %2$s is a link to the poll.
+#, php-format
+msgid "Poll: %1$s %2$s"
+msgstr "Sondage: %1$s %2$s"
+
+#. TRANS: Rendered version of the notice content creating a poll.
+#. TRANS: %s a link to the poll with the question as link description.
+#, php-format
+msgid "Poll: %s"
+msgstr "Sondage: %s"
+
+#. TRANS: Title for poll page.
+msgid "New poll"
+msgstr "Nove sondage"
+
+#. TRANS: Client exception thrown trying to create a poll while not logged in.
+msgid "You must be logged in to post a poll."
+msgstr "Tu debe aperir un session pro publicar un sondage."
+
+#. TRANS: Client exception thrown trying to create a poll without a question.
+msgid "Poll must have a question."
+msgstr "Le sondage debe haber un question."
+
+#. TRANS: Client exception thrown trying to create a poll with fewer than two options.
+msgid "Poll must have at least two options."
+msgstr "Le sondage debe haber al minus duo optiones."
+
+#. TRANS: Page title after sending a notice.
+msgid "Notice posted"
+msgstr "Nota publicate"
+
+#. TRANS: Page title for poll response.
+msgid "Poll response"
+msgstr "Responsa al sondage"
+
+#. TRANS: Client exception thrown trying to respond to a poll while not logged in.
+msgid "You must be logged in to respond to a poll."
+msgstr "Tu debe aperir un session pro responder a un sondage."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing poll.
+msgid "Invalid or missing poll."
+msgstr "Sondage invalide o mancante."
+
+#. TRANS: Page title after sending a poll response.
+msgid "Poll results"
+msgstr "Resultatos del sondage"
diff --git a/plugins/Poll/locale/mk/LC_MESSAGES/Poll.po b/plugins/Poll/locale/mk/LC_MESSAGES/Poll.po
new file mode 100644
index 0000000000..191c354b9b
--- /dev/null
+++ b/plugins/Poll/locale/mk/LC_MESSAGES/Poll.po
@@ -0,0 +1,152 @@
+# Translation of StatusNet - Poll to Macedonian (Македонски)
+# Exported from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Poll\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:51:41+0000\n"
+"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:58:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-poll\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#. TRANS: Client exception thrown trying to view a non-existing poll.
+msgid "No such poll."
+msgstr "Нема таква анкета."
+
+#. TRANS: Client exception thrown trying to view a non-existing poll notice.
+msgid "No such poll notice."
+msgstr "Нема таква анкетна забелешка."
+
+#. TRANS: Client exception thrown trying to view a poll of a non-existing user.
+msgid "No such user."
+msgstr "Нема таков корисник."
+
+#. TRANS: Server exception thrown trying to view a poll for a user for which the profile could not be loaded.
+msgid "User without a profile."
+msgstr "Корисник без профил."
+
+#. TRANS: Page title for a poll.
+#. TRANS: %1$s is the nickname of the user that created the poll, %2$s is the poll question.
+#, php-format
+msgid "%1$s's poll: %2$s"
+msgstr "Анкета на %1$s: %2$s"
+
+#. TRANS: Field label on the page to create a poll.
+msgid "Question"
+msgstr "Прашање"
+
+#. TRANS: Field title on the page to create a poll.
+msgid "What question are people answering?"
+msgstr "На кое прашање одговараат луѓето?"
+
+#. TRANS: Field label for an answer option on the page to create a poll.
+#. TRANS: %d is the option number.
+#, php-format
+msgid "Option %d"
+msgstr "Можност %d"
+
+#. TRANS: Button text for saving a new poll.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Зачувај"
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting basic polls."
+msgstr "Прост додаток за поддршка на едноставни анкети."
+
+#. TRANS: Exception thrown trying to respond to a poll without a poll reference.
+msgid "Invalid poll response: no poll reference."
+msgstr "Неважечки одговор во анкетата: нема назнака на анкетата."
+
+#. TRANS: Exception thrown trying to respond to a non-existing poll.
+msgid "Invalid poll response: poll is unknown."
+msgstr "Неважечки одговор во анкетата: анкетата е непозната."
+
+#. TRANS: Exception thrown when performing an unexpected action on a poll.
+#. TRANS: %s is the unpexpected object type.
+#, php-format
+msgid "Unexpected type for poll plugin: %s."
+msgstr "Неочекуван тип за анкетен приклучок: %s."
+
+#. TRANS: Application title.
+msgctxt "APPTITLE"
+msgid "Poll"
+msgstr "Анкета"
+
+#. TRANS: Client exception thrown when responding to a poll with an invalid option.
+#. TRANS: Client exception thrown responding to a poll with an invalid answer.
+msgid "Invalid poll selection."
+msgstr "Неважечки избор на анкета."
+
+#. TRANS: Notice content voting for a poll.
+#. TRANS: %s is the chosen option in the poll.
+#. TRANS: Rendered version of the notice content voting for a poll.
+#. TRANS: %s a link to the poll with the chosen option as link description.
+#, php-format
+msgid "voted for \"%s\""
+msgstr "гласаше за „%s“"
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Поднеси"
+
+#. TRANS: Notice content creating a poll.
+#. TRANS: %1$s is the poll question, %2$s is a link to the poll.
+#, php-format
+msgid "Poll: %1$s %2$s"
+msgstr "Анкета: %1$s %2$s"
+
+#. TRANS: Rendered version of the notice content creating a poll.
+#. TRANS: %s a link to the poll with the question as link description.
+#, php-format
+msgid "Poll: %s"
+msgstr "Анкета: %s"
+
+#. TRANS: Title for poll page.
+msgid "New poll"
+msgstr "Нова анкета"
+
+#. TRANS: Client exception thrown trying to create a poll while not logged in.
+msgid "You must be logged in to post a poll."
+msgstr "Мора да сте најавени за да можете да објавите анкета."
+
+#. TRANS: Client exception thrown trying to create a poll without a question.
+msgid "Poll must have a question."
+msgstr "Анкетата мора да има прашање."
+
+#. TRANS: Client exception thrown trying to create a poll with fewer than two options.
+msgid "Poll must have at least two options."
+msgstr "Анкетата мора да има барем две можности."
+
+#. TRANS: Page title after sending a notice.
+msgid "Notice posted"
+msgstr "Забелешката е објавена"
+
+#. TRANS: Page title for poll response.
+msgid "Poll response"
+msgstr "Одговор на анкетата"
+
+#. TRANS: Client exception thrown trying to respond to a poll while not logged in.
+msgid "You must be logged in to respond to a poll."
+msgstr "Мора да сте најавени за да можете да одговарате на анкети."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing poll.
+msgid "Invalid or missing poll."
+msgstr "Неважечка или непостоечка анкета."
+
+#. TRANS: Page title after sending a poll response.
+msgid "Poll results"
+msgstr "Резултати од анкетата"
diff --git a/plugins/Poll/locale/nl/LC_MESSAGES/Poll.po b/plugins/Poll/locale/nl/LC_MESSAGES/Poll.po
new file mode 100644
index 0000000000..89ce123826
--- /dev/null
+++ b/plugins/Poll/locale/nl/LC_MESSAGES/Poll.po
@@ -0,0 +1,152 @@
+# Translation of StatusNet - Poll to Dutch (Nederlands)
+# Exported from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Poll\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:51:41+0000\n"
+"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:58:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-poll\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Client exception thrown trying to view a non-existing poll.
+msgid "No such poll."
+msgstr "Deze peiling bestaat niet."
+
+#. TRANS: Client exception thrown trying to view a non-existing poll notice.
+msgid "No such poll notice."
+msgstr "Dit peilingsbericht bestaat niet."
+
+#. TRANS: Client exception thrown trying to view a poll of a non-existing user.
+msgid "No such user."
+msgstr "Deze gebruiker bestaat niet."
+
+#. TRANS: Server exception thrown trying to view a poll for a user for which the profile could not be loaded.
+msgid "User without a profile."
+msgstr "Gebruiker zonder een profiel."
+
+#. TRANS: Page title for a poll.
+#. TRANS: %1$s is the nickname of the user that created the poll, %2$s is the poll question.
+#, php-format
+msgid "%1$s's poll: %2$s"
+msgstr "Peiling van %1$s: %2$s"
+
+#. TRANS: Field label on the page to create a poll.
+msgid "Question"
+msgstr "Vraag"
+
+#. TRANS: Field title on the page to create a poll.
+msgid "What question are people answering?"
+msgstr "Welke vraag beantwoorden de mensen?"
+
+#. TRANS: Field label for an answer option on the page to create a poll.
+#. TRANS: %d is the option number.
+#, php-format
+msgid "Option %d"
+msgstr "Keuze %d"
+
+#. TRANS: Button text for saving a new poll.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Opslaan"
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting basic polls."
+msgstr "Eenvoudige plug-in voor peilingen."
+
+#. TRANS: Exception thrown trying to respond to a poll without a poll reference.
+msgid "Invalid poll response: no poll reference."
+msgstr "Ongeldig antwoord op peiling: heeft geen verwijzing naar een peiling."
+
+#. TRANS: Exception thrown trying to respond to a non-existing poll.
+msgid "Invalid poll response: poll is unknown."
+msgstr "Ongeldig antwoord op peiling: de peiling bestaat niet."
+
+#. TRANS: Exception thrown when performing an unexpected action on a poll.
+#. TRANS: %s is the unpexpected object type.
+#, php-format
+msgid "Unexpected type for poll plugin: %s."
+msgstr "Onverwacht type voor peilingplug-in: %s"
+
+#. TRANS: Application title.
+msgctxt "APPTITLE"
+msgid "Poll"
+msgstr "Peiling"
+
+#. TRANS: Client exception thrown when responding to a poll with an invalid option.
+#. TRANS: Client exception thrown responding to a poll with an invalid answer.
+msgid "Invalid poll selection."
+msgstr "Ongeldige keuze voor peiling."
+
+#. TRANS: Notice content voting for a poll.
+#. TRANS: %s is the chosen option in the poll.
+#. TRANS: Rendered version of the notice content voting for a poll.
+#. TRANS: %s a link to the poll with the chosen option as link description.
+#, php-format
+msgid "voted for \"%s\""
+msgstr "gestemd voor \"%s\""
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Opslaan"
+
+#. TRANS: Notice content creating a poll.
+#. TRANS: %1$s is the poll question, %2$s is a link to the poll.
+#, php-format
+msgid "Poll: %1$s %2$s"
+msgstr "Peiling: %1$s %2$s"
+
+#. TRANS: Rendered version of the notice content creating a poll.
+#. TRANS: %s a link to the poll with the question as link description.
+#, php-format
+msgid "Poll: %s"
+msgstr "Peiling: %s"
+
+#. TRANS: Title for poll page.
+msgid "New poll"
+msgstr "Nieuwe peiling"
+
+#. TRANS: Client exception thrown trying to create a poll while not logged in.
+msgid "You must be logged in to post a poll."
+msgstr "U moet aangemeld zijn om een peiling aan te kunnen maken."
+
+#. TRANS: Client exception thrown trying to create a poll without a question.
+msgid "Poll must have a question."
+msgstr "De peiling moet een vraag hebben."
+
+#. TRANS: Client exception thrown trying to create a poll with fewer than two options.
+msgid "Poll must have at least two options."
+msgstr "De peiling moet tenminste twee antwoordmogelijkheden hebben."
+
+#. TRANS: Page title after sending a notice.
+msgid "Notice posted"
+msgstr "De mededeling is verzonden"
+
+#. TRANS: Page title for poll response.
+msgid "Poll response"
+msgstr "Peilingreactie"
+
+#. TRANS: Client exception thrown trying to respond to a poll while not logged in.
+msgid "You must be logged in to respond to a poll."
+msgstr "U moet aangemeld zijn om te kunnen stemmen in een peiling."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing poll.
+msgid "Invalid or missing poll."
+msgstr "De peiling is ongeldig of bestaat niet."
+
+#. TRANS: Page title after sending a poll response.
+msgid "Poll results"
+msgstr "Peilingresultaten"
diff --git a/plugins/Poll/locale/uk/LC_MESSAGES/Poll.po b/plugins/Poll/locale/uk/LC_MESSAGES/Poll.po
new file mode 100644
index 0000000000..dca23be16a
--- /dev/null
+++ b/plugins/Poll/locale/uk/LC_MESSAGES/Poll.po
@@ -0,0 +1,153 @@
+# Translation of StatusNet - Poll to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Poll\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:51:41+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-11 18:58:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-poll\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+#. TRANS: Client exception thrown trying to view a non-existing poll.
+msgid "No such poll."
+msgstr "Немає такого опитування."
+
+#. TRANS: Client exception thrown trying to view a non-existing poll notice.
+msgid "No such poll notice."
+msgstr "Немає допису щодо опитування."
+
+#. TRANS: Client exception thrown trying to view a poll of a non-existing user.
+msgid "No such user."
+msgstr "Такого користувача немає."
+
+#. TRANS: Server exception thrown trying to view a poll for a user for which the profile could not be loaded.
+msgid "User without a profile."
+msgstr "Користувач без профілю."
+
+#. TRANS: Page title for a poll.
+#. TRANS: %1$s is the nickname of the user that created the poll, %2$s is the poll question.
+#, php-format
+msgid "%1$s's poll: %2$s"
+msgstr "Опитування %1$s: %2$s"
+
+#. TRANS: Field label on the page to create a poll.
+msgid "Question"
+msgstr "Питання"
+
+#. TRANS: Field title on the page to create a poll.
+msgid "What question are people answering?"
+msgstr "На яке запитання відповідати людям?"
+
+#. TRANS: Field label for an answer option on the page to create a poll.
+#. TRANS: %d is the option number.
+#, php-format
+msgid "Option %d"
+msgstr "Варіант %d"
+
+#. TRANS: Button text for saving a new poll.
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Зберегти"
+
+#. TRANS: Plugin description.
+msgid "Simple extension for supporting basic polls."
+msgstr "Простий додаток для підтримки проведення опитувань."
+
+#. TRANS: Exception thrown trying to respond to a poll without a poll reference.
+msgid "Invalid poll response: no poll reference."
+msgstr "Невірна відповідь: відсутнє посилання на опитування."
+
+#. TRANS: Exception thrown trying to respond to a non-existing poll.
+msgid "Invalid poll response: poll is unknown."
+msgstr "Неправильна відповідь на опитування: невідоме опитування."
+
+#. TRANS: Exception thrown when performing an unexpected action on a poll.
+#. TRANS: %s is the unpexpected object type.
+#, php-format
+msgid "Unexpected type for poll plugin: %s."
+msgstr "Неочікувана дія для додатку опитувань: %s."
+
+#. TRANS: Application title.
+msgctxt "APPTITLE"
+msgid "Poll"
+msgstr "Опитування"
+
+#. TRANS: Client exception thrown when responding to a poll with an invalid option.
+#. TRANS: Client exception thrown responding to a poll with an invalid answer.
+msgid "Invalid poll selection."
+msgstr "Невірний вибір опитування."
+
+#. TRANS: Notice content voting for a poll.
+#. TRANS: %s is the chosen option in the poll.
+#. TRANS: Rendered version of the notice content voting for a poll.
+#. TRANS: %s a link to the poll with the chosen option as link description.
+#, php-format
+msgid "voted for \"%s\""
+msgstr "проголосувало за «%s»"
+
+#. TRANS: Button text for submitting a poll response.
+msgctxt "BUTTON"
+msgid "Submit"
+msgstr "Надіслати"
+
+#. TRANS: Notice content creating a poll.
+#. TRANS: %1$s is the poll question, %2$s is a link to the poll.
+#, php-format
+msgid "Poll: %1$s %2$s"
+msgstr "Опитування: %1$s %2$s"
+
+#. TRANS: Rendered version of the notice content creating a poll.
+#. TRANS: %s a link to the poll with the question as link description.
+#, php-format
+msgid "Poll: %s"
+msgstr "Опитування: %s"
+
+#. TRANS: Title for poll page.
+msgid "New poll"
+msgstr "Нове опитування"
+
+#. TRANS: Client exception thrown trying to create a poll while not logged in.
+msgid "You must be logged in to post a poll."
+msgstr "Ви повинні увійти до системи, щоб взяти участь в опитуванні."
+
+#. TRANS: Client exception thrown trying to create a poll without a question.
+msgid "Poll must have a question."
+msgstr "Опитування повинно мати запитання."
+
+#. TRANS: Client exception thrown trying to create a poll with fewer than two options.
+msgid "Poll must have at least two options."
+msgstr "Опитування повинно мати принаймні два варіанти."
+
+#. TRANS: Page title after sending a notice.
+msgid "Notice posted"
+msgstr "Допис опубліковано"
+
+#. TRANS: Page title for poll response.
+msgid "Poll response"
+msgstr "Відповіді на опитування"
+
+#. TRANS: Client exception thrown trying to respond to a poll while not logged in.
+msgid "You must be logged in to respond to a poll."
+msgstr "Ви повинні увійти до системи, щоб відповісти на опитування."
+
+#. TRANS: Client exception thrown trying to respond to a non-existing poll.
+msgid "Invalid or missing poll."
+msgstr "Невірне або відсутнє опитування."
+
+#. TRANS: Page title after sending a poll response.
+msgid "Poll results"
+msgstr "Результати опитування"
diff --git a/plugins/SearchSub/locale/SearchSub.pot b/plugins/SearchSub/locale/SearchSub.pot
new file mode 100644
index 0000000000..c5b8798998
--- /dev/null
+++ b/plugins/SearchSub/locale/SearchSub.pot
@@ -0,0 +1,182 @@
+# 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: 2011-03-17 09:47+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: searchsubsaction.php:51
+#, php-format
+msgid "%s's search subscriptions"
+msgstr ""
+
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#: searchsubsaction.php:55
+#, php-format
+msgid "%1$s's search subscriptions, page %2$d"
+msgstr ""
+
+#. TRANS: Page notice for page with an overview of all search subscriptions
+#. TRANS: of the logged in user's own profile.
+#: searchsubsaction.php:68
+msgid ""
+"You have subscribed to receive all notices on this site matching the "
+"following searches:"
+msgstr ""
+
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#: searchsubsaction.php:73
+#, php-format
+msgid ""
+"%s has subscribed to receive all notices on this site matching the following "
+"searches:"
+msgstr ""
+
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#: searchsubsaction.php:130
+#, php-format
+msgid "%s is not subscribed to any searches."
+msgstr ""
+
+#: searchsubsaction.php:168
+#, php-format
+msgid "\"<a href=\"%s\">%s</a>\" since %s"
+msgstr ""
+
+#. TRANS: Error text shown a user tries to untrack a search query they're not subscribed to.
+#: searchsubuntrackcommand.php:21
+#, php-format
+msgid "You are not tracking the search \"%s\"."
+msgstr ""
+
+#. TRANS: Message given having failed to cancel a search subscription by untrack command.
+#: searchsubuntrackcommand.php:29
+#, php-format
+msgid "Could not end a search subscription for query \"%s\"."
+msgstr ""
+
+#. TRANS: Message given having removed a search subscription by untrack command.
+#: searchsubuntrackcommand.php:35
+#, php-format
+msgid "You are no longer subscribed to the search \"%s\"."
+msgstr ""
+
+#. TRANS: Page title when search subscription succeeded.
+#: searchsubaction.php:136
+msgid "Subscribed"
+msgstr ""
+
+#: searchunsubform.php:96 searchunsubform.php:107
+msgid "Unsubscribe from this search"
+msgstr ""
+
+#. TRANS: Page title when search unsubscription succeeded.
+#: searchunsubaction.php:76
+msgid "Unsubscribed"
+msgstr ""
+
+#. TRANS: Error text shown a user tries to track a search query they're already subscribed to.
+#: searchsubtrackcommand.php:21
+#, php-format
+msgid "You are already tracking the search \"%s\"."
+msgstr ""
+
+#. TRANS: Message given having failed to set up a search subscription by track command.
+#: searchsubtrackcommand.php:29
+#, php-format
+msgid "Could not start a search subscription for query \"%s\"."
+msgstr ""
+
+#. TRANS: Message given having added a search subscription by track command.
+#: searchsubtrackcommand.php:35
+#, php-format
+msgid "You are subscribed to the search \"%s\"."
+msgstr ""
+
+#. TRANS: Plugin description.
+#: SearchSubPlugin.php:132
+msgid "Plugin to allow following all messages with a given search."
+msgstr ""
+
+#. TRANS: SearchSub plugin menu item on user settings page.
+#: SearchSubPlugin.php:236
+msgctxt "MENU"
+msgid "Searches"
+msgstr ""
+
+#. TRANS: SearchSub plugin tooltip for user settings menu item.
+#: SearchSubPlugin.php:238
+msgid "Configure search subscriptions"
+msgstr ""
+
+#: SearchSubPlugin.php:259
+msgid "Search subscriptions"
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "track <word>"
+#: SearchSubPlugin.php:309
+msgctxt "COMMANDHELP"
+msgid "Start following notices matching the given search query."
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "untrack <word>"
+#: SearchSubPlugin.php:311
+msgctxt "COMMANDHELP"
+msgid "Stop following notices matching the given search query."
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "track off"
+#. TRANS: Help message for IM/SMS command "untrack all"
+#: SearchSubPlugin.php:313 SearchSubPlugin.php:315
+msgctxt "COMMANDHELP"
+msgid "Disable all tracked search subscriptions."
+msgstr ""
+
+#. TRANS: Help message for IM/SMS command "tracks"
+#. TRANS: Help message for IM/SMS command "tracking"
+#: SearchSubPlugin.php:317 SearchSubPlugin.php:319
+msgctxt "COMMANDHELP"
+msgid "List all your search subscriptions."
+msgstr ""
+
+#. TRANS: Error text shown a user tries to disable all a search subscriptions with track off command, but has none.
+#: searchsubtrackingcommand.php:14 searchsubtrackoffcommand.php:14
+msgid "You are not tracking any searches."
+msgstr ""
+
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+#: searchsubtrackingcommand.php:24
+#, php-format
+msgid "You are tracking searches for: %s"
+msgstr ""
+
+#: searchsubform.php:116 searchsubform.php:140
+msgid "Subscribe to this search"
+msgstr ""
+
+#. TRANS: Message given having failed to cancel one of the search subs with 'track off' command.
+#: searchsubtrackoffcommand.php:24
+#, php-format
+msgid "Error disabling search subscription for query \"%s\"."
+msgstr ""
+
+#. TRANS: Message given having disabled all search subscriptions with 'track off'.
+#: searchsubtrackoffcommand.php:31
+msgid "Disabled all your search subscriptions."
+msgstr ""
diff --git a/plugins/SubMirror/locale/SubMirror.pot b/plugins/SubMirror/locale/SubMirror.pot
index 81ae0a0f91..b152575321 100644
--- a/plugins/SubMirror/locale/SubMirror.pot
+++ b/plugins/SubMirror/locale/SubMirror.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"POT-Creation-Date: 2011-03-17 09:47+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"
@@ -17,7 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: actions/basemirror.php:71
-msgid "Invalid feed URL."
+#, php-format
+msgid "Invalid feed URL: %s"
 msgstr ""
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
@@ -58,7 +59,7 @@ msgstr ""
 msgid "Requested edit of missing mirror."
 msgstr ""
 
-#: actions/addmirror.php:72
+#: actions/addmirror.php:88
 msgid "Could not subscribe to feed."
 msgstr ""
 
@@ -74,34 +75,38 @@ msgid ""
 "timeline!"
 msgstr ""
 
-#: SubMirrorPlugin.php:90
+#: SubMirrorPlugin.php:93
 msgid "Pull feeds into your timeline!"
 msgstr ""
 
 #. TRANS: SubMirror plugin menu item on user settings page.
-#: SubMirrorPlugin.php:110
+#: SubMirrorPlugin.php:113
 msgctxt "MENU"
 msgid "Mirroring"
 msgstr ""
 
 #. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: SubMirrorPlugin.php:112
+#: SubMirrorPlugin.php:115
 msgid "Configure mirroring of posts from other feeds"
 msgstr ""
 
-#: SubMirrorPlugin.php:183
+#: SubMirrorPlugin.php:186
 msgid "Mirrored feeds"
 msgstr ""
 
-#: lib/addmirrorform.php:59
+#: lib/addmirrorform.php:60
 msgid "Web page or feed URL:"
 msgstr ""
 
-#: lib/addmirrorform.php:64
+#: lib/addmirrorform.php:65 lib/addtwittermirrorform.php:55
 msgctxt "BUTTON"
 msgid "Add feed"
 msgstr ""
 
+#: lib/addtwittermirrorform.php:50
+msgid "Twitter username:"
+msgstr ""
+
 #: lib/editmirrorform.php:83
 msgctxt "LABEL"
 msgid "Remote feed:"
@@ -132,3 +137,15 @@ msgstr ""
 #: lib/editmirrorform.php:117
 msgid "Stop mirroring"
 msgstr ""
+
+#: lib/addmirrorwizard.php:76
+msgid "Twitter"
+msgstr ""
+
+#: lib/addmirrorwizard.php:109
+msgid "RSS or Atom feed"
+msgstr ""
+
+#: lib/addmirrorwizard.php:119
+msgid "Select a feed provider"
+msgstr ""
diff --git a/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
index f3fb0f911f..76a5203c5e 100644
--- a/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Invalid feed URL."
+#, fuzzy, php-format
+msgid "Invalid feed URL: %s"
 msgstr "Ungültige Feed-URL."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
@@ -88,6 +89,9 @@ msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Feed hinzufügen"
 
+msgid "Twitter username:"
+msgstr ""
+
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Remote-Feed:"
@@ -113,3 +117,12 @@ msgstr "Speichern"
 
 msgid "Stop mirroring"
 msgstr "Mit dem Spiegeln aufhören"
+
+msgid "Twitter"
+msgstr ""
+
+msgid "RSS or Atom feed"
+msgstr ""
+
+msgid "Select a feed provider"
+msgstr ""
diff --git a/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
index 5715014646..1216906eb9 100644
--- a/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
@@ -10,19 +10,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-msgid "Invalid feed URL."
+#, fuzzy, php-format
+msgid "Invalid feed URL: %s"
 msgstr "Adresse URL de flux invalide."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
@@ -93,6 +94,9 @@ msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Ajouter le flux"
 
+msgid "Twitter username:"
+msgstr ""
+
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Flux distant :"
@@ -118,3 +122,12 @@ msgstr "Sauvegarder"
 
 msgid "Stop mirroring"
 msgstr "Arrêter le miroir"
+
+msgid "Twitter"
+msgstr ""
+
+msgid "RSS or Atom feed"
+msgstr ""
+
+msgid "Select a feed provider"
+msgstr ""
diff --git a/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
index f6f1b5eb2a..19eb4e9f01 100644
--- a/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Invalid feed URL."
+#, fuzzy, php-format
+msgid "Invalid feed URL: %s"
 msgstr "URL de syndication invalide."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
@@ -90,6 +91,9 @@ msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Adder syndication"
 
+msgid "Twitter username:"
+msgstr ""
+
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Syndication remote:"
@@ -115,3 +119,12 @@ msgstr "Salveguardar"
 
 msgid "Stop mirroring"
 msgstr "Cessar le republication"
+
+msgid "Twitter"
+msgstr ""
+
+msgid "RSS or Atom feed"
+msgstr ""
+
+msgid "Select a feed provider"
+msgstr ""
diff --git a/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
index e6da0cb3ae..8ca0053775 100644
--- a/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-msgid "Invalid feed URL."
+#, fuzzy, php-format
+msgid "Invalid feed URL: %s"
 msgstr "Неважечка URL-адреса за каналот."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
@@ -90,6 +91,9 @@ msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Додај канал"
 
+msgid "Twitter username:"
+msgstr ""
+
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Далечински канал:"
@@ -115,3 +119,12 @@ msgstr "Зачувај"
 
 msgid "Stop mirroring"
 msgstr "Престани со отсликување"
+
+msgid "Twitter"
+msgstr ""
+
+msgid "RSS or Atom feed"
+msgstr ""
+
+msgid "Select a feed provider"
+msgstr ""
diff --git a/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
index f61cf8bab0..9c567df960 100644
--- a/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Invalid feed URL."
+#, fuzzy, php-format
+msgid "Invalid feed URL: %s"
 msgstr "Ongeldige URL voor feed."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
@@ -92,6 +93,9 @@ msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Feed toevoegen"
 
+msgid "Twitter username:"
+msgstr ""
+
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Bronfeed:"
@@ -117,3 +121,12 @@ msgstr "Opslaan"
 
 msgid "Stop mirroring"
 msgstr "Spiegelen beëindigen"
+
+msgid "Twitter"
+msgstr ""
+
+msgid "RSS or Atom feed"
+msgstr ""
+
+msgid "Select a feed provider"
+msgstr ""
diff --git a/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
index cd82af0273..05089e9660 100644
--- a/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
 "Language-Team: Tagalog <http://translatewiki.net/wiki/Portal:tl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Invalid feed URL."
+#, fuzzy, php-format
+msgid "Invalid feed URL: %s"
 msgstr "Hindi tanggap na URL ng pakain."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
@@ -90,6 +91,9 @@ msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Idagdag ang pakain"
 
+msgid "Twitter username:"
+msgstr ""
+
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Pakaing malayo:"
@@ -115,3 +119,12 @@ msgstr "Sagipin"
 
 msgid "Stop mirroring"
 msgstr "Ihinto ang pagsasalamin"
+
+msgid "Twitter"
+msgstr ""
+
+msgid "RSS or Atom feed"
+msgstr ""
+
+msgid "Select a feed provider"
+msgstr ""
diff --git a/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
index 8c57930fdf..6693d90adb 100644
--- a/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
@@ -9,20 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:38:18+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:52:01+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:47:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:19:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
-msgid "Invalid feed URL."
+#, fuzzy, php-format
+msgid "Invalid feed URL: %s"
 msgstr "Помилкова URL-адреса веб-стрічки."
 
 #. TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
@@ -91,6 +92,9 @@ msgctxt "BUTTON"
 msgid "Add feed"
 msgstr "Додати веб-стрічку"
 
+msgid "Twitter username:"
+msgstr ""
+
 msgctxt "LABEL"
 msgid "Remote feed:"
 msgstr "Віддалена веб-стрічка:"
@@ -116,3 +120,12 @@ msgstr "Зберегти"
 
 msgid "Stop mirroring"
 msgstr "Зупинити віддзеркалення"
+
+msgid "Twitter"
+msgstr ""
+
+msgid "RSS or Atom feed"
+msgstr ""
+
+msgid "Select a feed provider"
+msgstr ""
diff --git a/plugins/TagSub/locale/TagSub.pot b/plugins/TagSub/locale/TagSub.pot
new file mode 100644
index 0000000000..7992067332
--- /dev/null
+++ b/plugins/TagSub/locale/TagSub.pot
@@ -0,0 +1,98 @@
+# 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: 2011-03-17 09:47+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: tagunsubform.php:96 tagunsubform.php:107
+msgid "Unsubscribe from this tag"
+msgstr ""
+
+#. TRANS: Plugin description.
+#: TagSubPlugin.php:128
+msgid "Plugin to allow following all messages with a given tag."
+msgstr ""
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+#: TagSubPlugin.php:202
+msgctxt "MENU"
+msgid "Tags"
+msgstr ""
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+#: TagSubPlugin.php:204
+msgid "Configure tag subscriptions"
+msgstr ""
+
+#: TagSubPlugin.php:225
+msgid "Tag subscriptions"
+msgstr ""
+
+#: tagsubform.php:116 tagsubform.php:140
+msgid "Subscribe to this tag"
+msgstr ""
+
+#. TRANS: Page title when tag unsubscription succeeded.
+#: tagunsubaction.php:76
+msgid "Unsubscribed"
+msgstr ""
+
+#. TRANS: Page title when tag subscription succeeded.
+#: tagsubaction.php:136
+msgid "Subscribed"
+msgstr ""
+
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: tagsubsaction.php:51
+#, php-format
+msgid "%s's tag subscriptions"
+msgstr ""
+
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#: tagsubsaction.php:55
+#, php-format
+msgid "%1$s's tag subscriptions, page %2$d"
+msgstr ""
+
+#. TRANS: Page notice for page with an overview of all tag subscriptions
+#. TRANS: of the logged in user's own profile.
+#: tagsubsaction.php:68
+msgid ""
+"You have subscribed to receive all notices on this site containing the "
+"following tags:"
+msgstr ""
+
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#: tagsubsaction.php:73
+#, php-format
+msgid ""
+"%s has subscribed to receive all notices on this site containing the "
+"following tags:"
+msgstr ""
+
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#: tagsubsaction.php:130
+#, php-format
+msgid "%s is not listening to any tags."
+msgstr ""
+
+#: tagsubsaction.php:168
+#, php-format
+msgid "#<a href=\"%s\">%s</a> since %s"
+msgstr ""
diff --git a/plugins/UserLimit/locale/fa/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/fa/LC_MESSAGES/UserLimit.po
new file mode 100644
index 0000000000..f6f0b0df66
--- /dev/null
+++ b/plugins/UserLimit/locale/fa/LC_MESSAGES/UserLimit.po
@@ -0,0 +1,25 @@
+# Translation of StatusNet - UserLimit to Persian (فارسی)
+# Exported from translatewiki.net
+#
+# Author: Ebraminio
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - UserLimit\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:52:14+0000\n"
+"Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:19:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: fa\n"
+"X-Message-Group: #out-statusnet-plugin-userlimit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Limit the number of users who can register."
+msgstr "محدودکردن تعداد کاربرانی که می‌توانید ثبت نام کنند."
diff --git a/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
index ad166e3bb3..905d18a257 100644
--- a/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:38:37+0000\n"
+"POT-Creation-Date: 2011-03-17 09:47+0000\n"
+"PO-Revision-Date: 2011-03-17 09:52:24+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:47:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:19:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r84120); Translate extension (2011-03-11)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
@@ -100,12 +100,12 @@ msgstr[2] "Импортировано %d пользователей."
 msgid "Import user groups"
 msgstr "Импорт групп пользователей"
 
-#, php-format
+#, fuzzy, php-format
 msgid "Importing %d group..."
 msgid_plural "Importing %d groups..."
 msgstr[0] "Импорт %d группы…"
 msgstr[1] "Импорт %d группы…"
-msgstr[2] ""
+msgstr[2] "Импорт %d группы…"
 
 #, php-format
 msgid "Imported %d group."