From 486ec4c916c5b4a25474227403a3e109522cd4bc Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sun, 22 Nov 2009 19:56:32 +0100
Subject: Localisation updates for !StatusNet from !translatewiki.net !sntrans

---
 locale/ar/LC_MESSAGES/statusnet.mo    | Bin 41251 -> 40896 bytes
 locale/ar/LC_MESSAGES/statusnet.po    | 134 ++++---
 locale/bg/LC_MESSAGES/statusnet.mo    | Bin 90373 -> 65271 bytes
 locale/bg/LC_MESSAGES/statusnet.po    | 212 ++++++-----
 locale/ca/LC_MESSAGES/statusnet.mo    | Bin 77176 -> 58036 bytes
 locale/ca/LC_MESSAGES/statusnet.po    | 118 ++++---
 locale/cs/LC_MESSAGES/statusnet.mo    | Bin 39056 -> 17230 bytes
 locale/cs/LC_MESSAGES/statusnet.po    |  60 +++-
 locale/de/LC_MESSAGES/statusnet.mo    | Bin 77107 -> 55551 bytes
 locale/de/LC_MESSAGES/statusnet.po    |  61 +++-
 locale/el/LC_MESSAGES/statusnet.mo    | Bin 33899 -> 14188 bytes
 locale/el/LC_MESSAGES/statusnet.po    |  55 ++-
 locale/en_GB/LC_MESSAGES/statusnet.mo | Bin 72477 -> 60831 bytes
 locale/en_GB/LC_MESSAGES/statusnet.po |  61 +++-
 locale/es/LC_MESSAGES/statusnet.mo    | Bin 76121 -> 50624 bytes
 locale/es/LC_MESSAGES/statusnet.po    |  61 +++-
 locale/fi/LC_MESSAGES/statusnet.mo    | Bin 82174 -> 67047 bytes
 locale/fi/LC_MESSAGES/statusnet.po    |  61 +++-
 locale/fr/LC_MESSAGES/statusnet.mo    | Bin 112461 -> 114438 bytes
 locale/fr/LC_MESSAGES/statusnet.po    |  89 +++--
 locale/ga/LC_MESSAGES/statusnet.mo    | Bin 79801 -> 47553 bytes
 locale/ga/LC_MESSAGES/statusnet.po    |  61 +++-
 locale/he/LC_MESSAGES/statusnet.mo    | Bin 42717 -> 19126 bytes
 locale/he/LC_MESSAGES/statusnet.po    |  59 +++-
 locale/is/LC_MESSAGES/statusnet.mo    | Bin 67951 -> 55218 bytes
 locale/is/LC_MESSAGES/statusnet.po    |  61 +++-
 locale/it/LC_MESSAGES/statusnet.mo    | Bin 75954 -> 53867 bytes
 locale/it/LC_MESSAGES/statusnet.po    |  61 +++-
 locale/ja/LC_MESSAGES/statusnet.mo    | Bin 52494 -> 30677 bytes
 locale/ja/LC_MESSAGES/statusnet.po    |  60 +++-
 locale/ko/LC_MESSAGES/statusnet.mo    | Bin 80830 -> 57202 bytes
 locale/ko/LC_MESSAGES/statusnet.po    |  61 +++-
 locale/mk/LC_MESSAGES/statusnet.mo    | Bin 50219 -> 22539 bytes
 locale/mk/LC_MESSAGES/statusnet.po    |  60 +++-
 locale/nb/LC_MESSAGES/statusnet.mo    | Bin 25973 -> 13610 bytes
 locale/nb/LC_MESSAGES/statusnet.po    |  55 ++-
 locale/nl/LC_MESSAGES/statusnet.mo    | Bin 112758 -> 112804 bytes
 locale/nl/LC_MESSAGES/statusnet.po    | 157 +++++----
 locale/nn/LC_MESSAGES/statusnet.mo    | Bin 73106 -> 51812 bytes
 locale/nn/LC_MESSAGES/statusnet.po    |  61 +++-
 locale/pl/LC_MESSAGES/statusnet.mo    | Bin 101740 -> 83742 bytes
 locale/pl/LC_MESSAGES/statusnet.po    |  61 +++-
 locale/pt/LC_MESSAGES/statusnet.mo    | Bin 28778 -> 17764 bytes
 locale/pt/LC_MESSAGES/statusnet.po    |  97 +++--
 locale/pt_BR/LC_MESSAGES/statusnet.mo | Bin 76409 -> 53487 bytes
 locale/pt_BR/LC_MESSAGES/statusnet.po |  62 +++-
 locale/ru/LC_MESSAGES/statusnet.mo    | Bin 111002 -> 129160 bytes
 locale/ru/LC_MESSAGES/statusnet.po    | 641 ++++++++++++++++++++--------------
 locale/statusnet.po                   |  51 ++-
 locale/sv/LC_MESSAGES/statusnet.mo    | Bin 63660 -> 36177 bytes
 locale/sv/LC_MESSAGES/statusnet.po    |  61 +++-
 locale/te/LC_MESSAGES/statusnet.mo    | Bin 61676 -> 40540 bytes
 locale/te/LC_MESSAGES/statusnet.po    |  59 +++-
 locale/tr/LC_MESSAGES/statusnet.mo    | Bin 38548 -> 17159 bytes
 locale/tr/LC_MESSAGES/statusnet.po    |  60 +++-
 locale/uk/LC_MESSAGES/statusnet.mo    | Bin 99177 -> 70515 bytes
 locale/uk/LC_MESSAGES/statusnet.po    |  63 +++-
 locale/vi/LC_MESSAGES/statusnet.mo    | Bin 73369 -> 36235 bytes
 locale/vi/LC_MESSAGES/statusnet.po    |  61 +++-
 locale/zh_CN/LC_MESSAGES/statusnet.mo | Bin 69584 -> 42486 bytes
 locale/zh_CN/LC_MESSAGES/statusnet.po |  60 +++-
 locale/zh_TW/LC_MESSAGES/statusnet.mo | Bin 21549 -> 7981 bytes
 locale/zh_TW/LC_MESSAGES/statusnet.po |  55 ++-
 63 files changed, 1888 insertions(+), 1051 deletions(-)

(limited to 'locale')

diff --git a/locale/ar/LC_MESSAGES/statusnet.mo b/locale/ar/LC_MESSAGES/statusnet.mo
index b93d428bc..b1e2c6c2b 100644
Binary files a/locale/ar/LC_MESSAGES/statusnet.mo and b/locale/ar/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 75e3f7e97..76ab156c3 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -8,16 +8,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:33:15+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:04+0000\n"
 "Language-Team: Arabic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: out-statusnet\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"
+
 #: actions/all.php:63 actions/public.php:97 actions/replies.php:92
 #: actions/showfavorites.php:137 actions/tag.php:51
 msgid "No such page"
@@ -542,7 +543,7 @@ msgid "Preview"
 msgstr "عاين"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr "احذف"
 
@@ -671,7 +672,7 @@ msgstr "امنع هذا المستخدم"
 
 #: actions/block.php:162
 msgid "Failed to save block information."
-msgstr ""
+msgstr "فشل حفظ معلومات المنع."
 
 #: actions/bookmarklet.php:50
 msgid "Post to "
@@ -764,7 +765,7 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
 msgid "Do not delete this notice"
 msgstr "لا تحذف هذا الإشعار"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr "احذف هذا الإشعار"
 
@@ -804,9 +805,8 @@ msgid "Design settings for this StatusNet site."
 msgstr ""
 
 #: actions/designadminpanel.php:270
-#, fuzzy
 msgid "Invalid logo URL."
-msgstr "حجم غير صالح."
+msgstr "مسار شعار غير صالح."
 
 #: actions/designadminpanel.php:274
 #, php-format
@@ -2010,8 +2010,8 @@ msgstr ""
 msgid "Confirm"
 msgstr "أكّد"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
 msgstr "نفس كلمة السر أعلاه"
 
 #: actions/passwordsettings.php:117
@@ -2058,17 +2058,17 @@ msgstr "المراسلة الفورية غير متوفرة."
 #: actions/pathsadminpanel.php:146
 #, php-format
 msgid "Avatar directory not writable: %s"
-msgstr ""
+msgstr "لا يمكن الكتابة في دليل الأفتارات: %s"
 
 #: actions/pathsadminpanel.php:152
 #, php-format
 msgid "Background directory not writable: %s"
-msgstr ""
+msgstr "لا يمكن الكتابة في دليل الخلفيات: %s"
 
 #: actions/pathsadminpanel.php:160
 #, php-format
 msgid "Locales directory not readable: %s"
-msgstr ""
+msgstr "لا يمكن قراءة دليل المحليات: %s"
 
 #: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
 #: lib/adminpanelaction.php:299
@@ -2468,10 +2468,6 @@ msgstr "إجراء غير معروف"
 msgid "6 or more characters, and don't forget it!"
 msgstr ""
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "نفس كلمة السر أعلاه"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "أعد الضبط"
@@ -3025,7 +3021,7 @@ msgstr ""
 
 #: actions/siteadminpanel.php:210
 msgid "Minimum text limit is 140 characters."
-msgstr ""
+msgstr "حد النص الأدنى هو 140 حرفًا."
 
 #: actions/siteadminpanel.php:216
 msgid "Dupe limit must 1 or more seconds."
@@ -3033,7 +3029,7 @@ msgstr ""
 
 #: actions/siteadminpanel.php:266
 msgid "General"
-msgstr ""
+msgstr "عام"
 
 #: actions/siteadminpanel.php:269
 msgid "Site name"
@@ -3060,9 +3056,8 @@ msgid "URL used for credits link in footer of each page"
 msgstr ""
 
 #: actions/siteadminpanel.php:284
-#, fuzzy
 msgid "Contact email address for your site"
-msgstr "عنوان بريد إلكتروني غير صالح: %s"
+msgstr "عنوان البريد الإلكتروني للاتصال بموقعك"
 
 #: actions/siteadminpanel.php:290
 #, fuzzy
@@ -3145,9 +3140,8 @@ msgid "In a scheduled job"
 msgstr ""
 
 #: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
-#, fuzzy
 msgid "Never"
-msgstr "استرجع"
+msgstr "مطلقا"
 
 #: actions/siteadminpanel.php:360
 msgid "Data snapshots"
@@ -3159,7 +3153,7 @@ msgstr ""
 
 #: actions/siteadminpanel.php:366
 msgid "Frequency"
-msgstr ""
+msgstr "التكرار"
 
 #: actions/siteadminpanel.php:367
 msgid "Snapshots will be sent once every N web hits"
@@ -3178,18 +3172,16 @@ msgid "SSL"
 msgstr ""
 
 #: actions/siteadminpanel.php:384
-#, fuzzy
 msgid "Sometimes"
-msgstr "الإشعارات"
+msgstr "أحيانًا"
 
 #: actions/siteadminpanel.php:385
-#, fuzzy
 msgid "Always"
-msgstr "الكنى"
+msgstr "دائمًا"
 
 #: actions/siteadminpanel.php:387
 msgid "Use SSL"
-msgstr ""
+msgstr "استخدم SSL"
 
 #: actions/siteadminpanel.php:388
 msgid "When to use SSL"
@@ -3197,7 +3189,7 @@ msgstr ""
 
 #: actions/siteadminpanel.php:393
 msgid "SSL Server"
-msgstr ""
+msgstr "خادوم SSL"
 
 #: actions/siteadminpanel.php:394
 msgid "Server to direct SSL requests to"
@@ -3205,7 +3197,7 @@ msgstr ""
 
 #: actions/siteadminpanel.php:400
 msgid "Limits"
-msgstr ""
+msgstr "الحدود"
 
 #: actions/siteadminpanel.php:403
 msgid "Text limit"
@@ -3213,7 +3205,7 @@ msgstr "حد النص"
 
 #: actions/siteadminpanel.php:403
 msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "أقصى عدد للحروف في الإشعارات."
 
 #: actions/siteadminpanel.php:407
 msgid "Dupe limit"
@@ -3802,7 +3794,7 @@ msgstr ""
 
 #: classes/User_group.php:380
 msgid "Could not create group."
-msgstr ""
+msgstr "تعذّر إنشاء المجموعة."
 
 #: classes/User_group.php:409
 msgid "Could not set group membership."
@@ -3915,7 +3907,7 @@ msgstr "مساعدة"
 msgid "Help me!"
 msgstr "ساعدني!"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "ابحث"
 
@@ -4039,19 +4031,16 @@ msgid "Unable to delete design setting."
 msgstr ""
 
 #: lib/adminpanelaction.php:300
-#, fuzzy
 msgid "Basic site configuration"
-msgstr "تأكيد عنوان البريد الإلكتروني"
+msgstr "ضبط الموقع الأساسي"
 
 #: lib/adminpanelaction.php:303
-#, fuzzy
 msgid "Design configuration"
-msgstr "تأكيد عنوان البريد الإلكتروني"
+msgstr "ضبط التصميم"
 
 #: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
-#, fuzzy
 msgid "Paths configuration"
-msgstr "تأكيد عنوان البريد الإلكتروني"
+msgstr "ضبط المسارات"
 
 #: lib/attachmentlist.php:87
 msgid "Attachments"
@@ -4230,11 +4219,12 @@ msgstr "لست مُشتركًا بأي أحد."
 #, fuzzy
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
-msgstr[0] "لست مُشتركًا بأي أحد."
-msgstr[1] "لست مُشتركًا بأي أحد."
+msgstr[0] "لست مشتركًا بأحد."
+msgstr[1] "أنت مشترك بهذا الشخص:"
+msgstr[2] "أنت مشترك بهذين الشخصين:"
+msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
 
 #: lib/command.php:640
-#, fuzzy
 msgid "No one is subscribed to you."
 msgstr "لا أحد مشترك بك."
 
@@ -4243,10 +4233,11 @@ msgstr "لا أحد مشترك بك."
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "لا أحد مشترك بك."
-msgstr[1] "لا أحد مشترك بك."
+msgstr[1] "هذا الشخص مشترك بك:"
+msgstr[2] "هذان الشخصان مشتركان بك:"
+msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
 
 #: lib/command.php:662
-#, fuzzy
 msgid "You are not a member of any groups."
 msgstr "لست عضوًا في أي مجموعة."
 
@@ -4254,8 +4245,10 @@ msgstr "لست عضوًا في أي مجموعة."
 #, fuzzy
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
-msgstr[0] "لست عضوا في تلك المجموعة."
-msgstr[1] "لست عضوا في تلك المجموعة."
+msgstr[0] "لست عضوًا في أي مجموعة."
+msgstr[1] "أنت عضو في هذه المجموعة:"
+msgstr[2] "أنت عضو في هذين المجموعتين:"
+msgstr[3] "أنت عضو في هذه المجموعات:"
 
 #: lib/command.php:678
 msgid ""
@@ -4537,7 +4530,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 msgid "from"
 msgstr "من"
 
@@ -4741,7 +4734,7 @@ msgstr ""
 
 #: lib/mediafile.php:162
 msgid "Failed to write file to disk."
-msgstr ""
+msgstr "فشل في كتابة الملف إلى القرص."
 
 #: lib/mediafile.php:165
 msgid "File upload stopped by extension."
@@ -4798,19 +4791,41 @@ msgstr "أرفق"
 msgid "Attach a file"
 msgstr "أرفق ملفًا"
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "لا"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr "في"
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 msgid "in context"
 msgstr "في السياق"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr "رُد على هذا الإشعار"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "رُد"
 
@@ -4832,7 +4847,7 @@ msgstr "خطأ أثناء إدراج الملف الشخصي الجديد"
 
 #: lib/oauthstore.php:291
 msgid "Error inserting avatar"
-msgstr ""
+msgstr "خطأ في إدراج الأفتار"
 
 #: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
@@ -4953,6 +4968,10 @@ msgstr "ألغِ منع هذا المستخدم"
 msgid "Search site"
 msgstr "ابحث في الموقع"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 msgid "Search help"
 msgstr "ابحث في المساعدة"
@@ -4971,11 +4990,11 @@ msgstr "إشعارات"
 
 #: lib/searchgroupnav.php:83
 msgid "Find content of notices"
-msgstr ""
+msgstr "ابحث عن محتويات في الإشعارات"
 
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
-msgstr ""
+msgstr "ابحث عن مجموعات على هذا الموقع"
 
 #: lib/section.php:89
 msgid "Untitled section"
@@ -5173,3 +5192,6 @@ msgstr ""
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr ""
+
+#~ msgid "same as password above"
+#~ msgstr "نفس كلمة السر أعلاه"
diff --git a/locale/bg/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo
index c33c77d7a..6d277c3c0 100644
Binary files a/locale/bg/LC_MESSAGES/statusnet.mo and b/locale/bg/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 81e197abc..e4877c812 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
 # Translation of StatusNet to Bulgarian
 #
+# Author@translatewiki.net: Turin
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -7,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:33:18+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:06+0000\n"
 "Language-Team: Bulgarian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: out-statusnet\n"
@@ -20,9 +21,8 @@ msgstr ""
 
 #: actions/all.php:63 actions/public.php:97 actions/replies.php:92
 #: actions/showfavorites.php:137 actions/tag.php:51
-#, fuzzy
 msgid "No such page"
-msgstr "Няма такъв етикет."
+msgstr "Няма такака страница."
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
@@ -61,19 +61,19 @@ msgid "%s and friends"
 msgstr "%s и приятели"
 
 #: actions/all.php:99
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "Емисия с приятелите на %s"
+msgstr "Емисия с приятелите на %s (RSS 1.0)"
 
 #: actions/all.php:107
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "Емисия с приятелите на %s"
+msgstr "Емисия с приятелите на %s (RSS 2.0)"
 
 #: actions/all.php:115
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for friends of %s (Atom)"
-msgstr "Емисия с приятелите на %s"
+msgstr "Емисия с приятелите на %s (Atom)"
 
 #: actions/all.php:127
 #, php-format
@@ -103,9 +103,8 @@ msgid ""
 msgstr ""
 
 #: actions/all.php:165
-#, fuzzy
 msgid "You and friends"
-msgstr "%s и приятели"
+msgstr "Вие и приятелите"
 
 #: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
@@ -197,9 +196,9 @@ msgid "No message text!"
 msgstr "Липсва текст на съобщението"
 
 #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Max message size is %d chars."
-msgstr "Твърде дълго. Може да е най-много 140 знака."
+msgstr "Твърде дълго. Може да е най-много %d знака."
 
 #: actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
@@ -212,9 +211,9 @@ msgstr ""
 "приятели."
 
 #: actions/apidirectmessage.php:89
-#, fuzzy, php-format
+#, php-format
 msgid "Direct messages from %s"
-msgstr "Преки съобщения до %s"
+msgstr "Преки съобщения от %s"
 
 #: actions/apidirectmessage.php:93
 #, php-format
@@ -354,9 +353,9 @@ msgstr ""
 
 #: actions/apigroupcreate.php:264 actions/editgroup.php:224
 #: actions/newgroup.php:168
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid alias: \"%s\""
-msgstr "Неправилен етикет: \"%s\""
+msgstr "Неправилен псевдоним: \"%s\""
 
 #: actions/apigroupcreate.php:273 actions/editgroup.php:228
 #: actions/newgroup.php:172
@@ -372,12 +371,10 @@ msgstr ""
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
 #: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
-#, fuzzy
 msgid "Group not found!"
-msgstr "Не е открит методът в API."
+msgstr "Групата не е открита."
 
 #: actions/apigroupjoin.php:110
-#, fuzzy
 msgid "You are already a member of that group."
 msgstr "Вече членувате в тази група."
 
@@ -391,7 +388,6 @@ msgid "Could not join user %s to group %s."
 msgstr "Грешка при проследяване — потребителят не е намерен."
 
 #: actions/apigroupleave.php:114
-#, fuzzy
 msgid "You are not a member of this group."
 msgstr "Не членувате в тази група."
 
@@ -411,7 +407,7 @@ msgid "groups on %s"
 msgstr "Търсене на групи в сайта"
 
 #: actions/apigrouplist.php:95
-#, fuzzy, php-format
+#, php-format
 msgid "%s's groups"
 msgstr "Групи на %s"
 
@@ -562,7 +558,7 @@ msgid "Preview"
 msgstr "Преглед"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -613,9 +609,8 @@ msgid "Failed updating avatar."
 msgstr "Неуспешно обновяване на аватара."
 
 #: actions/avatarsettings.php:387
-#, fuzzy
 msgid "Avatar deleted."
-msgstr "Аватарът е обновен."
+msgstr "Аватарът е изтрит."
 
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
@@ -747,9 +742,8 @@ msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Адресът \"%s\" е потвърден за сметката ви."
 
 #: actions/conversation.php:99
-#, fuzzy
 msgid "Conversation"
-msgstr "Код за потвърждение"
+msgstr "Разговор"
 
 #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
 #: lib/profileaction.php:206
@@ -793,7 +787,7 @@ msgstr "Наистина ли искате да изтриете тази бел
 msgid "Do not delete this notice"
 msgstr "Грешка при изтриване на бележката."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr "Изтриване на бележката"
 
@@ -813,9 +807,8 @@ msgid "You can only delete local users."
 msgstr "Не може да изтривате бележки на друг потребител."
 
 #: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
 msgid "Delete user"
-msgstr "Изтриване"
+msgstr "Изтриване на потребител"
 
 #: actions/deleteuser.php:135
 msgid ""
@@ -824,9 +817,8 @@ msgid ""
 msgstr ""
 
 #: actions/deleteuser.php:148 lib/deleteuserform.php:77
-#, fuzzy
 msgid "Delete this user"
-msgstr "Изтриване на бележката"
+msgstr "Изтриване на този потребител"
 
 #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
 #: lib/adminpanelaction.php:302 lib/groupnav.php:119
@@ -848,9 +840,8 @@ msgid "Theme not available: %s"
 msgstr "Страницата не е достъпна във вида медия, който приемате"
 
 #: actions/designadminpanel.php:370
-#, fuzzy
 msgid "Change logo"
-msgstr "Смяна на паролата"
+msgstr "Смяна на логото"
 
 #: actions/designadminpanel.php:375
 #, fuzzy
@@ -890,11 +881,11 @@ msgstr "Може да качите лого за групата ви."
 
 #: actions/designadminpanel.php:452 lib/designsettings.php:139
 msgid "On"
-msgstr ""
+msgstr "Вкл."
 
 #: actions/designadminpanel.php:468 lib/designsettings.php:155
 msgid "Off"
-msgstr ""
+msgstr "Изкл."
 
 #: actions/designadminpanel.php:469 lib/designsettings.php:156
 msgid "Turn background image on or off."
@@ -905,14 +896,12 @@ msgid "Tile background image"
 msgstr ""
 
 #: actions/designadminpanel.php:483 lib/designsettings.php:170
-#, fuzzy
 msgid "Change colours"
-msgstr "Смяна на паролата"
+msgstr "Смяна на цветовете"
 
 #: actions/designadminpanel.php:505 lib/designsettings.php:191
-#, fuzzy
 msgid "Content"
-msgstr "Свързване"
+msgstr "Съдържание"
 
 #: actions/designadminpanel.php:518 lib/designsettings.php:204
 #, fuzzy
@@ -1308,9 +1297,8 @@ msgid "No such group."
 msgstr "Няма такава група"
 
 #: actions/getfile.php:75
-#, fuzzy
 msgid "No such file."
-msgstr "Няма такава бележка."
+msgstr "Няма такъв файл."
 
 #: actions/getfile.php:79
 #, fuzzy
@@ -1331,9 +1319,8 @@ msgstr "Не е открит профил с такъв идентификато
 
 #: actions/groupblock.php:81 actions/groupunblock.php:81
 #: actions/makeadmin.php:81
-#, fuzzy
 msgid "No group specified."
-msgstr "Не е указан профил."
+msgstr "Не е указана група."
 
 #: actions/groupblock.php:91
 msgid "Only an admin can block group members."
@@ -1381,9 +1368,8 @@ msgid "No ID"
 msgstr "Липсва ID"
 
 #: actions/groupdesignsettings.php:68
-#, fuzzy
 msgid "You must be logged in to edit a group."
-msgstr "За да създавате група, трябва да сте влезли."
+msgstr "За да редактирате група, трябва да сте влезли."
 
 #: actions/groupdesignsettings.php:141
 #, fuzzy
@@ -1492,9 +1478,8 @@ msgstr "Търсене на групи"
 
 #: actions/groupsearch.php:79 actions/noticesearch.php:117
 #: actions/peoplesearch.php:83
-#, fuzzy
 msgid "No results."
-msgstr "Няма резултати"
+msgstr "Няма резултати."
 
 #: actions/groupsearch.php:82
 #, php-format
@@ -2141,9 +2126,9 @@ msgstr "6 или повече знака"
 msgid "Confirm"
 msgstr "Потвърждаване"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "също като паролата по-горе"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Също като паролата по-горе"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2241,9 +2226,8 @@ msgid "Theme directory"
 msgstr ""
 
 #: actions/pathsadminpanel.php:247
-#, fuzzy
 msgid "Avatars"
-msgstr "Аватар"
+msgstr "Аватари"
 
 #: actions/pathsadminpanel.php:252
 #, fuzzy
@@ -2579,7 +2563,7 @@ msgstr ""
 
 #: actions/recoverpassword.php:191
 msgid "Nickname or email address"
-msgstr ""
+msgstr "Псевдоним или е-поща"
 
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
@@ -2609,10 +2593,6 @@ msgstr "Непознато действие"
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 или повече знака. И не ги забравяйте!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Също като паролата по-горе"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Обновяване"
@@ -2981,9 +2961,8 @@ msgstr ""
 
 #: actions/showgroup.php:274 actions/tagother.php:128
 #: actions/userauthorization.php:179 lib/userprofile.php:194
-#, fuzzy
 msgid "Note"
-msgstr "Бележки"
+msgstr "Бележка"
 
 #: actions/showgroup.php:284 lib/groupeditform.php:184
 msgid "Aliases"
@@ -3265,9 +3244,8 @@ msgid "URLs"
 msgstr ""
 
 #: actions/siteadminpanel.php:319
-#, fuzzy
 msgid "Server"
-msgstr "Възстановяване"
+msgstr "Сървър"
 
 #: actions/siteadminpanel.php:319
 msgid "Site's server hostname."
@@ -3282,36 +3260,32 @@ msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 
 #: actions/siteadminpanel.php:331
-#, fuzzy
 msgid "Access"
-msgstr "Приемане"
+msgstr "Достъп"
 
 #: actions/siteadminpanel.php:334
-#, fuzzy
 msgid "Private"
-msgstr "Поверителност"
+msgstr "Частен"
 
 #: actions/siteadminpanel.php:336
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 
 #: actions/siteadminpanel.php:340
-#, fuzzy
 msgid "Invite only"
-msgstr "Покани"
+msgstr "Само с покани"
 
 #: actions/siteadminpanel.php:342
 msgid "Make registration invitation only."
-msgstr ""
+msgstr "Новите регистрации да са само с покани."
 
 #: actions/siteadminpanel.php:346
-#, fuzzy
 msgid "Closed"
-msgstr "Блокиране"
+msgstr "Затворен"
 
 #: actions/siteadminpanel.php:348
 msgid "Disable new registrations."
-msgstr ""
+msgstr "Изключване на новите регистрации."
 
 #: actions/siteadminpanel.php:354
 msgid "Snapshots"
@@ -3326,9 +3300,8 @@ msgid "In a scheduled job"
 msgstr ""
 
 #: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
-#, fuzzy
 msgid "Never"
-msgstr "Възстановяване"
+msgstr "Никога"
 
 #: actions/siteadminpanel.php:360
 msgid "Data snapshots"
@@ -3355,18 +3328,16 @@ msgid "Snapshots will be sent to this URL"
 msgstr ""
 
 #: actions/siteadminpanel.php:380
-#, fuzzy
 msgid "SSL"
-msgstr "SMS"
+msgstr "SSL"
 
 #: actions/siteadminpanel.php:384
-#, fuzzy
 msgid "Sometimes"
-msgstr "Бележки"
+msgstr "Понякога"
 
 #: actions/siteadminpanel.php:385
 msgid "Always"
-msgstr ""
+msgstr "Винаги"
 
 #: actions/siteadminpanel.php:387
 msgid "Use SSL"
@@ -3374,7 +3345,7 @@ msgstr ""
 
 #: actions/siteadminpanel.php:388
 msgid "When to use SSL"
-msgstr ""
+msgstr "Кога да се използва SSL"
 
 #: actions/siteadminpanel.php:393
 msgid "SSL Server"
@@ -3386,7 +3357,7 @@ msgstr ""
 
 #: actions/siteadminpanel.php:400
 msgid "Limits"
-msgstr ""
+msgstr "Ограничения"
 
 #: actions/siteadminpanel.php:403
 msgid "Text limit"
@@ -3530,9 +3501,9 @@ msgid "Subscribed"
 msgstr "Абониране"
 
 #: actions/subscribers.php:50
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers"
-msgstr "Абонати"
+msgstr "%s абоната"
 
 #: actions/subscribers.php:52
 #, php-format
@@ -3754,9 +3725,8 @@ msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 #: actions/useradminpanel.php:231
-#, fuzzy
 msgid "New users"
-msgstr "Покани за нови потребители"
+msgstr "Нови потребители"
 
 #: actions/useradminpanel.php:235
 msgid "New user welcome"
@@ -3779,9 +3749,8 @@ msgstr ""
 "ботове)."
 
 #: actions/useradminpanel.php:251
-#, fuzzy
 msgid "Invitations"
-msgstr "Поканите са изпратени."
+msgstr "Покани"
 
 #: actions/useradminpanel.php:256
 #, fuzzy
@@ -3827,9 +3796,8 @@ msgstr ""
 "на този потребител. Ако не искате абонамента, натиснете \"Cancel\" (Отказ)."
 
 #: actions/userauthorization.php:188
-#, fuzzy
 msgid "License"
-msgstr "лиценз."
+msgstr "Лиценз"
 
 #: actions/userauthorization.php:209
 msgid "Accept"
@@ -4072,9 +4040,9 @@ msgid "Other options"
 msgstr "Други настройки"
 
 #: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
 msgid "%s - %s"
-msgstr "%s (%s)"
+msgstr "%s - %s"
 
 #: lib/action.php:159
 msgid "Untitled page"
@@ -4148,7 +4116,7 @@ msgstr "Помощ"
 msgid "Help me!"
 msgstr "Помощ"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Търсене"
 
@@ -4200,9 +4168,8 @@ msgid "Contact"
 msgstr "Контакт"
 
 #: lib/action.php:741
-#, fuzzy
 msgid "Badge"
-msgstr "Побутване"
+msgstr "Табелка"
 
 #: lib/action.php:769
 msgid "StatusNet software license"
@@ -4494,7 +4461,7 @@ msgstr[1] "Грешка при абониране на друг потребит
 #: lib/command.php:662
 #, fuzzy
 msgid "You are not a member of any groups."
-msgstr "Не членувате в тази група."
+msgstr "Не членувате в нито една група."
 
 #: lib/command.php:664
 #, fuzzy
@@ -4574,7 +4541,7 @@ msgstr "Бележки през SMS"
 
 #: lib/dberroraction.php:60
 msgid "Database error"
-msgstr ""
+msgstr "Грешка в базата от данни"
 
 #: lib/designsettings.php:105
 #, fuzzy
@@ -4792,10 +4759,9 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
-#, fuzzy
+#: lib/mailbox.php:227 lib/noticelist.php:452
 msgid "from"
-msgstr " от "
+msgstr "от"
 
 #: lib/mail.php:172
 msgid "Email address confirmation"
@@ -4936,9 +4902,9 @@ msgid ""
 msgstr ""
 
 #: lib/mail.php:559
-#, fuzzy, php-format
+#, php-format
 msgid "%s (@%s) added your notice as a favorite"
-msgstr "%s отбеляза бележката ви като любима"
+msgstr "%s (@%s) отбеляза бележката ви като любима"
 
 #: lib/mail.php:561
 #, php-format
@@ -5062,20 +5028,41 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
-msgid "at"
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:404
 #, fuzzy
+msgid "N"
+msgstr "Не"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:506
 msgid "in context"
-msgstr "Няма съдържание!"
+msgstr "в контекст"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr "Отговаряне на тази бележка"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "Отговор"
 
@@ -5223,6 +5210,10 @@ msgstr "Разблокиране на този потребител"
 msgid "Search site"
 msgstr "Търсене"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5449,3 +5440,6 @@ msgstr "Това не е вашият входящ адрес."
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "Входящата поща не е разрешена."
+
+#~ msgid "same as password above"
+#~ msgstr "също като паролата по-горе"
diff --git a/locale/ca/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo
index 5397b0eb7..c11a203f6 100644
Binary files a/locale/ca/LC_MESSAGES/statusnet.mo and b/locale/ca/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index b75461bc7..00ddc36c2 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:33:20+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:09+0000\n"
 "Language-Team: Catalan\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: out-statusnet\n"
@@ -209,9 +209,9 @@ msgid "Can't send direct messages to users who aren't your friend."
 msgstr "No pots enviar missatges directes a usuaris que no siguin amics teus."
 
 #: actions/apidirectmessage.php:89
-#, fuzzy, php-format
+#, php-format
 msgid "Direct messages from %s"
-msgstr "Missatges directes a %s"
+msgstr "Missatges directes de %s"
 
 #: actions/apidirectmessage.php:93
 #, php-format
@@ -408,9 +408,9 @@ msgid "groups on %s"
 msgstr "Accions del grup"
 
 #: actions/apigrouplist.php:95
-#, fuzzy, php-format
+#, php-format
 msgid "%s's groups"
-msgstr "%s grups"
+msgstr "Grups de %s"
 
 #: actions/apigrouplist.php:103
 #, fuzzy, php-format
@@ -426,9 +426,8 @@ msgid "You may not delete another user's status."
 msgstr "No pots eliminar l'estatus d'un altre usuari."
 
 #: actions/apistatusesshow.php:138
-#, fuzzy
 msgid "Status deleted."
-msgstr "Avatar actualitzat."
+msgstr "S'ha suprimit l'estat."
 
 #: actions/apistatusesshow.php:144
 msgid "No status with that ID found."
@@ -559,7 +558,7 @@ msgid "Preview"
 msgstr "Previsualitzar"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -795,7 +794,7 @@ msgstr "N'estàs segur que vols eliminar aquesta notificació?"
 msgid "Do not delete this notice"
 msgstr "No es pot esborrar la notificació."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr "Eliminar aquesta nota"
 
@@ -816,9 +815,8 @@ msgid "You can only delete local users."
 msgstr "No pots eliminar l'estatus d'un altre usuari."
 
 #: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
 msgid "Delete user"
-msgstr "Eliminar"
+msgstr "Suprimeix l'usuari"
 
 #: actions/deleteuser.php:135
 msgid ""
@@ -1258,7 +1256,7 @@ msgstr "Nou avís"
 
 #: actions/file.php:42
 msgid "No attachments"
-msgstr ""
+msgstr "Sense adjuncions"
 
 #: actions/file.php:51
 msgid "No uploaded attachments"
@@ -1282,9 +1280,8 @@ msgid "That user has blocked you from subscribing."
 msgstr "Aquest usuari t'ha bloquejat com a subscriptor."
 
 #: actions/finishremotesubscribe.php:106
-#, fuzzy
 msgid "You are not authorized."
-msgstr "No autoritzat."
+msgstr "No esteu autoritzat."
 
 #: actions/finishremotesubscribe.php:109
 #, fuzzy
@@ -1312,9 +1309,8 @@ msgid "No such file."
 msgstr "No existeix aquest avís."
 
 #: actions/getfile.php:79
-#, fuzzy
 msgid "Cannot read file."
-msgstr "Hem perdut el nostre arxiu."
+msgstr "No es pot llegir el fitxer."
 
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1330,9 +1326,8 @@ msgstr "No hi ha cap perfil amb aquesta ID."
 
 #: actions/groupblock.php:81 actions/groupunblock.php:81
 #: actions/makeadmin.php:81
-#, fuzzy
 msgid "No group specified."
-msgstr "No s'ha especificat perfil."
+msgstr "No s'ha especificat cap grup."
 
 #: actions/groupblock.php:91
 msgid "Only an admin can block group members."
@@ -1912,7 +1907,7 @@ msgstr ""
 
 #: actions/makeadmin.php:91
 msgid "Only an admin can make another user an admin."
-msgstr ""
+msgstr "Només un administrador poc fer a un altre usuari administrador."
 
 #: actions/makeadmin.php:95
 #, php-format
@@ -2150,9 +2145,9 @@ msgstr "6 o més caràcters"
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "repeteix la contrasenya anterior"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Igual a la contrasenya de dalt"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2212,9 +2207,8 @@ msgstr ""
 
 #: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
 #: lib/adminpanelaction.php:299
-#, fuzzy
 msgid "Site"
-msgstr "Invitar"
+msgstr "Lloc"
 
 #: actions/pathsadminpanel.php:216
 msgid "Path"
@@ -2235,7 +2229,7 @@ msgstr ""
 
 #: actions/pathsadminpanel.php:227
 msgid "Theme"
-msgstr ""
+msgstr "Tema"
 
 #: actions/pathsadminpanel.php:232
 msgid "Theme server"
@@ -2626,10 +2620,6 @@ msgstr "Acció desconeguda"
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 o més caràcters, i no te n'oblidis!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Igual a la contrasenya de dalt"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Restablir"
@@ -3049,9 +3039,8 @@ msgid "Statistics"
 msgstr "Estadístiques"
 
 #: actions/showgroup.php:432
-#, fuzzy
 msgid "Created"
-msgstr "Crear"
+msgstr "S'ha creat"
 
 #: actions/showgroup.php:448
 #, php-format
@@ -3075,9 +3064,8 @@ msgstr ""
 "(http://ca.wikipedia.org/wiki/Microblogging)"
 
 #: actions/showgroup.php:482
-#, fuzzy
 msgid "Admins"
-msgstr "Admin"
+msgstr "Administradors"
 
 #: actions/showmessage.php:81
 msgid "No such message."
@@ -3775,13 +3763,12 @@ msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 #: actions/useradminpanel.php:231
-#, fuzzy
 msgid "New users"
-msgstr "Invitar nous usuaris"
+msgstr "Usuaris nous"
 
 #: actions/useradminpanel.php:235
 msgid "New user welcome"
-msgstr ""
+msgstr "Benvinguda als usuaris nous"
 
 #: actions/useradminpanel.php:236
 msgid "Welcome text for new users (Max 255 chars)."
@@ -4168,7 +4155,7 @@ msgstr "Ajuda"
 msgid "Help me!"
 msgstr "Ajuda'm"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Cerca"
 
@@ -4804,7 +4791,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr " de "
@@ -5082,20 +5069,42 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "No"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "Cap contingut!"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr "respondre a aquesta nota"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "Respon"
 
@@ -5242,6 +5251,10 @@ msgstr "Desbloquejar aquest usuari"
 msgid "Search site"
 msgstr "Cerca al lloc"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5273,7 +5286,7 @@ msgstr "Secció sense títol"
 
 #: lib/section.php:106
 msgid "More..."
-msgstr ""
+msgstr "Més…"
 
 #: lib/silenceform.php:67
 #, fuzzy
@@ -5374,22 +5387,20 @@ msgid "Unsubscribe"
 msgstr "Cancel·lar subscripció"
 
 #: lib/userprofile.php:116
-#, fuzzy
 msgid "Edit Avatar"
-msgstr "Avatar"
+msgstr "Edita l'avatar"
 
 #: lib/userprofile.php:236
 msgid "User actions"
 msgstr "Accions de l'usuari"
 
 #: lib/userprofile.php:248
-#, fuzzy
 msgid "Edit profile settings"
-msgstr "Configuració del perfil"
+msgstr "Edita la configuració del perfil"
 
 #: lib/userprofile.php:249
 msgid "Edit"
-msgstr ""
+msgstr "Edita"
 
 #: lib/userprofile.php:272
 msgid "Send a direct message to this user"
@@ -5444,9 +5455,9 @@ msgid "about a year ago"
 msgstr "fa un any"
 
 #: lib/webcolor.php:82
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not a valid color!"
-msgstr "La pàgina personal no és un URL vàlid."
+msgstr "%s no és un color vàlid!"
 
 #: lib/webcolor.php:123
 #, php-format
@@ -5468,3 +5479,6 @@ msgstr "Perdó, aquest no és el teu correu electrònic entrant permès."
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "Perdó, no hi ha un correu electrònic entrant permès."
+
+#~ msgid "same as password above"
+#~ msgstr "repeteix la contrasenya anterior"
diff --git a/locale/cs/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo
index 6d304f5fc..002137fa3 100644
Binary files a/locale/cs/LC_MESSAGES/statusnet.mo and b/locale/cs/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index b57286e37..2bcd8b0b7 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:33:23+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:13+0000\n"
 "Language-Team: Czech\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: out-statusnet\n"
@@ -557,7 +557,7 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr ""
 
@@ -790,7 +790,7 @@ msgstr ""
 msgid "Do not delete this notice"
 msgstr "Žádné takové oznámení."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr ""
 
@@ -2100,9 +2100,9 @@ msgstr "6 a více znaků"
 msgid "Confirm"
 msgstr "Heslo znovu"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "stejné jako heslo výše"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Stejné jako heslo výše"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2569,10 +2569,6 @@ msgstr ""
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 a více znaků, a nezapomeňte"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Stejné jako heslo výše"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Reset"
@@ -4082,7 +4078,7 @@ msgstr "Nápověda"
 msgid "Help me!"
 msgstr "Nápověda"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Hledat"
 
@@ -4726,7 +4722,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr " od "
@@ -4997,20 +4993,41 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "Žádný obsah!"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 #, fuzzy
 msgid "Reply"
 msgstr "odpověď"
@@ -5158,6 +5175,10 @@ msgstr "Žádný takový uživatel."
 msgid "Search site"
 msgstr "Hledat"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5386,3 +5407,6 @@ msgstr ""
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr ""
+
+#~ msgid "same as password above"
+#~ msgstr "stejné jako heslo výše"
diff --git a/locale/de/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo
index 22b23e78d..b5db933e6 100644
Binary files a/locale/de/LC_MESSAGES/statusnet.mo and b/locale/de/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index cc5cee24e..7cf7232c7 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:33:26+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:16+0000\n"
 "Language-Team: German\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: out-statusnet\n"
@@ -550,7 +550,7 @@ msgid "Preview"
 msgstr "Vorschau"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 #, fuzzy
 msgid "Delete"
 msgstr "Löschen"
@@ -787,7 +787,7 @@ msgstr "Sind sie sicher, dass sie diese Nachricht löschen wollen?"
 msgid "Do not delete this notice"
 msgstr "Die Nachricht konnte nicht gelöscht werden."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 #, fuzzy
 msgid "Delete this notice"
 msgstr "Notiz löschen"
@@ -2153,9 +2153,9 @@ msgstr "6 oder mehr Zeichen"
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "Gleiches Passwort wie oben"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Gleiches Passwort wie zuvor"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2628,10 +2628,6 @@ msgstr "Unbekannter Befehl"
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 oder mehr Zeichen, und nicht vergessen!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Gleiches Passwort wie zuvor"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Zurücksetzen"
@@ -4180,7 +4176,7 @@ msgstr "Hilfe"
 msgid "Help me!"
 msgstr "Hilf mir!"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Suchen"
 
@@ -4829,7 +4825,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr "von"
@@ -5110,21 +5106,43 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Nein"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "Kein Inhalt!"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Auf diese Nachricht antworten"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 #, fuzzy
 msgid "Reply"
 msgstr "Antworten"
@@ -5276,6 +5294,10 @@ msgstr "Benutzer freigeben"
 msgid "Search site"
 msgstr "Suchen"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5505,3 +5527,6 @@ msgstr "Sorry, das ist nicht deine Adresse für eingehende E-Mails."
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "Sorry, keinen eingehenden E-Mails gestattet."
+
+#~ msgid "same as password above"
+#~ msgstr "Gleiches Passwort wie oben"
diff --git a/locale/el/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo
index 235b409c3..35ab36dc5 100644
Binary files a/locale/el/LC_MESSAGES/statusnet.mo and b/locale/el/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index 61fecafba..ea4e5a5ea 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:33:28+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:18+0000\n"
 "Language-Team: Greek\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: el\n"
 "X-Message-Group: out-statusnet\n"
@@ -553,7 +553,7 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr ""
 
@@ -783,7 +783,7 @@ msgstr "Είσαι σίγουρος ότι θες να διαγράψεις αυ
 msgid "Do not delete this notice"
 msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr ""
 
@@ -2071,8 +2071,8 @@ msgstr "6 ή περισσότεροι χαρακτήρες"
 msgid "Confirm"
 msgstr "Επιβεβαίωση"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
 msgstr ""
 
 #: actions/passwordsettings.php:117
@@ -2533,10 +2533,6 @@ msgstr ""
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 ή περισσότεροι χαρακτήρες και μην το ξεχάσετε!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr ""
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr ""
@@ -4028,7 +4024,7 @@ msgstr "Βοήθεια"
 msgid "Help me!"
 msgstr "Βοήθεια"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr ""
 
@@ -4654,7 +4650,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr "από"
@@ -4920,19 +4916,40 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr ""
 
@@ -5075,6 +5092,10 @@ msgstr "Αδυναμία διαγραφής αυτού του μηνύματος
 msgid "Search site"
 msgstr ""
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 msgid "Search help"
 msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo
index e2aa165ab..470a3f757 100644
Binary files a/locale/en_GB/LC_MESSAGES/statusnet.mo and b/locale/en_GB/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 171874315..9fe2a32ef 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:33:31+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:21+0000\n"
 "Language-Team: British English\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: out-statusnet\n"
@@ -547,7 +547,7 @@ msgid "Preview"
 msgstr "Preview"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Delete"
 
@@ -775,7 +775,7 @@ msgstr "Are you sure you want to delete this notice?"
 msgid "Do not delete this notice"
 msgstr "Do not delete this notice"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr "Delete this notice"
 
@@ -2105,9 +2105,9 @@ msgstr "6 or more characters"
 msgid "Confirm"
 msgstr "Confirm"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Same as password above"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2573,10 +2573,6 @@ msgstr "Unknown action"
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 or more characters, and don't forget it!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Same as password above"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Reset"
@@ -4092,7 +4088,7 @@ msgstr "Help"
 msgid "Help me!"
 msgstr "Help me!"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Search"
 
@@ -4720,7 +4716,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr "from"
@@ -5002,19 +4998,41 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "No"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 msgid "in context"
 msgstr "in context"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr "Reply to this notice"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "Reply"
 
@@ -5157,6 +5175,10 @@ msgstr "Sandbox this user"
 msgid "Search site"
 msgstr "Search"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 msgid "Search help"
 msgstr "Search help"
@@ -5376,3 +5398,6 @@ msgstr "Sorry, that is not your incoming e-mail address."
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "Sorry, no incoming e-mail allowed."
+
+#~ msgid "same as password above"
+#~ msgstr "same as password above"
diff --git a/locale/es/LC_MESSAGES/statusnet.mo b/locale/es/LC_MESSAGES/statusnet.mo
index aef77f991..bfed5503c 100644
Binary files a/locale/es/LC_MESSAGES/statusnet.mo and b/locale/es/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 939823b62..d3c203b8d 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:33:34+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:23+0000\n"
 "Language-Team: Spanish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: out-statusnet\n"
@@ -560,7 +560,7 @@ msgid "Preview"
 msgstr "Vista previa"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Borrar"
 
@@ -794,7 +794,7 @@ msgstr "¿Estás seguro de que quieres eliminar este aviso?"
 msgid "Do not delete this notice"
 msgstr "No se puede eliminar este aviso."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr "Borrar este aviso"
 
@@ -2164,9 +2164,9 @@ msgstr "6 o más caracteres"
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "repita la contraseña anterior"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Igual a la contraseña de arriba"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2643,10 +2643,6 @@ msgstr "Acción desconocida"
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 o más caracteres, ¡no te olvides!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Igual a la contraseña de arriba"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Restablecer"
@@ -4206,7 +4202,7 @@ msgstr "Ayuda"
 msgid "Help me!"
 msgstr "Ayúdame!"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Buscar"
 
@@ -4845,7 +4841,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 msgid "from"
 msgstr "desde"
 
@@ -5124,19 +5120,41 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "No"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 msgid "in context"
 msgstr "en contexto"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr "Responder este aviso."
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "Responder"
 
@@ -5283,6 +5301,10 @@ msgstr "Desbloquear este usuario"
 msgid "Search site"
 msgstr "Buscar"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 msgid "Search help"
 msgstr "Buscar ayuda"
@@ -5510,3 +5532,6 @@ msgstr "Lo sentimos, pero este no es su dirección de correo entrante."
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "Lo sentimos, pero no se permite correos entrantes"
+
+#~ msgid "same as password above"
+#~ msgstr "repita la contraseña anterior"
diff --git a/locale/fi/LC_MESSAGES/statusnet.mo b/locale/fi/LC_MESSAGES/statusnet.mo
index dce4ae41d..2ee86ba29 100644
Binary files a/locale/fi/LC_MESSAGES/statusnet.mo and b/locale/fi/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 76a071266..23c6ece67 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:33:36+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:26+0000\n"
 "Language-Team: Finnish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: out-statusnet\n"
@@ -558,7 +558,7 @@ msgid "Preview"
 msgstr "Esikatselu"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Poista"
 
@@ -786,7 +786,7 @@ msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
 msgid "Do not delete this notice"
 msgstr "Älä poista tätä päivitystä"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr "Poista tämä päivitys"
 
@@ -2124,9 +2124,9 @@ msgstr "6 tai useampia merkkejä"
 msgid "Confirm"
 msgstr "Vahvista"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "sama salasana kuin yllä"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Sama kuin ylläoleva salasana"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2599,10 +2599,6 @@ msgstr "Tuntematon toiminto"
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 tai useampia merkkejä äläkä unohda mitä kirjoitit!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Sama kuin ylläoleva salasana"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Vaihda"
@@ -4142,7 +4138,7 @@ msgstr "Ohjeet"
 msgid "Help me!"
 msgstr "Auta minua!"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Haku"
 
@@ -4780,7 +4776,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr " lähteestä "
@@ -5062,20 +5058,42 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Ei"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "Ei sisältöä!"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr "Vastaa tähän päivitykseen"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "Vastaus"
 
@@ -5223,6 +5241,10 @@ msgstr "Poista esto tältä käyttäjältä"
 msgid "Search site"
 msgstr "Haku"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5449,3 +5471,6 @@ msgstr "Valitettavasti tuo ei ole oikea osoite sähköpostipäivityksille."
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "Valitettavasti päivitysten teko sähköpostilla ei ole sallittua."
+
+#~ msgid "same as password above"
+#~ msgstr "sama salasana kuin yllä"
diff --git a/locale/fr/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo
index 217bb2be9..79b159e13 100644
Binary files a/locale/fr/LC_MESSAGES/statusnet.mo and b/locale/fr/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 5952ebf83..1e2ba8c03 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:33:39+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:29+0000\n"
 "Language-Team: French\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: out-statusnet\n"
@@ -102,6 +102,9 @@ msgid ""
 "You can try to [nudge %s](../%s) from his profile or [post something to his "
 "or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
+"Vous pouvez essayer de [donner un coup de coude à %s](../%s) depuis son "
+"profil ou [poster quelque chose à son intention](%%%%action.newnotice%%%%?"
+"status_textarea=%s)."
 
 #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
@@ -109,6 +112,8 @@ msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to his or her attention."
 msgstr ""
+"Pourquoi ne pas [créer un compte](%%%%action.register%%%%) et ensuite "
+"envoyer un coup de coude à %s ou poster quelque chose à son intention."
 
 #: actions/all.php:165
 msgid "You and friends"
@@ -561,7 +566,7 @@ msgid "Preview"
 msgstr "Aperçu"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -790,7 +795,7 @@ msgstr "Êtes-vous sûr(e) de vouloir supprimer ce statut ?"
 msgid "Do not delete this notice"
 msgstr "Ne pas supprimer cet avis"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr "Supprimer ce statut"
 
@@ -1375,6 +1380,8 @@ msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
+"Personnalisez le style de votre groupe avec une image de fond et une palette "
+"de couleur de votre choix."
 
 #: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
 #: lib/designsettings.php:434 lib/designsettings.php:464
@@ -1510,6 +1517,12 @@ msgid ""
 "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
 "%%%%)"
 msgstr ""
+"Les groupes de %%%%site.name%%%% permettent de trouver et de parler avec des "
+"personnes qui ont le même intérêt. Après avoir rejoint un groupe vous pouvez "
+"envoyer des messages à tous les autres membres en utilisant la syntaxe « !"
+"nomdugroupe ». Vous ne voyez aucun groupe qui vous intéresse ? Essayer d'en "
+"[rechercher un](%%%%action.groupsearch%%%%) ou [commencez le votre !](%%%%"
+"action.newgroup%%%%)"
 
 #: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
 msgid "Create a new group"
@@ -2136,9 +2149,9 @@ msgstr "6 caractères ou plus"
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "identique au mot de passe ci-dessus"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Identique au mot de passe ci-dessus"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2617,10 +2630,6 @@ msgstr "Action inconnue"
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 caractères ou plus, et ne l’oubliez pas !"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Identique au mot de passe ci-dessus"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Réinitialiser"
@@ -2901,6 +2910,8 @@ msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
+"Vous pouvez vous engager dans une conversation avec d'autres personnes, vous "
+"abonner à plus de gens ou [joindre des groupes](%%action.groups%%)."
 
 #: actions/replies.php:205
 #, php-format
@@ -3233,17 +3244,14 @@ msgid "Snapshot frequency must be a number."
 msgstr "La fréquence des instantanés doit être un nombre."
 
 #: actions/siteadminpanel.php:199
-#, fuzzy
 msgid "You must set an SSL server when enabling SSL."
 msgstr "Vous devez définir un serveur SSL quand vous activez SSL."
 
 #: actions/siteadminpanel.php:204
-#, fuzzy
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "Serveur SSL invalide. La longueur maximale est de 255 caractères."
 
 #: actions/siteadminpanel.php:210
-#, fuzzy
 msgid "Minimum text limit is 140 characters."
 msgstr "La limite minimale de texte est de 140 caractères."
 
@@ -3280,9 +3288,8 @@ msgid "URL used for credits link in footer of each page"
 msgstr "URL utilisée pour le lien de crédits au bas de chaque page"
 
 #: actions/siteadminpanel.php:284
-#, fuzzy
 msgid "Contact email address for your site"
-msgstr "adresse de courriel de contact"
+msgstr "adresse de courriel de contact de votre site"
 
 #: actions/siteadminpanel.php:290
 msgid "Local"
@@ -3377,9 +3384,8 @@ msgid "Frequency"
 msgstr "Fréquence"
 
 #: actions/siteadminpanel.php:367
-#, fuzzy
 msgid "Snapshots will be sent once every N web hits"
-msgstr "Les instantanés seront envoyés une fois tous les N hits"
+msgstr "Les instantanés seront envoyés une fois tous les N requêtes"
 
 #: actions/siteadminpanel.php:372
 msgid "Report URL"
@@ -4176,7 +4182,7 @@ msgstr "Aide"
 msgid "Help me!"
 msgstr "À l’aide !"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Rechercher"
 
@@ -4844,7 +4850,7 @@ msgstr ""
 "pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent "
 "vous envoyer des messages destinés à vous seul(e)."
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 msgid "from"
 msgstr "de"
 
@@ -5195,19 +5201,41 @@ msgstr "Attacher"
 msgid "Attach a file"
 msgstr "Attacher un fichier"
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Non"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr "chez"
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 msgid "in context"
 msgstr "dans le contexte"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr "Répondre à ce statut"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "Répondre"
 
@@ -5348,6 +5376,10 @@ msgstr "Mettre cet utilisateur dans un bac à sable"
 msgid "Search site"
 msgstr "Rechercher sur le site"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 msgid "Search help"
 msgstr "Aide sur la recherche"
@@ -5406,12 +5438,12 @@ msgstr "Groupes de %s"
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
-msgstr ""
+msgstr "Nuage de mots clefs des personnes tel que définis par eux-même"
 
 #: lib/subscriberspeopletagcloudsection.php:48
 #: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
-msgstr ""
+msgstr "Nuage de mots clefs des personnes"
 
 #: lib/subscriptionlist.php:126
 msgid "(none)"
@@ -5567,3 +5599,6 @@ msgstr "Désolé, ceci n’est pas votre adresse de courriel entrant."
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "Désolé, la réception de courriels n’est pas permise."
+
+#~ msgid "same as password above"
+#~ msgstr "identique au mot de passe ci-dessus"
diff --git a/locale/ga/LC_MESSAGES/statusnet.mo b/locale/ga/LC_MESSAGES/statusnet.mo
index e15ba08bb..b717d86ba 100644
Binary files a/locale/ga/LC_MESSAGES/statusnet.mo and b/locale/ga/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 8be70754c..f129e54b7 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:33:42+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:32+0000\n"
 "Language-Team: Irish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ga\n"
 "X-Message-Group: out-statusnet\n"
@@ -562,7 +562,7 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 #, fuzzy
 msgid "Delete"
 msgstr "eliminar"
@@ -802,7 +802,7 @@ msgstr "Estas seguro que queres eliminar este chío?"
 msgid "Do not delete this notice"
 msgstr "Non se pode eliminar este chíos."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 #, fuzzy
 msgid "Delete this notice"
 msgstr "Eliminar chío"
@@ -2163,9 +2163,9 @@ msgstr "6 ou máis caracteres"
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "igual á contrasinal de enriba"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Igual que a contrasinal de enriba"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2645,10 +2645,6 @@ msgstr "Acción descoñecida"
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 ou máis caracteres, non o esquenzas!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Igual que a contrasinal de enriba"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Restaurar"
@@ -4219,7 +4215,7 @@ msgstr "Axuda"
 msgid "Help me!"
 msgstr "Axuda"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Buscar"
 
@@ -4902,7 +4898,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr " dende "
@@ -5229,21 +5225,43 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "No"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "Sen contido!"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Non se pode eliminar este chíos."
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 #, fuzzy
 msgid "Reply"
 msgstr "contestar"
@@ -5398,6 +5416,10 @@ msgstr "Bloquear usuario"
 msgid "Search site"
 msgstr "Buscar"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5631,3 +5653,6 @@ msgstr "Ise é un enderezo IM incorrecto."
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "Aivá, non se permiten correos entrantes."
+
+#~ msgid "same as password above"
+#~ msgstr "igual á contrasinal de enriba"
diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo
index 4352635a5..103b777e3 100644
Binary files a/locale/he/LC_MESSAGES/statusnet.mo and b/locale/he/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index 462fa34b9..6bd4fb607 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:33:45+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:34+0000\n"
 "Language-Team: Hebrew\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: out-statusnet\n"
@@ -557,7 +557,7 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 #, fuzzy
 msgid "Delete"
 msgstr "מחק"
@@ -791,7 +791,7 @@ msgstr ""
 msgid "Do not delete this notice"
 msgstr "אין הודעה כזו."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr ""
 
@@ -2104,8 +2104,8 @@ msgstr "לפחות 6 אותיות"
 msgid "Confirm"
 msgstr "אשר"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
 msgstr "זהה לסיסמה למעלה"
 
 #: actions/passwordsettings.php:117
@@ -2571,10 +2571,6 @@ msgstr ""
 msgid "6 or more characters, and don't forget it!"
 msgstr "לפחות 6 אותיות, אל תשכח!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "זהה לסיסמה למעלה"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "איפוס"
@@ -4077,7 +4073,7 @@ msgstr "עזרה"
 msgid "Help me!"
 msgstr "עזרה"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "חיפוש"
 
@@ -4720,7 +4716,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 msgid "from"
 msgstr ""
 
@@ -4989,20 +4985,42 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "לא"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "אין תוכן!"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 #, fuzzy
 msgid "Reply"
 msgstr "הגב"
@@ -5151,6 +5169,10 @@ msgstr "אין משתמש כזה."
 msgid "Search site"
 msgstr "חיפוש"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5381,3 +5403,6 @@ msgstr ""
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr ""
+
+#~ msgid "same as password above"
+#~ msgstr "זהה לסיסמה למעלה"
diff --git a/locale/is/LC_MESSAGES/statusnet.mo b/locale/is/LC_MESSAGES/statusnet.mo
index cc9e34a03..7f678a65d 100644
Binary files a/locale/is/LC_MESSAGES/statusnet.mo and b/locale/is/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 5a9d389ce..697ee9bce 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:33:47+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:37+0000\n"
 "Language-Team: Icelandic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: is\n"
 "X-Message-Group: out-statusnet\n"
@@ -553,7 +553,7 @@ msgid "Preview"
 msgstr "Forsýn"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Eyða"
 
@@ -780,7 +780,7 @@ msgstr "Ertu viss um að þú viljir eyða þessu babli?"
 msgid "Do not delete this notice"
 msgstr ""
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr "Eyða þessu babli"
 
@@ -2107,9 +2107,9 @@ msgstr "6 eða fleiri tákn"
 msgid "Confirm"
 msgstr "Staðfesta"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "sama og lykilorðið hér fyrir ofan"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Sama og lykilorðið hér fyrir ofan"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2578,10 +2578,6 @@ msgstr "Óþekkt aðgerð"
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 eða fleiri tákn og ekki gleyma því!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Sama og lykilorðið hér fyrir ofan"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Endurstilla"
@@ -4100,7 +4096,7 @@ msgstr "Hjálp"
 msgid "Help me!"
 msgstr "Hjálp!"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Leita"
 
@@ -4732,7 +4728,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr "frá"
@@ -5005,19 +5001,41 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Nei"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr "Svara þessu babli"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "Svara"
 
@@ -5163,6 +5181,10 @@ msgstr "Opna á þennan notanda"
 msgid "Search site"
 msgstr ""
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 msgid "Search help"
 msgstr ""
@@ -5386,3 +5408,6 @@ msgstr "Afsakið en þetta er ekki móttökutölvupóstfangið þitt."
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "Því miður er móttökutölvupóstur ekki leyfður."
+
+#~ msgid "same as password above"
+#~ msgstr "sama og lykilorðið hér fyrir ofan"
diff --git a/locale/it/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo
index 4106396e3..ea44468ea 100644
Binary files a/locale/it/LC_MESSAGES/statusnet.mo and b/locale/it/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index f5e662b6a..5f452dc11 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:33:50+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:40+0000\n"
 "Language-Team: Italian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: out-statusnet\n"
@@ -561,7 +561,7 @@ msgid "Preview"
 msgstr "Anteprima"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Elimina"
 
@@ -794,7 +794,7 @@ msgstr "Sei sicuro di voler eliminare questo messaggio?"
 msgid "Do not delete this notice"
 msgstr "Impossibile eliminare questo messaggio."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr "Elimina questo messaggio"
 
@@ -2151,9 +2151,9 @@ msgstr "6 o più caratteri"
 msgid "Confirm"
 msgstr "Conferma"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "stessa password di sopra"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Stessa password di sopra"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2625,10 +2625,6 @@ msgstr "Azione sconosciuta"
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 o più caratteri, e non dimenticarla!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Stessa password di sopra"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Reimposta"
@@ -4167,7 +4163,7 @@ msgstr "Aiuto"
 msgid "Help me!"
 msgstr "Aiutami!"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Ricerca"
 
@@ -4803,7 +4799,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr " via "
@@ -5081,20 +5077,42 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "No"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "Nessun contenuto!"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr "Rispondi a questo messaggio"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "Rispondi"
 
@@ -5242,6 +5260,10 @@ msgstr "Sblocca questo utente"
 msgid "Search site"
 msgstr "Ricerca"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5468,3 +5490,6 @@ msgstr "Quella non è la tua email di ricezione."
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "Email di ricezione non consentita."
+
+#~ msgid "same as password above"
+#~ msgstr "stessa password di sopra"
diff --git a/locale/ja/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo
index 0aed70cbc..0d6e8ea01 100644
Binary files a/locale/ja/LC_MESSAGES/statusnet.mo and b/locale/ja/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 9c5f7da38..d08b38840 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:33:53+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:42+0000\n"
 "Language-Team: Japanese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: out-statusnet\n"
@@ -560,7 +560,7 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr "削除"
 
@@ -791,7 +791,7 @@ msgstr "本当にこの通知を削除しますか？"
 msgid "Do not delete this notice"
 msgstr "この通知を削除できません。"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr "この通知を削除"
 
@@ -2128,9 +2128,9 @@ msgstr "6文字以上"
 msgid "Confirm"
 msgstr "確認"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "上のパスワードと同じ"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "上と同じパスワード"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2596,10 +2596,6 @@ msgstr ""
 msgid "6 or more characters, and don't forget it!"
 msgstr "6文字以上。忘れないでください！"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "上と同じパスワード"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "リセット"
@@ -4112,7 +4108,7 @@ msgstr "ヘルプ"
 msgid "Help me!"
 msgstr "助けて！"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "検索"
 
@@ -4747,7 +4743,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 msgid "from"
 msgstr "から "
 
@@ -5015,20 +5011,41 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "コンテンツがありません！"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr "この通知へ返信"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "返信"
 
@@ -5174,6 +5191,10 @@ msgstr "このユーザをアンブロックする"
 msgid "Search site"
 msgstr "検索"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5401,3 +5422,6 @@ msgstr ""
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr ""
+
+#~ msgid "same as password above"
+#~ msgstr "上のパスワードと同じ"
diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo
index d89060247..53df85ed5 100644
Binary files a/locale/ko/LC_MESSAGES/statusnet.mo and b/locale/ko/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index e2fdfd1ad..0d1e62868 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:33:55+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:45+0000\n"
 "Language-Team: Korean\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: out-statusnet\n"
@@ -560,7 +560,7 @@ msgid "Preview"
 msgstr "미리보기"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr "삭제"
 
@@ -792,7 +792,7 @@ msgstr "정말로 통지를 삭제하시겠습니까?"
 msgid "Do not delete this notice"
 msgstr "이 통지를 지울 수 없습니다."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr "이 게시글 삭제하기"
 
@@ -2129,9 +2129,9 @@ msgstr "6글자 이상"
 msgid "Confirm"
 msgstr "인증"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "위 비밀번호와 동일하게"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "위와 같은 비밀 번호"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2598,10 +2598,6 @@ msgstr "알려지지 않은 행동"
 msgid "6 or more characters, and don't forget it!"
 msgstr "6글자 이상, 잊어 버리지 마십시오!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "위와 같은 비밀 번호"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "초기화"
@@ -4129,7 +4125,7 @@ msgstr "도움말"
 msgid "Help me!"
 msgstr "도움이 필요해!"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "검색"
 
@@ -4762,7 +4758,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr "다음에서:"
@@ -5032,20 +5028,42 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "아니오"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "내용이 없습니다!"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr "이 게시글에 대해 답장하기"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "답장하기"
 
@@ -5193,6 +5211,10 @@ msgstr "이 사용자를 차단해제합니다."
 msgid "Search site"
 msgstr "검색"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5419,3 +5441,6 @@ msgstr "죄송합니다. 귀하의 이메일이 아닙니다."
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "죄송합니다. 이메일이 허용되지 않습니다."
+
+#~ msgid "same as password above"
+#~ msgstr "위 비밀번호와 동일하게"
diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo
index 13205c040..52e83a6fa 100644
Binary files a/locale/mk/LC_MESSAGES/statusnet.mo and b/locale/mk/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index c5fae421f..d6e49ea28 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:33:58+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:48+0000\n"
 "Language-Team: Macedonian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: out-statusnet\n"
@@ -558,7 +558,7 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr ""
 
@@ -790,7 +790,7 @@ msgstr ""
 msgid "Do not delete this notice"
 msgstr "Нема такво известување."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr ""
 
@@ -2103,9 +2103,9 @@ msgstr "6 или повеќе знаци"
 msgid "Confirm"
 msgstr "Потврди"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "исто како лозинката погоре"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Исто како лозинката погоре"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2574,10 +2574,6 @@ msgstr ""
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 или повеќе знаци и не ја заборавајте!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Исто како лозинката погоре"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Ресетирај"
@@ -4087,7 +4083,7 @@ msgstr "Помош"
 msgid "Help me!"
 msgstr "Помош"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Барај"
 
@@ -4731,7 +4727,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 msgid "from"
 msgstr ""
 
@@ -5001,20 +4997,41 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "Нема содржина!"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 #, fuzzy
 msgid "Reply"
 msgstr "одговор"
@@ -5161,6 +5178,10 @@ msgstr "Нема таков корисник."
 msgid "Search site"
 msgstr "Барај"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5389,3 +5410,6 @@ msgstr ""
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr ""
+
+#~ msgid "same as password above"
+#~ msgstr "исто како лозинката погоре"
diff --git a/locale/nb/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo
index d64421eb1..f579735c5 100644
Binary files a/locale/nb/LC_MESSAGES/statusnet.mo and b/locale/nb/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 895e30967..9db664531 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:34:01+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:50+0000\n"
 "Language-Team: Norwegian (bokmål)‬\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: out-statusnet\n"
@@ -555,7 +555,7 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 #, fuzzy
 msgid "Delete"
 msgstr "slett"
@@ -785,7 +785,7 @@ msgstr "Er du sikker på at du vil slette denne notisen?"
 msgid "Do not delete this notice"
 msgstr "Kan ikke slette notisen."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr ""
 
@@ -2090,8 +2090,8 @@ msgstr "6 eller flere tegn"
 msgid "Confirm"
 msgstr "Bekreft"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
 msgstr ""
 
 #: actions/passwordsettings.php:117
@@ -2550,10 +2550,6 @@ msgstr ""
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 eller flere tegn. Og ikke glem det!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr ""
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Nullstill"
@@ -4043,7 +4039,7 @@ msgstr "Hjelp"
 msgid "Help me!"
 msgstr "Hjelp"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Søk"
 
@@ -4674,7 +4670,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr "fra"
@@ -4943,19 +4939,40 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 #, fuzzy
 msgid "Reply"
 msgstr "svar"
@@ -5102,6 +5119,10 @@ msgstr "Kan ikke slette notisen."
 msgid "Search site"
 msgstr "Søk"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
diff --git a/locale/nl/LC_MESSAGES/statusnet.mo b/locale/nl/LC_MESSAGES/statusnet.mo
index dca22063e..e37941812 100644
Binary files a/locale/nl/LC_MESSAGES/statusnet.mo and b/locale/nl/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 20703ca3a..a2609cb48 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:34:07+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:56+0000\n"
 "Language-Team: Dutch\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: out-statusnet\n"
@@ -357,7 +357,7 @@ msgstr "Locatie is te lang (maximaal 255 tekens)."
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
-msgstr "Te veel aliasen! Het maximale aantal is %d."
+msgstr "Te veel aliassen! Het maximale aantal is %d."
 
 #: actions/apigroupcreate.php:264 actions/editgroup.php:224
 #: actions/newgroup.php:168
@@ -566,7 +566,7 @@ msgid "Preview"
 msgstr "Voorvertoning"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -796,7 +796,7 @@ msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?"
 msgid "Do not delete this notice"
 msgstr "Deze mededeling niet verwijderen"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr "Deze mededeling verwijderen"
 
@@ -1056,8 +1056,8 @@ msgstr "Stuur een email naar dit adres om een nieuw bericht te posten"
 #: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
-"Een nieuw e-mailadres instellen voor het onvangen van e-mail; verwijdert het "
-"eerder geinstelde e-mailadres."
+"Een nieuw e-mailadres instellen voor het ontvangen van e-mail. Hier wordt "
+"het het eerder ingestelde e-mailadres verwijderd."
 
 #: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
@@ -1074,24 +1074,23 @@ msgstr "Mij e-mailen bij nieuwe abonnementen."
 
 #: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
-msgstr "Mij een e-mail sturen als iemand mijn mededeling als favoriet instelt."
+msgstr "Mij e-mailen als iemand mijn mededeling als favoriet instelt."
 
 #: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
-msgstr "Mij een e-mail sturen als iemand mij een privébericht zendt."
+msgstr "Mij e-mailen als iemand mij een privébericht zendt."
 
 #: actions/emailsettings.php:174
 msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr ""
-"Mij een e-mail sturen als iemand mij een antwoord met \"@\" erin stuurt."
+msgstr "Mij e-mailen als iemand mij een antwoord met \"@\" erin stuurt."
 
 #: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
-msgstr "Vrienden toestaan me te porren en te e-mailen."
+msgstr "Vrienden mogen me porren en e-mailen."
 
 #: actions/emailsettings.php:185
 msgid "I want to post notices by email."
-msgstr "Ik wil mededelingen per e-mail versturen."
+msgstr "Ik wil mededelingen per e-mail plaatsen."
 
 #: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
@@ -1559,8 +1558,8 @@ msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
-"U kunt berichten verzenden en ontvangen via Jabber/GTalk [\"instant messages"
-"\"](%%doc.im%%). Maak hieronder uw instellingen."
+"U kunt berichten verzenden en ontvangen via Jabber/GTalk [\"onmiddellijke "
+"berichten\"](%%doc.im%%). Maak hieronder uw instellingen."
 
 #: actions/imsettings.php:89
 msgid "IM is not available."
@@ -1595,16 +1594,16 @@ msgstr ""
 
 #: actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
-msgstr "Stuur mij berichten via Jabber/GTalk."
+msgstr "Mij berichten sturen via Jabber/GTalk."
 
 #: actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Mededeling versturen als mijn Jabber/GTalk-status wijzigt."
+msgstr "Een mededeling versturen als mijn Jabber/GTalk-status wijzigt."
 
 #: actions/imsettings.php:153
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
-"Stuur me antwoorden via Jabber/GTalk van gebruiker op wie ik niet "
+"Mij antwoorden sturen via Jabber/GTalk van gebruikers op wie ik niet "
 "geabonneerd ben."
 
 #: actions/imsettings.php:159
@@ -2094,7 +2093,7 @@ msgstr "Te gebruiken automatische verkortingsdienst."
 
 #: actions/othersettings.php:122
 msgid "View profile designs"
-msgstr "Profielontwerpen bekijken"
+msgstr "Profielontwerpen gebruiken"
 
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
@@ -2147,9 +2146,9 @@ msgstr "Zes of meer tekens"
 msgid "Confirm"
 msgstr "Bevestigen"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "gelijk aan wachtwoord hierboven"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Gelijk aan het wachtwoord hierboven"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2506,9 +2505,8 @@ msgid ""
 msgstr ""
 "Dit is %%site.name%%, een [microblogdienst](http://en.wikipedia.org/wiki/"
 "Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://status."
-"net/). [Registreer nu](%%%%action.register%%%%) om mededelingen over uzelf "
-"te delen met vrienden, familie en collega's! [Meer lezen...](%%%%doc.help%%%"
-"%)"
+"net/). [Registreer nu](%%action.register%%) om mededelingen over uzelf te "
+"delen met vrienden, familie en collega's! [Meer lezen...](%%doc.help%%)"
 
 #: actions/public.php:238
 #, php-format
@@ -2546,8 +2544,8 @@ msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 "one!"
 msgstr ""
-"U kunt een [gebruiker registeren](%%%%action.register%%%%) en dan de eerste "
-"zijn die er een plaatst!"
+"U kunt een [gebruiker registeren](%%action.register%%) en dan de eerste zijn "
+"die er een plaatst!"
 
 #: actions/publictagcloud.php:135
 msgid "Tag cloud"
@@ -2632,10 +2630,6 @@ msgstr "Onbekende handeling"
 msgid "6 or more characters, and don't forget it!"
 msgstr "Zes of meer tekens, en vergeet uw wachtwoord niet!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Gelijk aan het wachtwoord hierboven"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Herstellen"
@@ -3024,7 +3018,7 @@ msgstr "Opmerking"
 
 #: actions/showgroup.php:284 lib/groupeditform.php:184
 msgid "Aliases"
-msgstr "Aliasen"
+msgstr "Aliassen"
 
 #: actions/showgroup.php:293
 msgid "Group actions"
@@ -3081,7 +3075,7 @@ msgid ""
 "their life and interests. [Join now](%%%%action.register%%%%) to become part "
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"**%s** is een gebruikersgroep bij %%site.name%%, een [microblogdienst]"
+"**%s** is een gebruikersgroep bij %%%%site.name%%%%, een [microblogdienst]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software "
 "[StatusNet](http://status.net/). De groepsleden wisselen korte berichten uit "
 "over hun leven en interesses. [Registreer nu](%%%%action.register%%%%) om "
@@ -3193,10 +3187,11 @@ msgid ""
 "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"**%s** is actief op %%site.name%%, een [microblogdienst](http://en.wikipedia."
-"org/wiki/Micro-blogging) gebaseerd op de Vrije Software [StatusNet](http://"
-"status.net/). [Registreer nu](%%%%action.register%%%%) om te abonneren op de "
-"mededelingen van **%s** en nog veel meer! [Meer lezen...](%%%%doc.help%%%%)"
+"**%s** is actief op %%%%site.name%%%%, een [microblogdienst](http://en."
+"wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software [StatusNet]"
+"(http://status.net/). [Registreer nu](%%%%action.register%%%%) om te "
+"abonneren op de mededelingen van **%s** en nog veel meer! [Meer lezen...](%%%"
+"%doc.help%%%%)"
 
 #: actions/showstream.php:239
 #, php-format
@@ -3248,17 +3243,14 @@ msgid "Snapshot frequency must be a number."
 msgstr "De snapshotfrequentie moet een getal zijn."
 
 #: actions/siteadminpanel.php:199
-#, fuzzy
 msgid "You must set an SSL server when enabling SSL."
 msgstr "U moet een SSL-server instellen als u SSL wilt inschakelen."
 
 #: actions/siteadminpanel.php:204
-#, fuzzy
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "De SSL-server is ongeldig. De maximale lengte is 255 tekens."
 
 #: actions/siteadminpanel.php:210
-#, fuzzy
 msgid "Minimum text limit is 140 characters."
 msgstr "De minimale tekstlimiet is 140 tekens."
 
@@ -3299,7 +3291,6 @@ msgstr ""
 "voettekst van iedere pagina"
 
 #: actions/siteadminpanel.php:284
-#, fuzzy
 msgid "Contact email address for your site"
 msgstr "E-mailadres om contact op te nemen met de websitebeheerder"
 
@@ -3397,7 +3388,6 @@ msgid "Frequency"
 msgstr "Frequentie"
 
 #: actions/siteadminpanel.php:367
-#, fuzzy
 msgid "Snapshots will be sent once every N web hits"
 msgstr "Iedere zoveel websitehits wordt een snapshot verzonden"
 
@@ -3494,7 +3484,7 @@ msgstr "Voer de code in die u via uw telefoon hebt ontvangen."
 
 #: actions/smssettings.php:138
 msgid "SMS Phone number"
-msgstr "SMS-telefoonnummer"
+msgstr "SMS-nummer"
 
 #: actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
@@ -3505,8 +3495,8 @@ msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
-"Stuur me mededelingen via SMS. Ik begrijp dat dit exorbitante rekeningen van "
-"mijn provider kan opleveren."
+"Mij mededelingen via SMS sturen. Ik begrijp dat dit exorbitante rekeningen "
+"van mijn provider kan opleveren."
 
 #: actions/smssettings.php:306
 msgid "No phone number."
@@ -3720,7 +3710,7 @@ msgstr ""
 #: actions/tag.php:68
 #, php-format
 msgid "Notices tagged with %s, page %d"
-msgstr "Kennisgevingen met het label %s, pagina %d"
+msgstr "Mededelingen met het label %s, pagina %d"
 
 #: actions/tag.php:86
 #, php-format
@@ -4053,7 +4043,7 @@ msgstr ""
 #: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
 msgstr ""
-"Er was een probleem bij het opslaan vna de kennisgeving. De gebruiker is "
+"Er was een probleem bij het opslaan van de mededeling. De gebruiker is "
 "onbekend."
 
 #: classes/Notice.php:188
@@ -4142,7 +4132,7 @@ msgstr "Primaire sitenavigatie"
 
 #: lib/action.php:431
 msgid "Home"
-msgstr "Thuis"
+msgstr "Thuispagina"
 
 #: lib/action.php:431
 msgid "Personal profile and friends timeline"
@@ -4201,7 +4191,7 @@ msgstr "Help"
 msgid "Help me!"
 msgstr "Help me!"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Zoeken"
 
@@ -4211,7 +4201,7 @@ msgstr "Naar gebruikers of tekst zoeken"
 
 #: lib/action.php:485
 msgid "Site notice"
-msgstr "Kennisgeving van site"
+msgstr "Mededeling van de website"
 
 #: lib/action.php:551
 msgid "Local views"
@@ -4219,7 +4209,7 @@ msgstr "Lokale weergaven"
 
 #: lib/action.php:617
 msgid "Page notice"
-msgstr "Kennisgeving van pagina"
+msgstr "Mededeling van de pagina"
 
 #: lib/action.php:719
 msgid "Secondary site navigation"
@@ -4231,11 +4221,11 @@ msgstr "Over"
 
 #: lib/action.php:728
 msgid "FAQ"
-msgstr "Veelgestelde vragen"
+msgstr "Veel gestelde vragen"
 
 #: lib/action.php:732
 msgid "TOS"
-msgstr "TOS"
+msgstr "Gebruiksvoorwaarden"
 
 #: lib/action.php:735
 msgid "Privacy"
@@ -4243,7 +4233,7 @@ msgstr "Privacy"
 
 #: lib/action.php:737
 msgid "Source"
-msgstr "Bron"
+msgstr "Broncode"
 
 #: lib/action.php:739
 msgid "Contact"
@@ -4251,7 +4241,7 @@ msgstr "Contact"
 
 #: lib/action.php:741
 msgid "Badge"
-msgstr "Naamplaatje"
+msgstr "Widget"
 
 #: lib/action.php:769
 msgid "StatusNet software license"
@@ -4300,11 +4290,11 @@ msgstr "Paginering"
 
 #: lib/action.php:1077
 msgid "After"
-msgstr "Na"
+msgstr "Later"
 
 #: lib/action.php:1085
 msgid "Before"
-msgstr "Voor"
+msgstr "Eerder"
 
 #: lib/action.php:1133
 msgid "There was a problem with your session token."
@@ -4674,11 +4664,11 @@ msgstr "Het standaardontwerp is weer ingesteld."
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
-msgstr "Mededeling uit favorieten verwijderen"
+msgstr "Uit de favorietenlijst verwijderen"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
-msgstr "Deze kennisgeving op de favorietenlijst plaatsen"
+msgstr "Op de favorietenlijst plaatsen"
 
 #: lib/favorform.php:140
 msgid "Favor"
@@ -4686,7 +4676,7 @@ msgstr "Aan favorieten toevoegen"
 
 #: lib/feedlist.php:64
 msgid "Export data"
-msgstr "Gegevens exporteren"
+msgstr "Feeds"
 
 #: lib/feed.php:85
 msgid "RSS 1.0"
@@ -4868,7 +4858,7 @@ msgstr ""
 "U hebt geen privéberichten. U kunt privéberichten verzenden aan andere "
 "gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen."
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 msgid "from"
 msgstr "van"
 
@@ -5222,19 +5212,41 @@ msgstr "Toevoegen"
 msgid "Attach a file"
 msgstr "Bestand toevoegen"
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Nee"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr "op"
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 msgid "in context"
 msgstr "in context"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr "Op deze mededeling antwoorden"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "Antwoorden"
 
@@ -5265,7 +5277,7 @@ msgstr ""
 
 #: lib/oauthstore.php:345
 msgid "Duplicate notice"
-msgstr "Kennisgeving van duplicaat"
+msgstr "Duplicaatmelding"
 
 #: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
@@ -5376,6 +5388,10 @@ msgstr "Deze gebruiker in de zandbak plaatsen"
 msgid "Search site"
 msgstr "Site doorzoeken"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 msgid "Search help"
 msgstr "Hulp bij zoeken"
@@ -5434,12 +5450,12 @@ msgstr "Groepen waar %s lid van is"
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
-msgstr ""
+msgstr "Gebruikerslabelwolk als zelf gelabeld"
 
 #: lib/subscriberspeopletagcloudsection.php:48
 #: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
-msgstr ""
+msgstr "Gebruikerslabelwolk"
 
 #: lib/subscriptionlist.php:126
 msgid "(none)"
@@ -5594,3 +5610,6 @@ msgstr "Dit is niet uw inkomende e-mailadres."
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "Inkomende e-mail is niet toegestaan."
+
+#~ msgid "same as password above"
+#~ msgstr "gelijk aan wachtwoord hierboven"
diff --git a/locale/nn/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo
index be7f8c8c8..bb236f7e6 100644
Binary files a/locale/nn/LC_MESSAGES/statusnet.mo and b/locale/nn/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 4c94fc0e8..82e24bb4f 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:34:03+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:53+0000\n"
 "Language-Team: Norwegian Nynorsk\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nn\n"
 "X-Message-Group: out-statusnet\n"
@@ -558,7 +558,7 @@ msgid "Preview"
 msgstr "Forhandsvis"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Slett"
 
@@ -791,7 +791,7 @@ msgstr "Sikker på at du vil sletta notisen?"
 msgid "Do not delete this notice"
 msgstr "Kan ikkje sletta notisen."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr "Slett denne notisen"
 
@@ -2134,9 +2134,9 @@ msgstr "6 eller fleire teikn"
 msgid "Confirm"
 msgstr "Godta"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "same passord som ovanfor"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Samme passord som over"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2607,10 +2607,6 @@ msgstr "Uventa handling."
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 eller fleire teikn, og ikkje gløym dei."
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Samme passord som over"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Avbryt"
@@ -4146,7 +4142,7 @@ msgstr "Hjelp"
 msgid "Help me!"
 msgstr "Hjelp meg!"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Søk"
 
@@ -4782,7 +4778,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr " frå "
@@ -5059,20 +5055,42 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Nei"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "Ingen innhald."
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr "Svar på denne notisen"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "Svar"
 
@@ -5220,6 +5238,10 @@ msgstr "Lås opp brukaren"
 msgid "Search site"
 msgstr "Søk"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5446,3 +5468,6 @@ msgstr "Beklager, det er ikkje di inngåande epost addresse."
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "Beklager, inngåande epost er ikkje tillatt."
+
+#~ msgid "same as password above"
+#~ msgstr "same passord som ovanfor"
diff --git a/locale/pl/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo
index 3e687d817..66cd9338e 100644
Binary files a/locale/pl/LC_MESSAGES/statusnet.mo and b/locale/pl/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 6e42426fb..9a062980c 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:34:10+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:40:58+0000\n"
 "Language-Team: Polish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: out-statusnet\n"
@@ -565,7 +565,7 @@ msgid "Preview"
 msgstr "Podgląd"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Usuń"
 
@@ -795,7 +795,7 @@ msgstr "Jesteś pewien, że chcesz usunąć ten wpis?"
 msgid "Do not delete this notice"
 msgstr "Nie usuwaj tego wpisu"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr "Usuń ten wpis"
 
@@ -2145,9 +2145,9 @@ msgstr "6 lub więcej znaków"
 msgid "Confirm"
 msgstr "Potwierdź"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "takie samo jak hasło powyżej"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Takie samo jak powyższe hasło"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2631,10 +2631,6 @@ msgstr "Nieznane działanie"
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 lub więcej znaków, i nie zapomnij go!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Takie samo jak powyższe hasło"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Przywróć"
@@ -4215,7 +4211,7 @@ msgstr "Pomoc"
 msgid "Help me!"
 msgstr "Pomóż mi!"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Znajdź"
 
@@ -4884,7 +4880,7 @@ msgstr ""
 "rozmowę z innymi użytkownikami. Inni mogą wysyłać Ci wiadomości tylko dla "
 "Twoich oczu."
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr " z "
@@ -5222,19 +5218,41 @@ msgstr "Załącz"
 msgid "Attach a file"
 msgstr "Załącz plik"
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Nie"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 msgid "in context"
 msgstr "w rozmowie"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr "Odpowiedz na ten wpis"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "Odpowiedz"
 
@@ -5380,6 +5398,10 @@ msgstr "Odblokuj tego użytkownika"
 msgid "Search site"
 msgstr "Znajdź stronę"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 msgid "Search help"
 msgstr "Znajdź w pomocy"
@@ -5605,3 +5627,6 @@ msgstr "Przepraszamy, to nie jest twój przychodzący adres e-mail."
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "Przepraszamy, przychodzący e-mail nie jest dozwolony."
+
+#~ msgid "same as password above"
+#~ msgstr "takie samo jak hasło powyżej"
diff --git a/locale/pt/LC_MESSAGES/statusnet.mo b/locale/pt/LC_MESSAGES/statusnet.mo
index 5e9bcd32f..516eec1d0 100644
Binary files a/locale/pt/LC_MESSAGES/statusnet.mo and b/locale/pt/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 07a90fc79..5c18e0d09 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
 # Translation of StatusNet to Portuguese
 #
+# Author@translatewiki.net: Hamilton Abreu
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -7,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:34:13+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:41:01+0000\n"
 "Language-Team: Portuguese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: out-statusnet\n"
@@ -275,27 +276,25 @@ msgid "Could not follow user: %s is already on your list."
 msgstr "Não foi possível seguir utilizador: %s já está na sua lista."
 
 #: actions/apifriendshipsdestroy.php:109
-#, fuzzy
 msgid "Could not unfollow user: User not found."
-msgstr "Não foi possível seguir utilizador: Utilizador não encontrado."
+msgstr ""
+"Não foi possível deixar de seguir utilizador: Utilizador não encontrado."
 
 #: actions/apifriendshipsdestroy.php:120
 msgid "You cannot unfollow yourself!"
-msgstr ""
+msgstr "Não pode deixar de seguir-se a si próprio!"
 
 #: actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
 #: actions/apifriendshipsshow.php:135
-#, fuzzy
 msgid "Could not determine source user."
-msgstr "Não foi possível actualizar o utilizador."
+msgstr "Não foi possível determinar o utilizador de origem."
 
 #: actions/apifriendshipsshow.php:143
-#, fuzzy
 msgid "Could not find target user."
-msgstr "Não foi possivel encontrar algum estado."
+msgstr "Não foi possível encontrar o utilizador de destino."
 
 #: actions/apigroupcreate.php:164 actions/editgroup.php:182
 #: actions/newgroup.php:126 actions/profilesettings.php:208
@@ -307,7 +306,7 @@ msgstr "Alcunha só deve conter letras minúsculas e números. Sem espaços."
 #: actions/newgroup.php:130 actions/profilesettings.php:231
 #: actions/register.php:208
 msgid "Nickname already in use. Try another one."
-msgstr "Alcunha já em uso. Tente outra diferente."
+msgstr "Alcunha já é usada. Tente outra diferente."
 
 #: actions/apigroupcreate.php:180 actions/editgroup.php:189
 #: actions/newgroup.php:133 actions/profilesettings.php:211
@@ -319,7 +318,7 @@ msgstr ""
 #: actions/newgroup.php:139 actions/profilesettings.php:215
 #: actions/register.php:217
 msgid "Homepage is not a valid URL."
-msgstr "A Homepage inserida não é um URL válido."
+msgstr "A página de início não é uma URL válida."
 
 #: actions/apigroupcreate.php:205 actions/editgroup.php:198
 #: actions/newgroup.php:142 actions/profilesettings.php:218
@@ -550,7 +549,7 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr ""
 
@@ -779,7 +778,7 @@ msgstr "Tem a certeza que permite remover esta mensagem?"
 msgid "Do not delete this notice"
 msgstr "Não é possível remover a mensagem."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 #, fuzzy
 msgid "Delete this notice"
 msgstr "Não é possível remover a mensagem."
@@ -2089,8 +2088,8 @@ msgstr "6 ou mais caracteres"
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
 msgstr ""
 
 #: actions/passwordsettings.php:117
@@ -2329,19 +2328,19 @@ msgstr ""
 
 #: actions/profilesettings.php:144 actions/siteadminpanel.php:307
 msgid "Language"
-msgstr "Linguagem"
+msgstr "Língua"
 
 #: actions/profilesettings.php:145
 msgid "Preferred language"
-msgstr ""
+msgstr "Língua preferida"
 
 #: actions/profilesettings.php:154
 msgid "Timezone"
-msgstr ""
+msgstr "Fuso horário"
 
 #: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
-msgstr ""
+msgstr "Em que fuso horário se encontra normalmente?"
 
 #: actions/profilesettings.php:160
 msgid ""
@@ -2351,17 +2350,17 @@ msgstr ""
 "humanos)"
 
 #: actions/profilesettings.php:221 actions/register.php:223
-#, fuzzy, php-format
+#, php-format
 msgid "Bio is too long (max %d chars)."
-msgstr "Bio é demasiada extensa (máx 140 car)."
+msgstr "Biografia demasiada extensa (máx. %d caracteres)."
 
 #: actions/profilesettings.php:228 actions/siteadminpanel.php:165
 msgid "Timezone not selected."
-msgstr ""
+msgstr "Fuso horário não foi seleccionado."
 
 #: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
-msgstr "Linguagem introduzida é muito longa (máx. 50 caracteres)."
+msgstr "Língua é demasiado extensa (máx. 50 caracteres)."
 
 #: actions/profilesettings.php:246 actions/tagother.php:178
 #, php-format
@@ -2374,7 +2373,7 @@ msgstr "Não foi possível actualizar o utilizador para auto-subscrição."
 
 #: actions/profilesettings.php:328
 msgid "Couldn't save profile."
-msgstr "Não foi possível salvar o perfil."
+msgstr "Não foi possível gravar o perfil."
 
 #: actions/profilesettings.php:336
 msgid "Couldn't save tags."
@@ -2382,7 +2381,7 @@ msgstr ""
 
 #: actions/profilesettings.php:344 lib/adminpanelaction.php:126
 msgid "Settings saved."
-msgstr ""
+msgstr "Configurações gravadas."
 
 #: actions/public.php:83
 #, php-format
@@ -2451,7 +2450,7 @@ msgstr ""
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
-msgstr ""
+msgstr "Nuvem de etiquetas ''(tag cloud)'' pública"
 
 #: actions/publictagcloud.php:63
 #, php-format
@@ -2476,7 +2475,7 @@ msgstr ""
 
 #: actions/publictagcloud.php:135
 msgid "Tag cloud"
-msgstr ""
+msgstr "Nuvem de etiquetas ''(tag cloud)''"
 
 #: actions/recoverpassword.php:36
 msgid "You are already logged in!"
@@ -2553,10 +2552,6 @@ msgstr ""
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 ou mais caracteres, e não a esqueça!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr ""
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr ""
@@ -4041,7 +4036,7 @@ msgstr "Ajuda"
 msgid "Help me!"
 msgstr ""
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr ""
 
@@ -4666,7 +4661,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr "de"
@@ -4936,20 +4931,42 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Não"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Não é possível remover a mensagem."
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr ""
 
@@ -5093,6 +5110,10 @@ msgstr "Desbloquear este utilizador"
 msgid "Search site"
 msgstr ""
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 msgid "Search help"
 msgstr ""
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo
index 7ef964113..39c93440c 100644
Binary files a/locale/pt_BR/LC_MESSAGES/statusnet.mo and b/locale/pt_BR/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 60f9433d5..ea335aaf1 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -1,7 +1,6 @@
 # Translation of StatusNet to Brazilian Portuguese
 #
 # Author@translatewiki.net: Ewout
-# Author: Frederico Goncalves Guimaraes <frederico@teia.bio.br>, 2009.
 # Author@translatewiki.net: Vuln
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -10,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:34:16+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:41:04+0000\n"
 "Language-Team: Brazilian Portuguese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: out-statusnet\n"
@@ -559,7 +558,7 @@ msgid "Preview"
 msgstr "Visualização"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Excluir"
 
@@ -789,7 +788,7 @@ msgstr "Você tem certeza que deseja excluir esta mensagem?"
 msgid "Do not delete this notice"
 msgstr "Não é possível excluir esta mensagem."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr "Excluir esta mensagem"
 
@@ -2164,9 +2163,9 @@ msgstr "No mínimo 6 caracteres"
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "igual à senha acima"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Igual à senha acima"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2639,10 +2638,6 @@ msgstr "Ação desconhecida"
 msgid "6 or more characters, and don't forget it!"
 msgstr "No mínimo 6 caracteres. E não se esqueça dela!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Igual à senha acima"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Restaurar"
@@ -4190,7 +4185,7 @@ msgstr "Ajuda"
 msgid "Help me!"
 msgstr "Ajuda"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Procurar"
 
@@ -4834,7 +4829,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr " de "
@@ -5113,20 +5108,42 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Não"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "Nenhum conteúdo!"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr "Responder a esta mensagem"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "Responder"
 
@@ -5275,6 +5292,10 @@ msgstr "Desbloquear este usuário"
 msgid "Search site"
 msgstr "Procurar"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5504,3 +5525,6 @@ msgstr "Desculpe-me, mas este não é seu endereço de e-mail para recebimento."
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "Desculpe-me, mas não é permitido o recebimento de emails."
+
+#~ msgid "same as password above"
+#~ msgstr "igual à senha acima"
diff --git a/locale/ru/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo
index bba5a8c92..9dc805d1a 100644
Binary files a/locale/ru/LC_MESSAGES/statusnet.mo and b/locale/ru/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 6160acf48..bd9202a4d 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:34:19+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:41:07+0000\n"
 "Language-Team: Russian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: out-statusnet\n"
@@ -80,8 +80,7 @@ msgstr "Лента друзей %s (Atom)"
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
-msgstr ""
-"Это временная шкала для %s и друзей, однако пока никто ничего не отправил."
+msgstr "Это лента %s и друзей, однако пока никто ничего не отправил."
 
 #: actions/all.php:132
 #, php-format
@@ -143,7 +142,6 @@ msgid ""
 msgstr "Укажите параметр с именем 'device' и значением sms, im или none."
 
 #: actions/apiaccountupdatedeliverydevice.php:132
-#, fuzzy
 msgid "Could not update user."
 msgstr "Не удаётся обновить пользователя."
 
@@ -184,7 +182,6 @@ msgid "User has no profile."
 msgstr "У пользователя нет профиля."
 
 #: actions/apiaccountupdateprofile.php:147
-#, fuzzy
 msgid "Could not save profile."
 msgstr "Не удаётся сохранить профиль."
 
@@ -352,24 +349,24 @@ msgstr "Слишком длинное месторасположение (мак
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
-msgstr ""
+msgstr "Слишком много алиасов! Максимальное число — %d."
 
 #: actions/apigroupcreate.php:264 actions/editgroup.php:224
 #: actions/newgroup.php:168
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid alias: \"%s\""
-msgstr "Неверный тег: \"%s\""
+msgstr "Неверный алиас: «%s»"
 
 #: actions/apigroupcreate.php:273 actions/editgroup.php:228
 #: actions/newgroup.php:172
-#, fuzzy, php-format
+#, php-format
 msgid "Alias \"%s\" already in use. Try another one."
-msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
+msgstr "Алиас «%s» уже используется. Попробуйте какой-нибудь другой."
 
 #: actions/apigroupcreate.php:286 actions/editgroup.php:234
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
-msgstr ""
+msgstr "Алиас не может совпадать с именем."
 
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
@@ -383,7 +380,7 @@ msgstr "Вы уже являетесь членом этой группы."
 
 #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
 msgid "You have been blocked from that group by the admin."
-msgstr ""
+msgstr "Вы заблокированы из этой группы администратором."
 
 #: actions/apigroupjoin.php:138
 #, php-format
@@ -468,7 +465,7 @@ msgstr "%s обновлённые любимые записи от %s / %s."
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
-msgstr "%s хронология"
+msgstr "Лента %s"
 
 #: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
 #: actions/userrss.php:92
@@ -489,7 +486,7 @@ msgstr ""
 #: actions/apitimelinepublic.php:106 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
-msgstr "%s общая хронология"
+msgstr "Общая лента %s"
 
 #: actions/apitimelinepublic.php:110 actions/publicrss.php:105
 #, php-format
@@ -529,13 +526,13 @@ msgstr "Неверный размер."
 #: actions/avatarsettings.php:67 actions/showgroup.php:221
 #: lib/accountsettingsaction.php:112
 msgid "Avatar"
-msgstr "Аватар"
+msgstr "Аватара"
 
 #: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
-"Вы можете загрузить свой аватар. Максимальный размер файла составляет %s."
+"Вы можете загрузить свою аватару. Максимальный размер файла составляет %s."
 
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:182
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
@@ -546,7 +543,7 @@ msgstr "Пользователь без соответствующего про
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:194
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
-msgstr "Настройки аватара"
+msgstr "Настройки аватары"
 
 #: actions/avatarsettings.php:126 actions/avatarsettings.php:202
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
@@ -559,7 +556,7 @@ msgid "Preview"
 msgstr "Просмотр"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Удалить"
 
@@ -595,7 +592,7 @@ msgstr "Нетиповое подтверждение формы."
 
 #: actions/avatarsettings.php:322
 msgid "Pick a square area of the image to be your avatar"
-msgstr "Подберите нужный квадратный ракурс дла вашего аватара"
+msgstr "Подберите нужный квадратный участок для вашей аватары"
 
 #: actions/avatarsettings.php:337 actions/grouplogo.php:377
 msgid "Lost our file data."
@@ -603,15 +600,15 @@ msgstr "Потеряна информация о файле."
 
 #: actions/avatarsettings.php:360
 msgid "Avatar updated."
-msgstr "Аватар обновлён."
+msgstr "Аватара обновлена."
 
 #: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
-msgstr "Неудача при обновлении аватара."
+msgstr "Неудача при обновлении аватары."
 
 #: actions/avatarsettings.php:387
 msgid "Avatar deleted."
-msgstr "Аватар удалён."
+msgstr "Аватара удалена."
 
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
@@ -630,12 +627,12 @@ msgstr "Нет такой группы"
 #: actions/blockedfromgroup.php:90
 #, php-format
 msgid "%s blocked profiles"
-msgstr "%s заблокированных профилей"
+msgstr "Заблокированные профили %s"
 
 #: actions/blockedfromgroup.php:93
-#, fuzzy, php-format
+#, php-format
 msgid "%s blocked profiles, page %d"
-msgstr "%s и друзья, страница %d"
+msgstr "Заблокированные профили %s, страница %d"
 
 #: actions/blockedfromgroup.php:108
 msgid "A list of the users blocked from joining this group."
@@ -786,7 +783,7 @@ msgstr "Вы уверены, что хотите удалить эту запи
 msgid "Do not delete this notice"
 msgstr "Не удалять эту запись"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr "Удалить эту запись"
 
@@ -976,9 +973,8 @@ msgid "Could not update group."
 msgstr "Не удаётся обновить информацию о группе."
 
 #: actions/editgroup.php:259 classes/User_group.php:390
-#, fuzzy
 msgid "Could not create aliases."
-msgstr "Не удаётся создать любимую запись."
+msgstr "Не удаётся создать алиасы."
 
 #: actions/editgroup.php:269
 msgid "Options saved."
@@ -1187,12 +1183,16 @@ msgstr "Самые популярные записи на %%site.name%% на т
 #: actions/favorited.php:150
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
+"На этой странице появляются любимые записи, однако ни одна запись таковой "
+"пока не отмечена."
 
 #: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
 msgstr ""
+"Добавьте первую запись в число любимых, нажав соответствующую кнопку рядом с "
+"любой понравившейся записью."
 
 #: actions/favorited.php:156
 #, php-format
@@ -1200,6 +1200,8 @@ msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
 "notice to your favorites!"
 msgstr ""
+"Почему бы не [зарегистрироваться](%%action.register%%) и первым добавить "
+"запись в число любимых?"
 
 #: actions/favoritesrss.php:111 actions/showfavorites.php:77
 #: lib/personalgroupnav.php:115
@@ -1316,7 +1318,7 @@ msgstr "Группа не определена."
 
 #: actions/groupblock.php:91
 msgid "Only an admin can block group members."
-msgstr ""
+msgstr "Только администратор может блокировать участников группы."
 
 #: actions/groupblock.php:95
 msgid "User is already blocked from group."
@@ -1337,11 +1339,13 @@ msgid ""
 "be removed from the group, unable to post, and unable to subscribe to the "
 "group in the future."
 msgstr ""
+"Вы действительно хотите заблокировать пользователя «%s» из группы «%s»? "
+"Пользователь будет удалён из группы без возможности отправлять и "
+"подписываться на группу в будущем."
 
 #: actions/groupblock.php:178
-#, fuzzy
 msgid "Do not block this user from this group"
-msgstr "Список пользователей, являющихся членами этой группы."
+msgstr "Не блокировать этого пользователя из этой группы"
 
 #: actions/groupblock.php:179
 msgid "Block this user from this group"
@@ -1356,9 +1360,8 @@ msgid "No ID"
 msgstr "Нет ID"
 
 #: actions/groupdesignsettings.php:68
-#, fuzzy
 msgid "You must be logged in to edit a group."
-msgstr "Вы должны авторизоваться, чтобы создать новую группу."
+msgstr "Вы должны авторизоваться, чтобы изменить группу."
 
 #: actions/groupdesignsettings.php:141
 msgid "Group design"
@@ -1369,12 +1372,13 @@ msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
+"Настройте внешний вид группы, установив фоновое изображение и цветовую гамму "
+"на ваш выбор."
 
 #: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
 #: lib/designsettings.php:434 lib/designsettings.php:464
-#, fuzzy
 msgid "Couldn't update your design."
-msgstr "Не удаётся обновить пользователя."
+msgstr "Не удаётся обновить ваше оформление."
 
 #: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
@@ -1391,15 +1395,16 @@ msgid "Group logo"
 msgstr "Логотип группы"
 
 #: actions/grouplogo.php:150
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
-msgstr "Тут вы можете загрузить логотип для группы."
+msgstr ""
+"Здесь вы можете загрузить логотип для группы. Максимальный размер файла "
+"составляет %s."
 
 #: actions/grouplogo.php:362
-#, fuzzy
 msgid "Pick a square area of the image to be the logo."
-msgstr "Подберите нужный квадратный ракурс дла вашего аватара"
+msgstr "Подберите нужный квадратный участок для вашего логотипа."
 
 #: actions/grouplogo.php:396
 msgid "Logo updated."
@@ -1444,17 +1449,17 @@ msgid "Make this user an admin"
 msgstr "Сделать этого пользователя администратором"
 
 #: actions/grouprss.php:133
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from members of %1$s on %2$s!"
-msgstr "Обновлено от %1$s на %2$s!"
+msgstr "Обновления участников %1$s на %2$s!"
 
 #: actions/groupsearch.php:52
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"Поиск людей на %%site.name%% по имени, месторасположению или интересам. "
+"Поиск групп на %%site.name%% по имени, месторасположению или интересам. "
 "Разделяйте ключевые слова пробелами. Минимальная длина слова — 3 буквы."
 
 #: actions/groupsearch.php:58
@@ -1819,9 +1824,8 @@ msgid "Incorrect username or password."
 msgstr "Некорректное имя или пароль."
 
 #: actions/login.php:149
-#, fuzzy
 msgid "Error setting user. You are probably not authorized."
-msgstr "Вы не авторизованы."
+msgstr "Ошибка установки пользователя. Вы, вероятно, не авторизованы."
 
 #: actions/login.php:204 actions/login.php:257 lib/action.php:458
 #: lib/logingroupnav.php:79
@@ -2012,7 +2016,7 @@ msgstr "Запись без профиля"
 #: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
 msgid "%1$s's status on %2$s"
-msgstr ""
+msgstr "Статус %1$s на %2$s"
 
 #: actions/oembed.php:157
 msgid "content type "
@@ -2112,9 +2116,9 @@ msgstr "6 или больше знаков"
 msgid "Confirm"
 msgstr "Подтверждение"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "тот же пароль, что и выше"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Тот же пароль, что и выше"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2149,29 +2153,28 @@ msgid "Paths"
 msgstr "Пути"
 
 #: actions/pathsadminpanel.php:70
-#, fuzzy
 msgid "Path and server settings for this StatusNet site."
-msgstr "Настройки оформления для этого сайта StatusNet."
+msgstr "Настройки путей и серверов для этого сайта StatusNet."
 
 #: actions/pathsadminpanel.php:140
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s"
-msgstr "Страница недоступна для того типа, который Вы задействовали."
+msgstr "Директория тем недоступна для чтения: %s"
 
 #: actions/pathsadminpanel.php:146
 #, php-format
 msgid "Avatar directory not writable: %s"
-msgstr ""
+msgstr "Директория аватар не доступна для записи: %s"
 
 #: actions/pathsadminpanel.php:152
 #, php-format
 msgid "Background directory not writable: %s"
-msgstr ""
+msgstr "Директория фоновых изображений не доступна для записи: %s"
 
 #: actions/pathsadminpanel.php:160
 #, php-format
 msgid "Locales directory not readable: %s"
-msgstr ""
+msgstr "Директория локализаций не доступна для чтения: %s"
 
 #: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
 #: lib/adminpanelaction.php:299
@@ -2188,11 +2191,11 @@ msgstr "Путь к сайту"
 
 #: actions/pathsadminpanel.php:220
 msgid "Path to locales"
-msgstr ""
+msgstr "Пусть к локализациям"
 
 #: actions/pathsadminpanel.php:220
 msgid "Directory path to locales"
-msgstr ""
+msgstr "Путь к директории локализаций"
 
 #: actions/pathsadminpanel.php:227
 msgid "Theme"
@@ -2200,34 +2203,31 @@ msgstr "Тема"
 
 #: actions/pathsadminpanel.php:232
 msgid "Theme server"
-msgstr ""
+msgstr "Сервер темы"
 
 #: actions/pathsadminpanel.php:236
 msgid "Theme path"
-msgstr ""
+msgstr "Путь темы"
 
 #: actions/pathsadminpanel.php:240
 msgid "Theme directory"
-msgstr ""
+msgstr "Директория темы"
 
 #: actions/pathsadminpanel.php:247
 msgid "Avatars"
 msgstr "Аватары"
 
 #: actions/pathsadminpanel.php:252
-#, fuzzy
 msgid "Avatar server"
-msgstr "Настройки аватара"
+msgstr "Сервер аватар"
 
 #: actions/pathsadminpanel.php:256
-#, fuzzy
 msgid "Avatar path"
-msgstr "Аватар обновлён."
+msgstr "Путь к аватарам"
 
 #: actions/pathsadminpanel.php:260
-#, fuzzy
 msgid "Avatar directory"
-msgstr "Аватар удалён."
+msgstr "Директория аватар"
 
 #: actions/pathsadminpanel.php:269
 msgid "Backgrounds"
@@ -2442,11 +2442,11 @@ msgstr "Лента публичного потока (Atom)"
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
-msgstr ""
+msgstr "Это общая лента %%site.name%%, однако пока никто ничего не отправил."
 
 #: actions/public.php:182
 msgid "Be the first to post!"
-msgstr ""
+msgstr "Создайте первую запись!"
 
 #: actions/public.php:186
 #, php-format
@@ -2554,7 +2554,7 @@ msgstr "Восстановление пароля"
 
 #: actions/recoverpassword.php:191
 msgid "Nickname or email address"
-msgstr ""
+msgstr "Имя или email-адрес"
 
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
@@ -2584,10 +2584,6 @@ msgstr "Неизвестное действие"
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 или более символов, и не забывайте его!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Тот же пароль, что и выше"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Сбросить"
@@ -2641,9 +2637,8 @@ msgid "Sorry, only invited people can register."
 msgstr "Простите, регистрация только по приглашению."
 
 #: actions/register.php:92
-#, fuzzy
 msgid "Sorry, invalid invitation code."
-msgstr "Ошибка, связанная с кодом подтверждения."
+msgstr "Извините, неверный пригласительный код."
 
 #: actions/register.php:112
 msgid "Registration successful"
@@ -2697,7 +2692,7 @@ msgstr "6 или более символов. Обязательное поле.
 
 #: actions/register.php:433
 msgid "Same as password above. Required."
-msgstr "Тот же пароль что и сверху. Обязательно."
+msgstr "Тот же пароль что и сверху. Обязательное поле."
 
 #: actions/register.php:437 actions/register.php:441
 #: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
@@ -2721,12 +2716,11 @@ msgid "Creative Commons Attribution 3.0"
 msgstr "Creative Commons Attribution 3.0"
 
 #: actions/register.php:496
-#, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
 "number."
 msgstr ""
-", за исключением моей приватной информации: пароля, почты, мессенджера, "
+", за исключением моей личной информации: пароля, почты, мессенджера и номера "
 "телефона."
 
 #: actions/register.php:537
@@ -2815,10 +2809,11 @@ msgid "Invalid profile URL (bad format)"
 msgstr "Неверный URL профиля (плохой формат)"
 
 #: actions/remotesubscribe.php:168
-#, fuzzy
 msgid ""
 "Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
-msgstr "Неверный URL профиля (не YADIS-документ)."
+msgstr ""
+"Неверный URL профиля (не YADIS-документ либо не указан или указан неверный "
+"XRDS)."
 
 #: actions/remotesubscribe.php:176
 #, fuzzy
@@ -2826,9 +2821,8 @@ msgid "That’s a local profile! Login to subscribe."
 msgstr "Это локальный профиль! Авторизуйтесь для подписки."
 
 #: actions/remotesubscribe.php:183
-#, fuzzy
 msgid "Couldn’t get a request token."
-msgstr "Не удаётся получить запрос."
+msgstr "Не удаётся получить получить ключ запроса."
 
 #: actions/replies.php:125 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:105
@@ -2883,17 +2877,16 @@ msgid "Replies to %1$s on %2$s!"
 msgstr "Сообщение для %1$s на %2$s"
 
 #: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
 msgid "You cannot sandbox users on this site."
-msgstr "Вы не можете послать сообщение этому пользователю."
+msgstr ""
+"Вы не можете устанавливать режим песочницы для пользователей этого сайта."
 
 #: actions/sandbox.php:72
-#, fuzzy
 msgid "User is already sandboxed."
-msgstr "Пользователь заблокировал Вас."
+msgstr "Пользователь уже в режиме песочницы."
 
 #: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%s's favorite notices, page %d"
 msgstr "Любимые записи %s, страница %d"
 
@@ -2967,7 +2960,7 @@ msgstr "Запись"
 
 #: actions/showgroup.php:284 lib/groupeditform.php:184
 msgid "Aliases"
-msgstr ""
+msgstr "Алиасы"
 
 #: actions/showgroup.php:293
 msgid "Group actions"
@@ -3012,9 +3005,8 @@ msgid "Statistics"
 msgstr "Статистика"
 
 #: actions/showgroup.php:432
-#, fuzzy
 msgid "Created"
-msgstr "Создать"
+msgstr "Создано"
 
 #: actions/showgroup.php:448
 #, php-format
@@ -3072,9 +3064,9 @@ msgid "Notice deleted."
 msgstr "Запись удалена."
 
 #: actions/showstream.php:73
-#, fuzzy, php-format
+#, php-format
 msgid " tagged %s"
-msgstr "Записи, помеченные %s"
+msgstr "  с тегом %s"
 
 #: actions/showstream.php:79
 #, php-format
@@ -3109,13 +3101,15 @@ msgstr "FOAF для %s"
 #: actions/showstream.php:191
 #, php-format
 msgid "This is the timeline for %s but %s hasn't posted anything yet."
-msgstr ""
+msgstr "Это лента %s, однако %s пока ничего не отправил."
 
 #: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
+"Видели недавно что-нибудь интересное? Вы ещё не отправили ни одной записи, "
+"сейчас хорошее время  для начала :)"
 
 #: actions/showstream.php:198
 #, php-format
@@ -3152,14 +3146,12 @@ msgstr ""
 "net/)."
 
 #: actions/silence.php:65 actions/unsilence.php:65
-#, fuzzy
 msgid "You cannot silence users on this site."
-msgstr "Вы не можете послать сообщение этому пользователю."
+msgstr "Вы не можете заглушать пользователей на этом сайте."
 
 #: actions/silence.php:72
-#, fuzzy
 msgid "User is already silenced."
-msgstr "Пользователь заблокировал Вас."
+msgstr "Пользователь уже заглушён."
 
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site."
@@ -3167,12 +3159,11 @@ msgstr "Основные настройки для этого сайта StatusN
 
 #: actions/siteadminpanel.php:147
 msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "Имя сайта должно быть ненулевой длины."
 
 #: actions/siteadminpanel.php:155
-#, fuzzy
 msgid "You must have a valid contact email address"
-msgstr "Неверный электронный адрес"
+msgstr "У вас должен быть действительный контактный email-адрес"
 
 #: actions/siteadminpanel.php:173
 #, php-format
@@ -3193,7 +3184,7 @@ msgstr ""
 
 #: actions/siteadminpanel.php:199
 msgid "You must set an SSL server when enabling SSL."
-msgstr ""
+msgstr "Вы должны указать SSL-сервер при включении SSL."
 
 #: actions/siteadminpanel.php:204
 msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -3201,15 +3192,15 @@ msgstr ""
 
 #: actions/siteadminpanel.php:210
 msgid "Minimum text limit is 140 characters."
-msgstr ""
+msgstr "Минимальное ограничение текста составляет 140 символов."
 
 #: actions/siteadminpanel.php:216
 msgid "Dupe limit must 1 or more seconds."
-msgstr ""
+msgstr "Ограничение дублирования должно составлять 1 или более секунд."
 
 #: actions/siteadminpanel.php:266
 msgid "General"
-msgstr ""
+msgstr "Базовые"
 
 #: actions/siteadminpanel.php:269
 msgid "Site name"
@@ -3217,7 +3208,7 @@ msgstr "Имя сайта"
 
 #: actions/siteadminpanel.php:270
 msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "Имя вашего сайта, например, «Yourcompany Microblog»"
 
 #: actions/siteadminpanel.php:274
 msgid "Brought by"
@@ -3236,9 +3227,8 @@ msgid "URL used for credits link in footer of each page"
 msgstr ""
 
 #: actions/siteadminpanel.php:284
-#, fuzzy
 msgid "Contact email address for your site"
-msgstr "контактный email-адрес для вашего сайта"
+msgstr "Контактный email-адрес для вашего сайта"
 
 #: actions/siteadminpanel.php:290
 #, fuzzy
@@ -3247,25 +3237,23 @@ msgstr "Локальные виды"
 
 #: actions/siteadminpanel.php:301
 msgid "Default timezone"
-msgstr ""
+msgstr "Часовой пояс по умолчанию"
 
 #: actions/siteadminpanel.php:302
 msgid "Default timezone for the site; usually UTC."
-msgstr ""
+msgstr "Часовой пояс по умолчанию для сайта; обычно UTC."
 
 #: actions/siteadminpanel.php:308
 msgid "Default site language"
 msgstr "Язык сайта по умолчанию"
 
 #: actions/siteadminpanel.php:316
-#, fuzzy
 msgid "URLs"
-msgstr "URL"
+msgstr "URL-адреса"
 
 #: actions/siteadminpanel.php:319
-#, fuzzy
 msgid "Server"
-msgstr "Восстановление"
+msgstr "Сервер"
 
 #: actions/siteadminpanel.php:319
 msgid "Site's server hostname."
@@ -3273,25 +3261,24 @@ msgstr "Имя хоста сервера сайта."
 
 #: actions/siteadminpanel.php:323
 msgid "Fancy URLs"
-msgstr ""
+msgstr "Короткие URL"
 
 #: actions/siteadminpanel.php:325
 msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "Использовать ли короткие (более читаемые и запоминаемые) URL-адреса?"
 
 #: actions/siteadminpanel.php:331
-#, fuzzy
 msgid "Access"
 msgstr "Принять"
 
 #: actions/siteadminpanel.php:334
-#, fuzzy
 msgid "Private"
-msgstr "Пользовательское соглашение"
+msgstr "Личное"
 
 #: actions/siteadminpanel.php:336
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
+"Запретить анонимным (не авторизовавшимся) пользователям просматривать сайт?"
 
 #: actions/siteadminpanel.php:340
 msgid "Invite only"
@@ -3299,7 +3286,7 @@ msgstr "Только по приглашениям"
 
 #: actions/siteadminpanel.php:342
 msgid "Make registration invitation only."
-msgstr ""
+msgstr "Разрешить регистрацию только по приглашениям."
 
 #: actions/siteadminpanel.php:346
 msgid "Closed"
@@ -3315,11 +3302,11 @@ msgstr ""
 
 #: actions/siteadminpanel.php:357
 msgid "Randomly during Web hit"
-msgstr ""
+msgstr "При случайном посещении"
 
 #: actions/siteadminpanel.php:358
 msgid "In a scheduled job"
-msgstr ""
+msgstr "По заданному графику"
 
 #: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
 msgid "Never"
@@ -3343,7 +3330,7 @@ msgstr ""
 
 #: actions/siteadminpanel.php:372
 msgid "Report URL"
-msgstr ""
+msgstr "URL отчёта"
 
 #: actions/siteadminpanel.php:373
 msgid "Snapshots will be sent to this URL"
@@ -3379,23 +3366,24 @@ msgstr "Сервер, которому направлять SSL-запросы"
 
 #: actions/siteadminpanel.php:400
 msgid "Limits"
-msgstr ""
+msgstr "Границы"
 
 #: actions/siteadminpanel.php:403
 msgid "Text limit"
-msgstr ""
+msgstr "Границы текста"
 
 #: actions/siteadminpanel.php:403
 msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "Максимальное число символов для записей."
 
 #: actions/siteadminpanel.php:407
 msgid "Dupe limit"
-msgstr ""
+msgstr "Предел дубликатов"
 
 #: actions/siteadminpanel.php:407
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
+"Сколько нужно ждать пользователям (в секундах) для отправки того же ещё раз."
 
 #: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
 msgid "Save site settings"
@@ -3542,11 +3530,13 @@ msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor"
 msgstr ""
+"У вас нет подписчиков. Попробуйте подписаться на знакомых людей, и они могут "
+"ответить взаимностью"
 
 #: actions/subscribers.php:110
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
-msgstr ""
+msgstr "У %s нет подписчиков. Хотите быть первым?"
 
 #: actions/subscribers.php:114
 #, php-format
@@ -3554,6 +3544,8 @@ msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
 "%) and be the first?"
 msgstr ""
+"У %s нет подписчиков. Почему бы не [зарегистрироваться](%%%%action.register%%"
+"%%) и стать первым?"
 
 #: actions/subscriptions.php:52
 #, php-format
@@ -3585,9 +3577,9 @@ msgid ""
 msgstr ""
 
 #: actions/subscriptions.php:123 actions/subscriptions.php:127
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not listening to anyone."
-msgstr "%1$s теперь просматривает твои записи на %2$s."
+msgstr "%s не просматривает ничьи записи."
 
 #: actions/subscriptions.php:194
 msgid "Jabber"
@@ -3679,14 +3671,12 @@ msgid "You haven't blocked that user."
 msgstr "Вы не заблокировали этого пользователя."
 
 #: actions/unsandbox.php:72
-#, fuzzy
 msgid "User is not sandboxed."
-msgstr "Пользователь заблокировал Вас."
+msgstr "Для пользователя не установлен режим песочницы."
 
 #: actions/unsilence.php:72
-#, fuzzy
 msgid "User is not silenced."
-msgstr "У пользователя нет профиля."
+msgstr "Пользователь не заглушён."
 
 #: actions/unsubscribe.php:77
 msgid "No profile id in request."
@@ -3712,20 +3702,21 @@ msgstr "Пользователь"
 
 #: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Пользовательские настройки для этого сайта StatusNet."
 
 #: actions/useradminpanel.php:149
 msgid "Invalid bio limit. Must be numeric."
-msgstr ""
+msgstr "Неверное ограничение биографии. Должно быть числом."
 
 #: actions/useradminpanel.php:155
 msgid "Invalid welcome text. Max length is 255 characters."
 msgstr ""
+"Неверный текст приветствия. Максимальная длина составляет 255 символов."
 
 #: actions/useradminpanel.php:165
 #, php-format
 msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr ""
+msgstr "Неверная подписка по умолчанию: «%1$s» не является пользователем."
 
 #: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
 #: lib/personalgroupnav.php:109
@@ -3734,11 +3725,11 @@ msgstr "Профиль"
 
 #: actions/useradminpanel.php:222
 msgid "Bio Limit"
-msgstr ""
+msgstr "Ограничение биографии"
 
 #: actions/useradminpanel.php:223
 msgid "Maximum length of a profile bio in characters."
-msgstr ""
+msgstr "Максимальная длина биографии профиля в символах."
 
 #: actions/useradminpanel.php:231
 msgid "New users"
@@ -3750,16 +3741,15 @@ msgstr "Приветствие новым пользователям"
 
 #: actions/useradminpanel.php:236
 msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "Текст приветствия для новых пользователей (максимум 255 символов)."
 
 #: actions/useradminpanel.php:241
 msgid "Default subscription"
 msgstr "Подписка по умолчанию"
 
 #: actions/useradminpanel.php:242
-#, fuzzy
 msgid "Automatically subscribe new users to this user."
-msgstr "Автоматически подписываться на всех, кто подписался на меня"
+msgstr "Автоматически подписывать новых пользователей на этого пользователя."
 
 #: actions/useradminpanel.php:251
 msgid "Invitations"
@@ -3783,7 +3773,7 @@ msgstr "Управление сессиями"
 
 #: actions/useradminpanel.php:272
 msgid "Whether to handle sessions ourselves."
-msgstr ""
+msgstr "Управлять ли сессиями самостоятельно."
 
 #: actions/useradminpanel.php:276
 msgid "Session debugging"
@@ -3879,12 +3869,12 @@ msgstr ""
 #: actions/userauthorization.php:322
 #, php-format
 msgid "Profile URL ‘%s’ is for a local user."
-msgstr ""
+msgstr "URL профиля «%s» предназначен только для локального пользователя."
 
 #: actions/userauthorization.php:338
 #, php-format
 msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
+msgstr "URL аватары «%s» недействителен."
 
 #: actions/userauthorization.php:343
 #, php-format
@@ -3892,9 +3882,9 @@ msgid "Can’t read avatar URL ‘%s’."
 msgstr "Не удаётся прочитать URL аватары «%s»"
 
 #: actions/userauthorization.php:348
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "Неверный тип изображения для '%s'"
+msgstr "Неверный тип изображения для URL аватары «%s»."
 
 #: actions/userbyid.php:70
 msgid "No id."
@@ -3914,7 +3904,7 @@ msgstr ""
 
 #: actions/userdesignsettings.php:282
 msgid "Enjoy your hotdog!"
-msgstr ""
+msgstr "Приятного аппетита!"
 
 #: actions/usergroups.php:64
 #, php-format
@@ -3926,14 +3916,15 @@ msgid "Search for more groups"
 msgstr "Искать другие группы"
 
 #: actions/usergroups.php:153
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not a member of any group."
-msgstr "Вы не являетесь членом этой группы."
+msgstr "%s не состоит ни в одной группе."
 
 #: actions/usergroups.php:158
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
+"Попробуйте [найти группы](%%action.groupsearch%%) и присоединиться к ним."
 
 #: classes/File.php:137
 #, php-format
@@ -3941,16 +3932,18 @@ msgid ""
 "No file may be larger than %d bytes and the file you sent was %d bytes. Try "
 "to upload a smaller version."
 msgstr ""
+"Файл не может быть больше %d байт, тогда как отправленный вами файл содержал "
+"%d байт. Попробуйте загрузить меньшую версию."
 
 #: classes/File.php:147
 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
-msgstr ""
+msgstr "Файл такого размера превысит вашу пользовательскую квоту в %d байта."
 
 #: classes/File.php:154
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
-msgstr ""
+msgstr "Файл такого размера превысит вашу месячную квоту в %d байта."
 
 #: classes/Message.php:45
 msgid "You are banned from sending direct messages."
@@ -3970,9 +3963,8 @@ msgid "DB error inserting hashtag: %s"
 msgstr "Ошибка баз данных при вставке хеш-тегов для %s"
 
 #: classes/Notice.php:179
-#, fuzzy
 msgid "Problem saving notice. Too long."
-msgstr "Проблемы с сохранением записи."
+msgstr "Проблемы с сохранением записи. Слишком длинно."
 
 #: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
@@ -3986,13 +3978,12 @@ msgstr ""
 "попробуйте вновь через пару минут."
 
 #: classes/Notice.php:194
-#, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
-"Слишком много записей за столь короткий срок; передохните немного и "
-"попробуйте вновь через пару минут."
+"Слишком много одинаковых записей за столь короткий срок; передохните немного "
+"и попробуйте вновь через пару минут."
 
 #: classes/Notice.php:200
 msgid "You are banned from posting notices on this site."
@@ -4026,7 +4017,7 @@ msgstr "Изменить ваши настройки профиля"
 
 #: lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
-msgstr "Загрузить аватар"
+msgstr "Загрузить аватару"
 
 #: lib/accountsettingsaction.php:116
 msgid "Change your password"
@@ -4037,9 +4028,8 @@ msgid "Change email handling"
 msgstr "Изменить электронный адрес"
 
 #: lib/accountsettingsaction.php:124
-#, fuzzy
 msgid "Design your profile"
-msgstr "Профиль пользователя"
+msgstr "Оформить ваш профиль"
 
 #: lib/accountsettingsaction.php:128
 msgid "Other"
@@ -4076,7 +4066,7 @@ msgstr "Настройки"
 
 #: lib/action.php:433
 msgid "Change your email, avatar, password, profile"
-msgstr "Изменить ваш email, аватар, пароль, профиль и др."
+msgstr "Изменить ваш email, аватару, пароль, профиль"
 
 #: lib/action.php:436
 msgid "Connect"
@@ -4123,7 +4113,7 @@ msgstr "Помощь"
 msgid "Help me!"
 msgstr "Помощь"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Поиск"
 
@@ -4157,7 +4147,7 @@ msgstr "ЧаВо"
 
 #: lib/action.php:732
 msgid "TOS"
-msgstr ""
+msgstr "TOS"
 
 #: lib/action.php:735
 msgid "Privacy"
@@ -4172,9 +4162,8 @@ msgid "Contact"
 msgstr "Контактная информация"
 
 #: lib/action.php:741
-#, fuzzy
 msgid "Badge"
-msgstr "\"Подтолкнуть\""
+msgstr "Бедж"
 
 #: lib/action.php:769
 msgid "StatusNet software license"
@@ -4212,15 +4201,15 @@ msgstr "Лицензия содержимого сайта"
 
 #: lib/action.php:799
 msgid "All "
-msgstr "Все"
+msgstr "All "
 
 #: lib/action.php:804
 msgid "license."
-msgstr "лицензия."
+msgstr "license."
 
 #: lib/action.php:1068
 msgid "Pagination"
-msgstr "Пагинация"
+msgstr "Разбиение на страницы"
 
 #: lib/action.php:1077
 msgid "After"
@@ -4255,14 +4244,12 @@ msgid "Basic site configuration"
 msgstr "Основная конфигурация сайта"
 
 #: lib/adminpanelaction.php:303
-#, fuzzy
 msgid "Design configuration"
-msgstr "Подтверждение СМС"
+msgstr "Конфигурация оформления"
 
 #: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
-#, fuzzy
 msgid "Paths configuration"
-msgstr "Подтверждение СМС"
+msgstr "Конфигурация путей"
 
 #: lib/attachmentlist.php:87
 msgid "Attachments"
@@ -4273,17 +4260,16 @@ msgid "Author"
 msgstr "Автор"
 
 #: lib/attachmentlist.php:278
-#, fuzzy
 msgid "Provider"
-msgstr "Профиль"
+msgstr "Поставщик услуг"
 
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
-msgstr ""
+msgstr "Сообщает, где появляется это вложение"
 
 #: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
-msgstr ""
+msgstr "Теги для этого вложения"
 
 #: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
@@ -4302,18 +4288,18 @@ msgid "Sorry, this command is not yet implemented."
 msgstr "Простите, эта команда ещё не выполнена."
 
 #: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
 msgid "Could not find a user with nickname %s"
-msgstr "Не удаётся одновить пользователя с подтверждённым электронным адресом."
+msgstr "Не удаётся найти пользователя с именем %s"
 
 #: lib/command.php:92
 msgid "It does not make a lot of sense to nudge yourself!"
-msgstr ""
+msgstr "Нет смысла «подталкивать» самого себя!"
 
 #: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
 msgid "Nudge sent to %s"
-msgstr "\"Подталкивание\" послано"
+msgstr "«Подталкивание» послано %s"
 
 #: lib/command.php:126
 #, php-format
@@ -4322,10 +4308,13 @@ msgid ""
 "Subscribers: %2$s\n"
 "Notices: %3$s"
 msgstr ""
+"Подписок: %1$s\n"
+"Подписчиков: %2$s\n"
+"Записей: %3$s"
 
 #: lib/command.php:152 lib/command.php:400
 msgid "Notice with that id does not exist"
-msgstr ""
+msgstr "Записи с таким id не существует"
 
 #: lib/command.php:168 lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
@@ -4361,18 +4350,18 @@ msgid "About: %s"
 msgstr "О пользователе: %s"
 
 #: lib/command.php:358 scripts/xmppdaemon.php:321
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Сообщение слишком длинное - не больше 140 символов, Вы посылаете %d"
+msgstr "Сообщение слишком длинное — не больше %d символов, вы посылаете %d"
 
 #: lib/command.php:377
 msgid "Error sending direct message."
 msgstr "Ошибка при отправке прямого сообщения."
 
 #: lib/command.php:431
-#, fuzzy, php-format
+#, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Сообщение слишком длинное - не больше 140 символов, Вы посылаете %d"
+msgstr "Запись слишком длинная — не больше %d символов, вы посылаете %d"
 
 #: lib/command.php:439
 #, php-format
@@ -4380,7 +4369,6 @@ msgid "Reply to %s sent"
 msgstr "Ответ %s отправлен"
 
 #: lib/command.php:441
-#, fuzzy
 msgid "Error saving notice."
 msgstr "Проблемы с сохранением записи."
 
@@ -4423,14 +4411,14 @@ msgid "Can't turn on notification."
 msgstr "Есть оповещение."
 
 #: lib/command.php:597
-#, fuzzy, php-format
+#, php-format
 msgid "Could not create login token for %s"
-msgstr "Не удаётся создать OpenID-форму: %s "
+msgstr "Не удаётся создать ключ входа для %s"
 
 #: lib/command.php:602
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
+msgstr "Эта ссылка действительна только один раз в течение 2 минут: %s"
 
 #: lib/command.php:618
 msgid "You are not subscribed to anyone."
@@ -4440,32 +4428,33 @@ msgstr "Вы ни на кого не подписаны."
 #, fuzzy
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
-msgstr[0] "Вы уже подписаны на пользователя:"
-msgstr[1] "Вы уже подписаны на пользователя:"
+msgstr[0] "Вы подписаны на этого человека:"
+msgstr[1] "Вы подписаны на этих людей:"
+msgstr[2] "Вы подписаны на этих людей:"
 
 #: lib/command.php:640
-#, fuzzy
 msgid "No one is subscribed to you."
-msgstr "Не удаётся подписать других на вашу ленту."
+msgstr "Никто не подписан на вас."
 
 #: lib/command.php:642
 #, fuzzy
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
-msgstr[0] "Не удаётся подписать других на вашу ленту."
-msgstr[1] "Не удаётся подписать других на вашу ленту."
+msgstr[0] "Этот человек подписался на вас:"
+msgstr[1] "Эти люди подписались на вас:"
+msgstr[2] "Эти люди подписались на вас:"
 
 #: lib/command.php:662
-#, fuzzy
 msgid "You are not a member of any groups."
-msgstr "Вы не являетесь членом этой группы."
+msgstr "Вы не состоите ни в одной группе."
 
 #: lib/command.php:664
 #, fuzzy
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
-msgstr[0] "Вы не являетесь членом этой группы."
-msgstr[1] "Вы не являетесь членом этой группы."
+msgstr[0] "Вы являетесь участником следующей группы:"
+msgstr[1] "Вы являетесь участником следующих групп:"
+msgstr[2] "Вы являетесь участником следующих групп:"
 
 #: lib/command.php:678
 msgid ""
@@ -4505,6 +4494,41 @@ msgid ""
 "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"
+"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"
 
 #: lib/common.php:199
 msgid "No configuration file found. "
@@ -4512,11 +4536,11 @@ msgstr "Конфигурационный файл не найден. "
 
 #: lib/common.php:200
 msgid "I looked for configuration files in the following places: "
-msgstr ""
+msgstr "Конфигурационные файлы искались в следующих местах: "
 
 #: lib/common.php:201
 msgid "You may wish to run the installer to fix this."
-msgstr ""
+msgstr "Возможно, вы решите запустить установщик для исправления этого."
 
 #: lib/common.php:202
 msgid "Go to the installer."
@@ -4551,11 +4575,11 @@ msgstr ""
 
 #: lib/designsettings.php:372
 msgid "Bad default color settings: "
-msgstr ""
+msgstr "Плохие настройки цвета по умолчанию: "
 
 #: lib/designsettings.php:468
 msgid "Design defaults restored."
-msgstr ""
+msgstr "Оформление по умолчанию восстановлено."
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
@@ -4618,14 +4642,13 @@ msgid "URL of the homepage or blog of the group or topic"
 msgstr "Адрес страницы, дневника или профиля группы на другом портале"
 
 #: lib/groupeditform.php:168
-#, fuzzy
 msgid "Describe the group or topic"
-msgstr "Опиши группу при помощи 140 символов"
+msgstr "Опишите группу или тему"
 
 #: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d characters"
-msgstr "Опиши группу при помощи 140 символов"
+msgstr "Опишите группу или тему при помощи %d символов"
 
 #: lib/groupeditform.php:172
 msgid "Description"
@@ -4640,6 +4663,8 @@ msgstr "Где находится группа, например «Город, 
 #, php-format
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
+"Дополнительные имена для группы, разделённые запятой или пробелом, максимум %"
+"d имён"
 
 #: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
@@ -4647,7 +4672,7 @@ msgstr "Группа"
 
 #: lib/groupnav.php:101
 msgid "Blocked"
-msgstr "Заблокирован"
+msgstr "Заблокированные"
 
 #: lib/groupnav.php:102
 #, php-format
@@ -4722,7 +4747,7 @@ msgstr "Неподдерживаемый тип файла"
 #: lib/jabber.php:192
 #, php-format
 msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
 
 #: lib/joinform.php:114
 msgid "Join"
@@ -4730,7 +4755,7 @@ msgstr "Присоединиться"
 
 #: lib/leaveform.php:114
 msgid "Leave"
-msgstr "Выйти"
+msgstr "Покинуть"
 
 #: lib/logingroupnav.php:80
 msgid "Login with a username and password"
@@ -4749,8 +4774,11 @@ msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
+"У вас нет личных сообщений. Вы можете отправить личное сообщение для "
+"вовлечения других пользователей в разговор. Сообщения, получаемые от других "
+"людей, видите только вы."
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 msgid "from"
 msgstr "от "
 
@@ -4774,6 +4802,19 @@ msgid ""
 "Thanks for your time, \n"
 "%s\n"
 msgstr ""
+"Здраствуйте, %s.\n"
+"\n"
+"Кто-то только что ввёл этот email-адрес на %s.\n"
+"\n"
+"Если это были вы и вы хотите подтвердить введённые данные, используйте "
+"ссылку ниже:\n"
+"\n"
+"%s\n"
+"\n"
+"Если нет, просто проигнорируйте это сообщение.\n"
+"\n"
+"Благодарим за потраченное время,  \n"
+"%s\n"
 
 #: lib/mail.php:236
 #, php-format
@@ -4794,6 +4835,16 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %8$s\n"
 msgstr ""
+"%1$s сейчас следит за вашими записями на %2$s.\n"
+"\n"
+"%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Искренне ваш,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Измените email-адрес и настройки уведомлений на %8$s\n"
 
 #: lib/mail.php:254
 #, php-format
@@ -4811,7 +4862,7 @@ msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
-"Био: %s\n"
+"Биография: %s\n"
 "\n"
 
 #: lib/mail.php:286
@@ -4852,7 +4903,7 @@ msgstr "Подтверждение СМС"
 #: lib/mail.php:463
 #, php-format
 msgid "You've been nudged by %s"
-msgstr "Вас \"подтолкнул\" пользователь %s"
+msgstr "Вас «подтолкнул» пользователь %s"
 
 #: lib/mail.php:467
 #, php-format
@@ -4869,6 +4920,17 @@ msgid ""
 "With kind regards,\n"
 "%4$s\n"
 msgstr ""
+"%1$s (%2$s) интересуется, что произошло с вами за эти дни и предлагает "
+"отправить немного новостей.\n"
+"\n"
+"Мы ждём от вас этого :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Не отвечайте на это письмо, ответ никто не получит.\n"
+"\n"
+"С уважением,\n"
+"%4$s\n"
 
 #: lib/mail.php:510
 #, php-format
@@ -4893,6 +4955,20 @@ msgid ""
 "With kind regards,\n"
 "%5$s\n"
 msgstr ""
+"%1$s (%2$s) отправил вам личное сообщение:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Вы можете ответить на сообщение здесь:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Не отвечайте на это письмо; ответ не дойдёт до пользователя.\n"
+"\n"
+"С уважением,\n"
+"%5$s\n"
 
 #: lib/mail.php:559
 #, php-format
@@ -4919,11 +4995,27 @@ msgid ""
 "Faithfully yours,\n"
 "%6$s\n"
 msgstr ""
+"%1$s (@%7$s) только что добавил запись из %2$s в число своих любимых.\n"
+"\n"
+"URL-адрес записи:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Текст записи:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Вы можете просмотреть список любимых записей %1$s здесь:\n"
+"\n"
+"%5$s\n"
+"\n"
+"С уважением,\n"
+"%6$s\n"
 
 #: lib/mail.php:620
 #, php-format
 msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
+msgstr "%s (@%s)  отправил запись для вашего внимания"
 
 #: lib/mail.php:622
 #, php-format
@@ -4939,44 +5031,58 @@ msgid ""
 "\t%4$s\n"
 "\n"
 msgstr ""
+"%1$s (@%9$s) только что отправил запись для вашего внимания («@-ответ») на %2"
+"$s.\n"
+"\n"
+"Текст записи:\n"
+"\n"
+"%3$s\n"
+"\n"
+"Оно содержит:\n"
+"\n"
+"%4$s\n"
+"\n"
 
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
+"При сохранении вашего файла возникла ошибка базы данных. Пожалуйста, "
+"попробуйте ещё раз."
 
 #: lib/mediafile.php:142
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
+msgstr "Загружаемый файл превышает директиву upload_max_filesize в php.ini."
 
 #: lib/mediafile.php:147
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
+"Загружаемый файл превышает директиву MAX_FILE_SIZE, указанную в HTML-форме."
 
 #: lib/mediafile.php:152
 msgid "The uploaded file was only partially uploaded."
-msgstr ""
+msgstr "Загружаемый файл загружен только частично."
 
 #: lib/mediafile.php:159
 msgid "Missing a temporary folder."
-msgstr ""
+msgstr "Отсутствует временной каталог."
 
 #: lib/mediafile.php:162
 msgid "Failed to write file to disk."
-msgstr ""
+msgstr "Не удаётся записать файл на диск."
 
 #: lib/mediafile.php:165
 msgid "File upload stopped by extension."
-msgstr ""
+msgstr "Загрузка файла остановлена по расширению."
 
 #: lib/mediafile.php:179 lib/mediafile.php:216
 msgid "File exceeds user's quota!"
-msgstr ""
+msgstr "Файл превышает пользовательскую квоту!"
 
 #: lib/mediafile.php:196 lib/mediafile.php:233
 msgid "File could not be moved to destination directory."
-msgstr ""
+msgstr "Файл не может быть перемещён в целевую директорию."
 
 #: lib/mediafile.php:201 lib/mediafile.php:237
 msgid "Could not determine file's mime-type!"
@@ -4985,12 +5091,12 @@ msgstr "Не удаётся определить mime-тип файла!"
 #: lib/mediafile.php:270
 #, php-format
 msgid " Try using another %s format."
-msgstr ""
+msgstr " Попробуйте использовать другой формат %s."
 
 #: lib/mediafile.php:275
 #, php-format
 msgid "%s is not a supported filetype on this server."
-msgstr ""
+msgstr "Тип файла %s не поддерживается не этом сервере."
 
 #: lib/messageform.php:120
 msgid "Send a direct notice"
@@ -5021,20 +5127,41 @@ msgstr "Прикрепить"
 msgid "Attach a file"
 msgstr "Прикрепить файл"
 
-#: lib/noticelist.php:406
-msgid "at"
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:404
 #, fuzzy
+msgid "N"
+msgstr "Нет"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr "на"
+
+#: lib/noticelist.php:506
 msgid "in context"
-msgstr "Нет контента!"
+msgstr "в контексте"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr "Ответить на эту запись"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "Ответить"
 
@@ -5056,7 +5183,7 @@ msgstr "Ошибка при вставке нового профиля"
 
 #: lib/oauthstore.php:291
 msgid "Error inserting avatar"
-msgstr "Ошибка при вставке аватара"
+msgstr "Ошибка при вставке аватары"
 
 #: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
@@ -5137,7 +5264,7 @@ msgstr "Все группы"
 
 #: lib/profileformaction.php:123
 msgid "No return-to arguments"
-msgstr "Нет аргумента return-to."
+msgstr "Нет аргумента return-to"
 
 #: lib/profileformaction.php:137
 msgid "unimplemented method"
@@ -5164,19 +5291,21 @@ msgid "Popular"
 msgstr "Популярное"
 
 #: lib/sandboxform.php:67
-#, fuzzy
 msgid "Sandbox"
-msgstr "Входящие"
+msgstr "Песочница"
 
 #: lib/sandboxform.php:78
-#, fuzzy
 msgid "Sandbox this user"
-msgstr "Разблокировать пользователя."
+msgstr "Установить режим песочницы для этого пользователя"
 
 #: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Поиск по сайту"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 msgid "Search help"
 msgstr "Справка по поиску"
@@ -5210,14 +5339,12 @@ msgid "More..."
 msgstr "Далее…"
 
 #: lib/silenceform.php:67
-#, fuzzy
 msgid "Silence"
-msgstr "Новая запись"
+msgstr "Заглушить"
 
 #: lib/silenceform.php:78
-#, fuzzy
 msgid "Silence this user"
-msgstr "Заблокировать пользователя."
+msgstr "Заглушить этого пользователя."
 
 #: lib/subgroupnav.php:83
 #, php-format
@@ -5237,12 +5364,12 @@ msgstr "Группы, в которых состоит %s"
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
-msgstr ""
+msgstr "Облако собственных тегов людей"
 
 #: lib/subscriberspeopletagcloudsection.php:48
 #: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
-msgstr ""
+msgstr "Облако тегов людей"
 
 #: lib/subscriptionlist.php:126
 msgid "(none)"
@@ -5250,7 +5377,7 @@ msgstr "(пока ничего нет)"
 
 #: lib/subs.php:52
 msgid "Already subscribed!"
-msgstr ""
+msgstr "Уже подписаны!"
 
 #: lib/subs.php:56
 msgid "User has blocked you."
@@ -5265,9 +5392,8 @@ msgid "Could not subscribe other to you."
 msgstr "Не удаётся подписать других на вашу ленту."
 
 #: lib/subs.php:128
-#, fuzzy
 msgid "Not subscribed!"
-msgstr "Не подписан!"
+msgstr "Не подписаны!"
 
 #: lib/subs.php:140
 msgid "Couldn't delete subscription."
@@ -5283,21 +5409,19 @@ msgstr "Самые активные"
 
 #: lib/unsandboxform.php:69
 msgid "Unsandbox"
-msgstr ""
+msgstr "Снять режим песочницы"
 
 #: lib/unsandboxform.php:80
-#, fuzzy
 msgid "Unsandbox this user"
-msgstr "Разблокировать пользователя."
+msgstr "Снять режим песочницы с этого пользователя."
 
 #: lib/unsilenceform.php:67
 msgid "Unsilence"
-msgstr ""
+msgstr "Снять заглушение"
 
 #: lib/unsilenceform.php:78
-#, fuzzy
 msgid "Unsilence this user"
-msgstr "Разблокировать пользователя."
+msgstr "Снять заглушение с этого пользователя."
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
@@ -5309,7 +5433,7 @@ msgstr "Отписаться"
 
 #: lib/userprofile.php:116
 msgid "Edit Avatar"
-msgstr "Изменить аватар"
+msgstr "Изменить аватару"
 
 #: lib/userprofile.php:236
 msgid "User actions"
@@ -5376,14 +5500,16 @@ msgid "about a year ago"
 msgstr "около года назад"
 
 #: lib/webcolor.php:82
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not a valid color!"
-msgstr "URL Главной страницы неверен."
+msgstr "%s не допустимым подходящим цветом!"
 
 #: lib/webcolor.php:123
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
+"%s не является допустимым цветом! Используйте 3 или 6 шестнадцатеричных "
+"символов."
 
 #: scripts/maildaemon.php:48
 msgid "Could not parse message."
@@ -5400,3 +5526,6 @@ msgstr "Простите, это не Ваш входящий электронн
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "Простите, входящих писем нет."
+
+#~ msgid "same as password above"
+#~ msgstr "тот же пароль, что и выше"
diff --git a/locale/statusnet.po b/locale/statusnet.po
index ba171345f..9dfe77ce9 100644
--- a/locale/statusnet.po
+++ b/locale/statusnet.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+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"
@@ -539,7 +539,7 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr ""
 
@@ -761,7 +761,7 @@ msgstr ""
 msgid "Do not delete this notice"
 msgstr ""
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr ""
 
@@ -2005,8 +2005,8 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
 msgstr ""
 
 #: actions/passwordsettings.php:117
@@ -2457,10 +2457,6 @@ msgstr ""
 msgid "6 or more characters, and don't forget it!"
 msgstr ""
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr ""
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr ""
@@ -3893,7 +3889,7 @@ msgstr ""
 msgid "Help me!"
 msgstr ""
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr ""
 
@@ -4501,7 +4497,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 msgid "from"
 msgstr ""
 
@@ -4762,19 +4758,40 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr ""
 
@@ -4915,6 +4932,10 @@ msgstr ""
 msgid "Search site"
 msgstr ""
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 msgid "Search help"
 msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.mo b/locale/sv/LC_MESSAGES/statusnet.mo
index f4cbf79e2..521a03cf9 100644
Binary files a/locale/sv/LC_MESSAGES/statusnet.mo and b/locale/sv/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index d82a4fddc..f57279dc8 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:34:21+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:41:09+0000\n"
 "Language-Team: Swedish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: out-statusnet\n"
@@ -562,7 +562,7 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 #, fuzzy
 msgid "Delete"
 msgstr "Ta bort"
@@ -799,7 +799,7 @@ msgstr "Är du säker på att du vill tabort detta inlägg?"
 msgid "Do not delete this notice"
 msgstr "Kan inte ta bort detta inlägg."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 #, fuzzy
 msgid "Delete this notice"
 msgstr "Ta bort inlägg"
@@ -2166,9 +2166,9 @@ msgstr "Minst 6 tecken"
 msgid "Confirm"
 msgstr "Bekräfta"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "samma som lösenordet ovan"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Samma som lösenordet ovan"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2638,10 +2638,6 @@ msgstr "Okänd funktion"
 msgid "6 or more characters, and don't forget it!"
 msgstr "Minst 6 tecken och glöm inte bort det!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Samma som lösenordet ovan"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Återställ"
@@ -4192,7 +4188,7 @@ msgstr "Hjälp"
 msgid "Help me!"
 msgstr "Hjälp"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Sök"
 
@@ -4844,7 +4840,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr "från"
@@ -5121,21 +5117,43 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Nej"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "Inget innehåll!"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Svara på detta inlägg"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 #, fuzzy
 msgid "Reply"
 msgstr "svar"
@@ -5285,6 +5303,10 @@ msgstr "Ingen sådan användare"
 msgid "Search site"
 msgstr "Sök"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5518,3 +5540,6 @@ msgstr "Ledsen, men det är inte din inkommande emailadress."
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "Ledsen, men inga inkommande email är tillåtna."
+
+#~ msgid "same as password above"
+#~ msgstr "samma som lösenordet ovan"
diff --git a/locale/te/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo
index 5dc5626fb..57ef65ae9 100644
Binary files a/locale/te/LC_MESSAGES/statusnet.mo and b/locale/te/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 8ac2a54f7..216d232e8 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:34:24+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:41:12+0000\n"
 "Language-Team: Telugu\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: out-statusnet\n"
@@ -551,7 +551,7 @@ msgid "Preview"
 msgstr "మునుజూపు"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr "తొలగించు"
 
@@ -778,7 +778,7 @@ msgstr "మీరు నిజంగానే ఈ నోటీసుని త
 msgid "Do not delete this notice"
 msgstr "ఈ నోటీసుని తొలగించలేము."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr "ఈ నోటీసుని తొలగించు"
 
@@ -2052,8 +2052,8 @@ msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షర
 msgid "Confirm"
 msgstr "నిర్థారించు"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
 msgstr "పై సంకేతపదం వలెనే"
 
 #: actions/passwordsettings.php:117
@@ -2521,10 +2521,6 @@ msgstr ""
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు, మర్చిపోకండి!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "పై సంకేతపదం వలెనే"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr ""
@@ -4004,7 +4000,7 @@ msgstr "సహాయం"
 msgid "Help me!"
 msgstr "సహాయం"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "వెతుకు"
 
@@ -4644,7 +4640,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 msgid "from"
 msgstr "నుండి"
 
@@ -4907,20 +4903,42 @@ msgstr "జోడించు"
 msgid "Attach a file"
 msgstr "ఒక ఫైలుని జోడించు"
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "కాదు"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "విషయం లేదు!"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr "ఈ నోటీసుపై స్పందించండి"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "స్పందించండి"
 
@@ -5066,6 +5084,10 @@ msgstr "అటువంటి వాడుకరి లేరు."
 msgid "Search site"
 msgstr "వెతుకు"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5292,3 +5314,6 @@ msgstr ""
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr ""
+
+#~ msgid "same as password above"
+#~ msgstr "పై సంకేతపదం వలెనే"
diff --git a/locale/tr/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo
index 2a6bbeb6a..bd96bd84c 100644
Binary files a/locale/tr/LC_MESSAGES/statusnet.mo and b/locale/tr/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 9137bcadc..560730940 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:34:27+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:41:14+0000\n"
 "Language-Team: Turkish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: out-statusnet\n"
@@ -561,7 +561,7 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr ""
 
@@ -794,7 +794,7 @@ msgstr ""
 msgid "Do not delete this notice"
 msgstr "Böyle bir durum mesajı yok."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr ""
 
@@ -2108,9 +2108,9 @@ msgstr "6 veya daha fazla karakter"
 msgid "Confirm"
 msgstr "Onayla"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "yukaridaki parola ile aynı"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "yukarıdaki parolanın aynısı"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2581,10 +2581,6 @@ msgstr ""
 msgid "6 or more characters, and don't forget it!"
 msgstr "Unutmayın, 6 veya daha fazla karakter"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "yukarıdaki parolanın aynısı"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Sıfırla"
@@ -4083,7 +4079,7 @@ msgstr "Yardım"
 msgid "Help me!"
 msgstr "Yardım"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Ara"
 
@@ -4726,7 +4722,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 msgid "from"
 msgstr ""
 
@@ -4996,20 +4992,41 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "İçerik yok!"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 #, fuzzy
 msgid "Reply"
 msgstr "cevapla"
@@ -5157,6 +5174,10 @@ msgstr "Böyle bir kullanıcı yok."
 msgid "Search site"
 msgstr "Ara"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5385,3 +5406,6 @@ msgstr ""
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr ""
+
+#~ msgid "same as password above"
+#~ msgstr "yukaridaki parola ile aynı"
diff --git a/locale/uk/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo
index e2ebe387c..a1a86b88e 100644
Binary files a/locale/uk/LC_MESSAGES/statusnet.mo and b/locale/uk/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 2ab069f86..ce3b7a0db 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:34:29+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:41:17+0000\n"
 "Language-Team: Ukrainian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: out-statusnet\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10< =4 && (n%100<10 or n%100>=20) ? 1 : 2);\n"
 
 #: actions/all.php:63 actions/public.php:97 actions/replies.php:92
 #: actions/showfavorites.php:137 actions/tag.php:51
@@ -561,7 +561,7 @@ msgid "Preview"
 msgstr "Перегляд"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Видалити"
 
@@ -795,7 +795,7 @@ msgstr "Ви впевненні, що бажаєте видалити це по
 msgid "Do not delete this notice"
 msgstr "Не можна видалити це повідомлення."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr "Видалити повідомлення"
 
@@ -2158,9 +2158,9 @@ msgstr "6 або більше знаків"
 msgid "Confirm"
 msgstr "Підтвердити"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "такий само, як і пароль вище"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Такий само, як і пароль вище"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2634,10 +2634,6 @@ msgstr "Дія невідома"
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 або більше знаків, і не забудьте їх!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Такий само, як і пароль вище"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Скинути"
@@ -4178,7 +4174,7 @@ msgstr "Допомога"
 msgid "Help me!"
 msgstr "Допоможіть!"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Пошук"
 
@@ -4815,7 +4811,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr " від "
@@ -5093,20 +5089,42 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Ні"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "Немає змісту!"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr "Відповісти на це повідомлення"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "Відповісти"
 
@@ -5254,6 +5272,10 @@ msgstr "Розблокувати цього користувача"
 msgid "Search site"
 msgstr "Пошук"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5481,3 +5503,6 @@ msgstr "Вибачте, але це не є вашою електронною а
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 "Вибачте, але не затверджено жодної електронної адреси для вхідної пошти."
+
+#~ msgid "same as password above"
+#~ msgstr "такий само, як і пароль вище"
diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo
index 927abd17a..5c3c0983e 100644
Binary files a/locale/vi/LC_MESSAGES/statusnet.mo and b/locale/vi/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index bc03f8b59..c84800d14 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:34:32+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:41:20+0000\n"
 "Language-Team: Vietnamese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: vi\n"
 "X-Message-Group: out-statusnet\n"
@@ -566,7 +566,7 @@ msgid "Preview"
 msgstr "Xem trước"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 #, fuzzy
 msgid "Delete"
 msgstr "Xóa tin nhắn"
@@ -801,7 +801,7 @@ msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
 msgid "Do not delete this notice"
 msgstr "Không thể xóa tin nhắn này."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 #, fuzzy
 msgid "Delete this notice"
 msgstr "Xóa tin nhắn"
@@ -2202,9 +2202,9 @@ msgstr "Nhiều hơn 6 ký tự"
 msgid "Confirm"
 msgstr "Xác nhận"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
-msgstr "cùng mật khẩu ở trên"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Cùng mật khẩu ở trên"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -2680,10 +2680,6 @@ msgstr "Không tìm thấy action"
 msgid "6 or more characters, and don't forget it!"
 msgstr "Nhiều hơn 6 ký tự, đừng quên nó!"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "Cùng mật khẩu ở trên"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Khởi tạo"
@@ -4240,7 +4236,7 @@ msgstr "Hướng dẫn"
 msgid "Help me!"
 msgstr "Hướng dẫn"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "Tìm kiếm"
 
@@ -4899,7 +4895,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr " từ "
@@ -5220,21 +5216,43 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "Không"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "Không có nội dung!"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Trả lời tin nhắn này"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr "Trả lời"
 
@@ -5388,6 +5406,10 @@ msgstr "Bỏ chặn người dùng này"
 msgid "Search site"
 msgstr "Tìm kiếm"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5625,3 +5647,6 @@ msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập v
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "Xin lỗi, không có địa chỉ email cho phép."
+
+#~ msgid "same as password above"
+#~ msgstr "cùng mật khẩu ở trên"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo
index 10d4d1766..9286ba9fa 100644
Binary files a/locale/zh_CN/LC_MESSAGES/statusnet.mo and b/locale/zh_CN/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 9a368ee83..9ce51a9d2 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -1,6 +1,5 @@
 # Translation of StatusNet to Simplified Chinese
 #
-# Author: Gouki <gouki@goukihq.org>, 2008
 # --
 # Messages of identi.ca
 # Copyright (C) 2008 Gouki <gouki@goukihq.org>
@@ -10,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:34:35+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:41:22+0000\n"
 "Language-Team: Simplified Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: out-statusnet\n"
@@ -562,7 +561,7 @@ msgid "Preview"
 msgstr "预览"
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 #, fuzzy
 msgid "Delete"
 msgstr "删除"
@@ -798,7 +797,7 @@ msgstr "确定要删除这条消息吗？"
 msgid "Do not delete this notice"
 msgstr "无法删除通告。"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 #, fuzzy
 msgid "Delete this notice"
 msgstr "删除通告"
@@ -2142,8 +2141,8 @@ msgstr "6 个或更多字符"
 msgid "Confirm"
 msgstr "确认"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
 msgstr "相同的密码"
 
 #: actions/passwordsettings.php:117
@@ -2613,10 +2612,6 @@ msgstr "未知动作"
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 个或更多字符，不能忘记！"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr "相同的密码"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "重置"
@@ -4151,7 +4146,7 @@ msgstr "帮助"
 msgid "Help me!"
 msgstr "帮助"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr "搜索"
 
@@ -4803,7 +4798,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 #, fuzzy
 msgid "from"
 msgstr " 从 "
@@ -5082,21 +5077,43 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+#, fuzzy
+msgid "N"
+msgstr "否"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "没有内容！"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "无法删除通告。"
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 #, fuzzy
 msgid "Reply"
 msgstr "回复"
@@ -5249,6 +5266,10 @@ msgstr "取消阻止次用户"
 msgid "Search site"
 msgstr "搜索"
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 #, fuzzy
 msgid "Search help"
@@ -5484,3 +5505,6 @@ msgstr "对不起，这个发布用的电子邮件属于其他用户。"
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
 msgstr "对不起，发布用的电子邮件无法使用。"
+
+#~ msgid "same as password above"
+#~ msgstr "相同的密码"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo
index d82c7e166..c3d37ee16 100644
Binary files a/locale/zh_TW/LC_MESSAGES/statusnet.mo and b/locale/zh_TW/LC_MESSAGES/statusnet.mo differ
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 78eb45f79..08460ad0e 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-21 11:33+0000\n"
-"PO-Revision-Date: 2009-11-21 11:34:37+0000\n"
+"POT-Creation-Date: 2009-11-22 18:40+0000\n"
+"PO-Revision-Date: 2009-11-22 18:41:25+0000\n"
 "Language-Team: Traditional Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59306); Translate extension (2009-11-16)\n"
+"X-Generator: MediaWiki 1.16alpha(r59338); Translate extension (2009-11-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hant\n"
 "X-Message-Group: out-statusnet\n"
@@ -555,7 +555,7 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:148 lib/deleteuserform.php:66
-#: lib/noticelist.php:546
+#: lib/noticelist.php:550
 msgid "Delete"
 msgstr ""
 
@@ -788,7 +788,7 @@ msgstr ""
 msgid "Do not delete this notice"
 msgstr "無此通知"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:546
+#: actions/deletenotice.php:146 lib/noticelist.php:550
 msgid "Delete this notice"
 msgstr ""
 
@@ -2068,8 +2068,8 @@ msgstr "6個以上字元"
 msgid "Confirm"
 msgstr "確認"
 
-#: actions/passwordsettings.php:113
-msgid "same as password above"
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
 msgstr ""
 
 #: actions/passwordsettings.php:117
@@ -2529,10 +2529,6 @@ msgstr ""
 msgid "6 or more characters, and don't forget it!"
 msgstr "6個或6個以上字元，別忘了自己密碼喔"
 
-#: actions/recoverpassword.php:240
-msgid "Same as password above"
-msgstr ""
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr ""
@@ -4007,7 +4003,7 @@ msgstr "求救"
 msgid "Help me!"
 msgstr "求救"
 
-#: lib/action.php:464
+#: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
 msgstr ""
 
@@ -4638,7 +4634,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:448
+#: lib/mailbox.php:227 lib/noticelist.php:452
 msgid "from"
 msgstr ""
 
@@ -4909,20 +4905,41 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticelist.php:406
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr ""
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:411
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:506
 #, fuzzy
 msgid "in context"
 msgstr "無內容"
 
-#: lib/noticelist.php:522
+#: lib/noticelist.php:526
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:523
+#: lib/noticelist.php:527
 msgid "Reply"
 msgstr ""
 
@@ -5067,6 +5084,10 @@ msgstr "無此使用者"
 msgid "Search site"
 msgstr ""
 
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
 #: lib/searchaction.php:162
 msgid "Search help"
 msgstr ""
-- 
cgit v1.2.3-54-g00ecf