summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
Diffstat (limited to 'locale')
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po219
-rw-r--r--locale/arz/LC_MESSAGES/statusnet.po219
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po225
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po223
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po225
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po464
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po223
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po223
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po223
-rw-r--r--locale/fa/LC_MESSAGES/statusnet.po219
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po225
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po219
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po225
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po225
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po219
-rw-r--r--locale/ia/LC_MESSAGES/statusnet.po219
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po225
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po221
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po219
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po225
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po221
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po223
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po219
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po225
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po219
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po219
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po264
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po219
-rw-r--r--locale/statusnet.po214
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po219
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po223
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po225
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po219
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po227
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po227
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po223
36 files changed, 4067 insertions, 4204 deletions
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 3d3fca98c..ebaf7290c 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:55:38+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:02:19+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n"
@@ -100,7 +100,6 @@ msgstr "لا صفحة كهذه"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "لا مستخدم كهذا."
@@ -543,7 +542,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "الحساب"
@@ -918,7 +917,7 @@ msgstr "أنت لست مالك هذا التطبيق."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -1638,7 +1637,7 @@ msgstr "%1$s أعضاء المجموعة, الصفحة %2$d"
msgid "A list of the users in this group."
msgstr "قائمة بمستخدمي هذه المجموعة."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "إداري"
@@ -1968,7 +1967,7 @@ msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
msgid "Error setting user. You are probably not authorized."
msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "لُج"
@@ -2896,7 +2895,7 @@ msgstr "عذرا، رمز دعوة غير صالح."
msgid "Registration successful"
msgstr "نجح التسجيل"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "سجّل"
@@ -3726,7 +3725,8 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "تعذّر حفظ الاشتراك."
@@ -4148,7 +4148,7 @@ msgstr ""
msgid "Plugins"
msgstr "ملحقات"
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "النسخة"
@@ -4207,49 +4207,73 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr "مشكلة في حفظ الإشعار. طويل جدًا."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "مشكلة في حفظ الإشعار. مستخدم غير معروف."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "مشكلة أثناء حفظ الإشعار."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "مشكلة أثناء حفظ الإشعار."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تي @%1$s %2$s"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "مُشترك أصلا!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "لقد منعك المستخدم."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "غير مشترك!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "لم يمكن حذف اشتراك ذاتي."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "تعذّر حذف الاشتراك."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "أهلا بكم في %1$s يا @%2$s!"
@@ -4299,124 +4323,124 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "صفحة غير مُعنونة"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "الرئيسية"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "الملف الشخصي ومسار الأصدقاء الزمني"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "اتصل"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "غيّر ضبط الموقع"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "ادعُ"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "اخرج"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "اخرج من الموقع"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "أنشئ حسابًا"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "لُج إلى الموقع"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "مساعدة"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "ساعدني!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "ابحث"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "ابحث عن أشخاص أو نص"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "إشعار الموقع"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "المشاهدات المحلية"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "إشعار الصفحة"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "عن"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "الأسئلة المكررة"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr "الشروط"
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "خصوصية"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "المصدر"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "اتصل"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "رخصة برنامج StatusNet"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4425,12 +4449,12 @@ msgstr ""
"**%%site.name%%** خدمة تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4441,41 +4465,41 @@ msgstr ""
"المتوفر تحت [رخصة غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/"
"agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "رخصة محتوى الموقع"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "الرخصة."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "بعد"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "قبل"
@@ -4775,54 +4799,59 @@ msgstr "خطأ أثناء حفظ الإشعار."
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "لا مستخدم كهذا."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "مُشترك ب%s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr "لست مُشتركًا بأي أحد."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "لست مشتركًا بأحد."
@@ -4832,11 +4861,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "لا أحد مشترك بك."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "لا أحد مشترك بك."
@@ -4846,11 +4875,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "لست عضوًا في أي مجموعة."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "لست عضوًا في أي مجموعة."
@@ -4860,7 +4889,7 @@ msgstr[3] "أنت عضو في هذه المجموعات:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5522,10 +5551,6 @@ msgstr "خطأ أثناء إدراج الملف الشخصي البعيد"
msgid "Duplicate notice"
msgstr "ضاعف الإشعار"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "تعذّر إدراج اشتراك جديد."
@@ -5702,34 +5727,6 @@ msgstr "الأشخاص المشتركون ب%s"
msgid "Groups %s is a member of"
msgstr "المجموعات التي %s عضو فيها"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "مُشترك أصلا!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "لقد منعك المستخدم."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "تعذّر الاشتراك."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "غير مشترك!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "لم يمكن حذف اشتراك ذاتي."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "تعذّر حذف الاشتراك."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 2163be1b4..9c0e7c4dd 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:55:41+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:02:22+0000\n"
"Language-Team: Egyptian Spoken Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: arz\n"
"X-Message-Group: out-statusnet\n"
@@ -104,7 +104,6 @@ msgstr "لا صفحه كهذه"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "لا مستخدم كهذا."
@@ -547,7 +546,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "الحساب"
@@ -922,7 +921,7 @@ msgstr "انت مش بتملك الapplication دى."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -1642,7 +1641,7 @@ msgstr "%1$s اعضاء الجروپ, صفحه %2$d"
msgid "A list of the users in this group."
msgstr "قائمه بمستخدمى هذه المجموعه."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "إداري"
@@ -1972,7 +1971,7 @@ msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
msgid "Error setting user. You are probably not authorized."
msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "لُج"
@@ -2897,7 +2896,7 @@ msgstr "عذرا، رمز دعوه غير صالح."
msgid "Registration successful"
msgstr "نجح التسجيل"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "سجّل"
@@ -3727,7 +3726,8 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "تعذّر حفظ الاشتراك."
@@ -4149,7 +4149,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "النسخه"
@@ -4208,49 +4208,73 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr "مشكله فى حفظ الإشعار. طويل جدًا."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "مشكله فى حفظ الإشعار. مستخدم غير معروف."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "مشكله أثناء حفظ الإشعار."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "مشكله أثناء حفظ الإشعار."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تى @%1$s %2$s"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "مُشترك أصلا!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "لقد منعك المستخدم."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "غير مشترك!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "ما نفعش يمسح الاشتراك الشخصى."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "تعذّر حذف الاشتراك."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "أهلا بكم فى %1$s يا @%2$s!"
@@ -4300,124 +4324,124 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "صفحه غير مُعنونة"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "الرئيسية"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "الملف الشخصى ومسار الأصدقاء الزمني"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "اتصل"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "غيّر ضبط الموقع"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "ادعُ"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "اخرج"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "اخرج من الموقع"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "أنشئ حسابًا"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "لُج إلى الموقع"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "مساعدة"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "ساعدني!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "ابحث"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "ابحث عن أشخاص أو نص"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "إشعار الموقع"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "المشاهدات المحلية"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "إشعار الصفحة"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "عن"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "الأسئله المكررة"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr "الشروط"
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "خصوصية"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "المصدر"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "اتصل"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4426,12 +4450,12 @@ msgstr ""
"**%%site.name%%** خدمه تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4442,41 +4466,41 @@ msgstr ""
"المتوفر تحت [رخصه غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/"
"agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "رخصه محتوى الموقع"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "الرخصه."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "بعد"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "قبل"
@@ -4776,54 +4800,59 @@ msgstr "خطأ أثناء حفظ الإشعار."
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "لا مستخدم كهذا."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "مُشترك ب%s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr "لست مُشتركًا بأى أحد."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "لست مشتركًا بأحد."
@@ -4833,11 +4862,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "لا أحد مشترك بك."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "لا أحد مشترك بك."
@@ -4847,11 +4876,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "لست عضوًا فى أى مجموعه."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "لست عضوًا فى أى مجموعه."
@@ -4861,7 +4890,7 @@ msgstr[3] "أنت عضو فى هذه المجموعات:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5513,10 +5542,6 @@ msgstr "خطأ أثناء إدراج الملف الشخصى البعيد"
msgid "Duplicate notice"
msgstr "ضاعف الإشعار"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "تعذّر إدراج اشتراك جديد."
@@ -5693,34 +5718,6 @@ msgstr "الأشخاص المشتركون ب%s"
msgid "Groups %s is a member of"
msgstr "المجموعات التى %s عضو فيها"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "مُشترك أصلا!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "لقد منعك المستخدم."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "تعذّر الاشتراك."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "غير مشترك!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "ما نفعش يمسح الاشتراك الشخصى."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "تعذّر حذف الاشتراك."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 973f57496..873dcfb61 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:55:44+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:02:26+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: out-statusnet\n"
@@ -99,7 +99,6 @@ msgstr "Няма такака страница."
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Няма такъв потребител"
@@ -553,7 +552,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Сметка"
@@ -934,7 +933,7 @@ msgstr "Не членувате в тази група."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Имаше проблем със сесията ви в сайта."
@@ -1691,7 +1690,7 @@ msgstr "Членове на групата %s, страница %d"
msgid "A list of the users in this group."
msgstr "Списък с потребителите в тази група."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Настройки"
@@ -2068,7 +2067,7 @@ msgstr "Грешно име или парола."
msgid "Error setting user. You are probably not authorized."
msgstr "Забранено."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
@@ -3017,7 +3016,7 @@ msgstr "Грешка в кода за потвърждение."
msgid "Registration successful"
msgstr "Записването е успешно."
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистриране"
@@ -3884,7 +3883,8 @@ msgstr "Не е въведен код."
msgid "You are not subscribed to that profile."
msgstr "Не сте абонирани за този профил"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "Грешка при създаване на нов абонамент."
@@ -4328,7 +4328,7 @@ msgstr ""
msgid "Plugins"
msgstr "Приставки"
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Версия"
@@ -4391,23 +4391,23 @@ msgstr "Грешка при обновяване на бележката с но
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:215
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Проблем при записване на бележката."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Грешка при записване на бележката. Непознат потребител."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
"отново след няколко минути."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4416,30 +4416,57 @@ msgstr ""
"Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
"отново след няколко минути."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "Забранено ви е да публикувате бележки в този сайт."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Проблем при записване на бележката."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Проблем при записване на бележката."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Потребителят е забранил да се абонирате за него."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Потребителят ви е блокирал."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Не сте абонирани!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Грешка при изтриване на абонамента."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Грешка при изтриване на абонамента."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добре дошли в %1$s, @%2$s!"
@@ -4491,128 +4518,128 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Неозаглавена страница"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Начало"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Промяна на поща, аватар, парола, профил"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Свързване"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Свързване към услуги"
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Промяна настройките на сайта"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Покани"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Поканете приятели и колеги да се присъединят към вас в %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Изход"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Излизане от сайта"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Създаване на нова сметка"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Влизане в сайта"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Помощ"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgid "Help me!"
msgstr "Помощ"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Търсене"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Търсене за хора или бележки"
-#: lib/action.php:494
+#: lib/action.php:493
#, fuzzy
msgid "Site notice"
msgstr "Нова бележка"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:626
+#: lib/action.php:625
#, fuzzy
msgid "Page notice"
msgstr "Нова бележка"
-#: lib/action.php:728
+#: lib/action.php:727
#, fuzzy
msgid "Secondary site navigation"
msgstr "Абонаменти"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Относно"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "Въпроси"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr "Условия"
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Поверителност"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Изходен код"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr "Табелка"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Лиценз на програмата StatusNet"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4621,12 +4648,12 @@ msgstr ""
"**%%site.name%%** е услуга за микроблогване, предоставена ви от [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** е услуга за микроблогване. "
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4637,41 +4664,41 @@ msgstr ""
"достъпна под [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "Лиценз на съдържанието"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "Всички "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "лиценз."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Страниране"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "След"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Преди"
@@ -4985,80 +5012,85 @@ msgstr "Грешка при записване на бележката."
msgid "Specify the name of the user to subscribe to"
msgstr "Уточнете името на потребителя, за когото се абонирате."
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Няма такъв потребител"
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Абонирани сте за %s."
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Уточнете името на потребителя, от когото се отписвате."
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Отписани сте от %s."
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Командата все още не се поддържа."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Уведомлението е изключено."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Грешка при изключване на уведомлението."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Уведомлението е включено."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Грешка при включване на уведомлението."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr "Не сте абонирани за никого."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Вече сте абонирани за следните потребители:"
msgstr[1] "Вече сте абонирани за следните потребители:"
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "Никой не е абониран за вас."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Грешка при абониране на друг потребител за вас."
msgstr[1] "Грешка при абониране на друг потребител за вас."
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "Не членувате в нито една група."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Не членувате в тази група."
msgstr[1] "Не членувате в тази група."
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5731,11 +5763,6 @@ msgstr "Грешка при вмъкване на отдалечен профи
msgid "Duplicate notice"
msgstr "Изтриване на бележката"
-#: lib/oauthstore.php:465 lib/subs.php:48
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "Потребителят е забранил да се абонирате за него."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Грешка при добавяне на нов абонамент."
@@ -5919,36 +5946,6 @@ msgstr "Абонирани за %s"
msgid "Groups %s is a member of"
msgstr "Групи, в които участва %s"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Потребителят ви е блокирал."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Грешка при абониране."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Грешка при абониране на друг потребител за вас."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Не сте абонирани!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Грешка при изтриване на абонамента."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Грешка при изтриване на абонамента."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index e141f0a0d..48cd84bcc 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:55:48+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:02:28+0000\n"
"Language-Team: Catalan\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: out-statusnet\n"
@@ -105,7 +105,6 @@ msgstr "No existeix la pàgina."
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "No existeix aquest usuari."
@@ -569,7 +568,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Compte"
@@ -954,7 +953,7 @@ msgstr "No sou un membre del grup."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Ha ocorregut algun problema amb la teva sessió."
@@ -1711,7 +1710,7 @@ msgstr "%s membre/s en el grup, pàgina %d"
msgid "A list of the users in this group."
msgstr "La llista dels usuaris d'aquest grup."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
@@ -2091,7 +2090,7 @@ msgstr "Nom d'usuari o contrasenya incorrectes."
msgid "Error setting user. You are probably not authorized."
msgstr "No autoritzat."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inici de sessió"
@@ -3061,7 +3060,7 @@ msgstr "El codi d'invitació no és vàlid."
msgid "Registration successful"
msgstr "Registre satisfactori"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registre"
@@ -3949,7 +3948,8 @@ msgstr "No hi ha cap codi entrat"
msgid "You are not subscribed to that profile."
msgstr "No estàs subscrit a aquest perfil."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "No s'ha pogut guardar la subscripció."
@@ -4396,7 +4396,7 @@ msgstr ""
msgid "Plugins"
msgstr "Connectors"
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Sessions"
@@ -4460,23 +4460,23 @@ msgstr "No s'ha pogut inserir el missatge amb la nova URI."
msgid "DB error inserting hashtag: %s"
msgstr "Hashtag de l'error de la base de dades:%s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Problema en guardar l'avís."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Problema al guardar la notificació. Usuari desconegut."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Masses notificacions massa ràpid; pren un respir i publica de nou en uns "
"minuts."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4485,30 +4485,56 @@ msgstr ""
"Masses notificacions massa ràpid; pren un respir i publica de nou en uns "
"minuts."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "Ha estat bandejat de publicar notificacions en aquest lloc."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Problema en guardar l'avís."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problema en guardar l'avís."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Error de BD en inserir resposta: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Se us ha banejat la subscripció."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Ja hi esteu subscrit!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Un usuari t'ha bloquejat."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "No estàs subscrit!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "No s'ha pogut eliminar la subscripció."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "No s'ha pogut eliminar la subscripció."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Us donem la benvinguda a %1$s, @%2$s!"
@@ -4559,125 +4585,125 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Pàgina sense titol"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Navegació primària del lloc"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Inici"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Perfil personal i línia temporal dels amics"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Canviar correu electrònic, avatar, contrasenya, perfil"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Connexió"
-#: lib/action.php:445
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "No s'ha pogut redirigir al servidor: %s"
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Canvia la configuració del lloc"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Convida"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convidar amics i companys perquè participin a %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Finalitza la sessió"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Finalitza la sessió del lloc"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Crea un compte"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Inicia una sessió al lloc"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Ajuda"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Ajuda'm"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Cerca"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Cerca gent o text"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "Avís del lloc"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "Vistes locals"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "Notificació pàgina"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Navegació del lloc secundària"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Quant a"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "Preguntes més freqüents"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Privadesa"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Font"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Contacte"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr "Insígnia"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Llicència del programari StatusNet"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4686,12 +4712,12 @@ msgstr ""
"**%%site.name%%** és un servei de microblogging de [%%site.broughtby%%**](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** és un servei de microblogging."
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4702,41 +4728,41 @@ msgstr ""
"%s, disponible sota la [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "Llicència de contingut del lloc"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "Tot "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "llicència."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginació"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "Posteriors"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Anteriors"
@@ -5048,82 +5074,87 @@ msgstr "Problema en guardar l'avís."
msgid "Specify the name of the user to subscribe to"
msgstr "Especifica el nom de l'usuari a que vols subscriure't"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "No existeix aquest usuari."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Subscrit a %s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Especifica el nom de l'usuari del que vols deixar d'estar subscrit"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Has deixat d'estar subscrit a %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Comanda encara no implementada."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notificacions off."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "No es poden posar en off les notificacions."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notificacions on."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "No es poden posar en on les notificacions."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "No estàs subscrit a aquest perfil."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ja estàs subscrit a aquests usuaris:"
msgstr[1] "Ja estàs subscrit a aquests usuaris:"
-#: lib/command.php:690
+#: lib/command.php:703
#, fuzzy
msgid "No one is subscribed to you."
msgstr "No pots subscriure a un altre a tu mateix."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "No pots subscriure a un altre a tu mateix."
msgstr[1] "No pots subscriure a un altre a tu mateix."
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "No sou membre de cap grup."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Sou un membre d'aquest grup:"
msgstr[1] "Sou un membre d'aquests grups:"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5799,10 +5830,6 @@ msgstr "Error en inserir perfil remot"
msgid "Duplicate notice"
msgstr "Eliminar nota."
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Se us ha banejat la subscripció."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "No s'ha pogut inserir una nova subscripció."
@@ -5984,36 +6011,6 @@ msgstr "Persones subscrites a %s"
msgid "Groups %s is a member of"
msgstr "%s grups són membres de"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Ja hi esteu subscrit!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Un usuari t'ha bloquejat."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "No pots subscriure."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "No pots subscriure a un altre a tu mateix."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "No estàs subscrit!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "No s'ha pogut eliminar la subscripció."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "No s'ha pogut eliminar la subscripció."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 192a6572e..2d6cdda17 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:55:51+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:02:31+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: out-statusnet\n"
@@ -106,7 +106,6 @@ msgstr "Žádné takové oznámení."
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Žádný takový uživatel."
@@ -564,7 +563,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
#, fuzzy
msgid "Account"
msgstr "O nás"
@@ -957,7 +956,7 @@ msgstr "Neodeslal jste nám profil"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -1719,7 +1718,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -2069,7 +2068,7 @@ msgstr "Neplatné jméno nebo heslo"
msgid "Error setting user. You are probably not authorized."
msgstr "Neautorizován."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Přihlásit"
@@ -3030,7 +3029,7 @@ msgstr "Chyba v ověřovacím kódu"
msgid "Registration successful"
msgstr "Registrace úspěšná"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrovat"
@@ -3890,7 +3889,8 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr "Neodeslal jste nám profil"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "Nelze vytvořit odebírat"
@@ -4342,7 +4342,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Osobní"
@@ -4405,51 +4405,78 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:215
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:218
+#: classes/Notice.php:219
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Chyba v DB při vkládání odpovědi: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Uživatel nemá profil."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Nepřihlášen!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Nelze smazat odebírání"
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Nelze smazat odebírání"
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
@@ -4503,130 +4530,130 @@ msgstr "%1 statusů na %2"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Domů"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Připojit"
-#: lib/action.php:445
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Nelze přesměrovat na server: %s"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "Odběry"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Odhlásit"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:464
+#: lib/action.php:463
#, fuzzy
msgid "Create an account"
msgstr "Vytvořit nový účet"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Nápověda"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Pomoci mi!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Hledat"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:494
+#: lib/action.php:493
#, fuzzy
msgid "Site notice"
msgstr "Nové sdělení"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:626
+#: lib/action.php:625
#, fuzzy
msgid "Page notice"
msgstr "Nové sdělení"
-#: lib/action.php:728
+#: lib/action.php:727
#, fuzzy
msgid "Secondary site navigation"
msgstr "Odběry"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "O nás"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Soukromí"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Zdroj"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4635,12 +4662,12 @@ msgstr ""
"**%%site.name%%** je služba microblogů, kterou pro vás poskytuje [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** je služba mikroblogů."
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4651,43 +4678,43 @@ msgstr ""
"dostupná pod [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "Nové sdělení"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1142
+#: lib/action.php:1141
#, fuzzy
msgid "After"
msgstr "« Novější"
-#: lib/action.php:1150
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "Starší »"
@@ -5002,86 +5029,91 @@ msgstr "Problém při ukládání sdělení"
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Žádný takový uživatel."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Neodeslal jste nám profil"
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Neodeslal jste nám profil"
msgstr[1] "Neodeslal jste nám profil"
msgstr[2] ""
-#: lib/command.php:690
+#: lib/command.php:703
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Vzdálený odběr"
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Vzdálený odběr"
msgstr[1] "Vzdálený odběr"
msgstr[2] ""
-#: lib/command.php:712
+#: lib/command.php:725
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Neodeslal jste nám profil"
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Neodeslal jste nám profil"
msgstr[1] "Neodeslal jste nám profil"
msgstr[2] ""
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5763,10 +5795,6 @@ msgstr "Chyba při vkládaní vzdáleného profilu"
msgid "Duplicate notice"
msgstr "Nové sdělení"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Nelze vložit odebírání"
@@ -5952,37 +5980,6 @@ msgstr "Vzdálený odběr"
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-#, fuzzy
-msgid "User has blocked you."
-msgstr "Uživatel nemá profil."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr ""
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Nepřihlášen!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Nelze smazat odebírání"
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Nelze smazat odebírání"
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 6578c2f5c..820fffcab 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -13,12 +13,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:55:55+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:02:34+0000\n"
"Language-Team: German\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: out-statusnet\n"
@@ -109,7 +109,6 @@ msgstr "Seite nicht vorhanden"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Unbekannter Benutzer."
@@ -568,7 +567,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Konto"
@@ -951,7 +950,7 @@ msgstr "Du bist kein Mitglied dieser Gruppe."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Es gab ein Problem mit deinem Sessiontoken."
@@ -1702,7 +1701,7 @@ msgstr "%s Gruppen-Mitglieder, Seite %d"
msgid "A list of the users in this group."
msgstr "Liste der Benutzer in dieser Gruppe."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
@@ -2090,7 +2089,7 @@ msgid "Error setting user. You are probably not authorized."
msgstr ""
"Fehler beim setzen des Benutzers. Du bist vermutlich nicht autorisiert."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Anmelden"
@@ -2386,7 +2385,7 @@ msgstr "Profil-Einstellungen ansehen"
#: actions/othersettings.php:123
msgid "Show or hide profile designs."
-msgstr ""
+msgstr "Prifil-Designs anzeigen oder verstecken."
#: actions/othersettings.php:153
msgid "URL shortening service is too long (max 50 chars)."
@@ -2535,7 +2534,7 @@ msgstr "Server"
#: actions/pathsadminpanel.php:238
msgid "Site's server hostname."
-msgstr ""
+msgstr "Server Name der Seite"
#: actions/pathsadminpanel.php:242
msgid "Path"
@@ -2595,15 +2594,15 @@ msgstr "Avatarverzeichnis"
#: actions/pathsadminpanel.php:301
msgid "Backgrounds"
-msgstr ""
+msgstr "Hintergrundbilder"
#: actions/pathsadminpanel.php:305
msgid "Background server"
-msgstr ""
+msgstr "Server für Hintergrundbilder"
#: actions/pathsadminpanel.php:309
msgid "Background path"
-msgstr ""
+msgstr "Pfad zu den Hintergrundbildern"
#: actions/pathsadminpanel.php:313
msgid "Background directory"
@@ -2665,20 +2664,20 @@ msgid "Not a valid people tag: %s"
msgstr "Ungültiger Personen-Tag: %s"
#: actions/peopletag.php:144
-#, fuzzy, php-format
+#, php-format
msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "Benutzer die sich selbst mit %s getagged haben - Seite %d"
+msgstr "Benutzer die sich selbst mit %1$s getagged haben - Seite %2$d"
#: actions/postnotice.php:84
msgid "Invalid notice content"
msgstr "Ungültiger Nachrichteninhalt"
#: actions/postnotice.php:90
-#, fuzzy, php-format
+#, php-format
msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
msgstr ""
-"Die Nachrichtenlizenz '%s' ist nicht kompatibel mit der Lizenz der Seite '%"
-"s'."
+"Die Nachrichtenlizenz '%1$s' ist nicht kompatibel mit der Lizenz der Seite '%"
+"2$s'."
#: actions/profilesettings.php:60
msgid "Profile settings"
@@ -2741,7 +2740,7 @@ msgstr "Wo du bist, beispielsweise „Stadt, Gebiet, Land“"
#: actions/profilesettings.php:138
msgid "Share my current location when posting notices"
-msgstr ""
+msgstr "Teile meine aktuelle Position wenn ich Nachrichten sende"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
@@ -2802,9 +2801,8 @@ msgid "Couldn't update user for autosubscribe."
msgstr "Autosubscribe konnte nicht aktiviert werden."
#: actions/profilesettings.php:359
-#, fuzzy
msgid "Couldn't save location prefs."
-msgstr "Konnte Tags nicht speichern."
+msgstr "Konnte Positions-Einstellungen nicht speichern."
#: actions/profilesettings.php:371
msgid "Couldn't save profile."
@@ -2821,7 +2819,7 @@ msgstr "Einstellungen gespeichert."
#: actions/public.php:83
#, php-format
msgid "Beyond the page limit (%s)"
-msgstr ""
+msgstr "Jenseits des Seitenlimits (%s)"
#: actions/public.php:92
msgid "Could not retrieve public stream."
@@ -2854,10 +2852,12 @@ msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
+"Dies ist die öffentliche Zeitlinie von %%site.name%% es wurde allerdings "
+"noch nichts gepostet."
#: actions/public.php:190
msgid "Be the first to post!"
-msgstr ""
+msgstr "Sei der erste der etwas schreibt!"
#: actions/public.php:194
#, php-format
@@ -2898,6 +2898,8 @@ msgstr "Das sind die beliebtesten Tags auf %s "
#, php-format
msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
msgstr ""
+"Bis jetzt hat noch niemand eine Nachricht mit dem Tag [hashtag](%%doc.tags%"
+"%) gepostet."
#: actions/publictagcloud.php:72
msgid "Be the first to post one!"
@@ -3048,7 +3050,7 @@ msgstr "Entschuldigung, ungültiger Bestätigungscode."
msgid "Registration successful"
msgstr "Registrierung erfolgreich"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrieren"
@@ -3366,9 +3368,8 @@ msgstr ""
#: actions/showapplication.php:169 actions/version.php:195
#: lib/applicationeditform.php:195
-#, fuzzy
msgid "Name"
-msgstr "Nutzername"
+msgstr "Name"
#: actions/showapplication.php:178 lib/applicationeditform.php:222
#, fuzzy
@@ -3481,7 +3482,7 @@ msgstr ""
#: actions/showfavorites.php:242
msgid "This is a way to share what you like."
-msgstr ""
+msgstr "Dies ist ein Weg Dinge zu teilen die dir gefallen."
#: actions/showgroup.php:82 lib/groupnav.php:86
#, php-format
@@ -3681,35 +3682,32 @@ msgstr ""
"Software [StatusNet](http://status.net/). "
#: actions/showstream.php:305
-#, fuzzy, php-format
+#, php-format
msgid "Repeat of %s"
-msgstr "Antworten an %s"
+msgstr "Wiederholung von %s"
#: actions/silence.php:65 actions/unsilence.php:65
-#, fuzzy
msgid "You cannot silence users on this site."
-msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
+msgstr "Du kannst Nutzer dieser Seite nicht ruhig stellen."
#: actions/silence.php:72
-#, fuzzy
msgid "User is already silenced."
-msgstr "Dieser Benutzer hat dich blockiert."
+msgstr "Nutzer ist bereits ruhig gestellt."
#: actions/siteadminpanel.php:69
msgid "Basic settings for this StatusNet site."
-msgstr ""
+msgstr "Grundeinstellungen für diese StatusNet Seite."
#: actions/siteadminpanel.php:132
msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "Der Seiten Name darf nicht leer sein."
#: actions/siteadminpanel.php:140
-#, fuzzy
msgid "You must have a valid contact email address."
-msgstr "Du musst eine gültige E-Mail-Adresse haben"
+msgstr "Du musst eine gültige E-Mail-Adresse haben."
#: actions/siteadminpanel.php:158
-#, fuzzy, php-format
+#, php-format
msgid "Unknown language \"%s\"."
msgstr "Unbekannte Sprache „%s“"
@@ -3727,7 +3725,7 @@ msgstr ""
#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
-msgstr ""
+msgstr "Minimale Textlänge ist 140 Zeichen."
#: actions/siteadminpanel.php:189
msgid "Dupe limit must 1 or more seconds."
@@ -3738,13 +3736,12 @@ msgid "General"
msgstr ""
#: actions/siteadminpanel.php:242
-#, fuzzy
msgid "Site name"
-msgstr "Seitennachricht"
+msgstr "Seitenname"
#: actions/siteadminpanel.php:243
msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "Der Name deiner Seite, sowas wie \"DeinUnternehmen Mircoblog\""
#: actions/siteadminpanel.php:247
msgid "Brought by"
@@ -3947,7 +3944,8 @@ msgstr "Kein Code eingegeben"
msgid "You are not subscribed to that profile."
msgstr "Du hast dieses Profil nicht abonniert."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Konnte Abonnement nicht erstellen."
@@ -3965,9 +3963,9 @@ msgid "%s subscribers"
msgstr "%s Abonnenten"
#: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscribers, page %2$d"
-msgstr "%s Abonnenten, Seite %d"
+msgstr "%1$s Abonnenten, Seite %2$d"
#: actions/subscribers.php:63
msgid "These are the people who listen to your notices."
@@ -4006,9 +4004,9 @@ msgid "%s subscriptions"
msgstr "%s Abonnements"
#: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
msgid "%1$s subscriptions, page %2$d"
-msgstr "%s Abonnements, Seite %d"
+msgstr "%1$s Abonnements, Seite %2$d"
#: actions/subscriptions.php:65
msgid "These are the people whose notices you listen to."
@@ -4030,9 +4028,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 liest ab sofort "
+msgstr "%s hat niemanden abonniert."
#: actions/subscriptions.php:194
msgid "Jabber"
@@ -4043,24 +4041,24 @@ msgid "SMS"
msgstr "SMS"
#: actions/tag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Notices tagged with %1$s, page %2$d"
-msgstr "Benutzer die sich selbst mit %s getagged haben - Seite %d"
+msgstr "Mit %1$s gekennzeichnete Nachrichten, Seite %2$d"
#: actions/tag.php:86
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Feed der Nachrichten von %s"
+msgstr "Nachrichten Feed für Tag %s (RSS 1.0)"
#: actions/tag.php:92
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Feed der Nachrichten von %s"
+msgstr "Nachrichten Feed für Tag %s (RSS 2.0)"
#: actions/tag.php:98
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (Atom)"
-msgstr "Feed der Nachrichten von %s"
+msgstr "Nachrichten Feed für Tag %s (Atom)"
#: actions/tagother.php:39
#, fuzzy
@@ -4128,9 +4126,8 @@ msgid "User is not sandboxed."
msgstr "Dieser Benutzer hat dich blockiert."
#: actions/unsilence.php:72
-#, fuzzy
msgid "User is not silenced."
-msgstr "Benutzer hat kein Profil."
+msgstr "Der Benutzer ist nicht ruhig gestellt."
#: actions/unsubscribe.php:77
msgid "No profile id in request."
@@ -4155,15 +4152,15 @@ msgstr "Benutzer"
#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Nutzer Einstellungen dieser StatusNet Seite."
#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
-msgstr ""
+msgstr "Das Zeichenlimit der Biografie muss numerisch sein!"
#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
-msgstr ""
+msgstr "Willkommens-Nachricht ungültig. Maximale Länge sind 255 Zeichen."
#: actions/useradminpanel.php:164
#, php-format
@@ -4193,33 +4190,27 @@ msgstr ""
#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "Willkommens-Nachricht für neue Nutzer (maximal 255 Zeichen)."
#: actions/useradminpanel.php:240
-#, fuzzy
msgid "Default subscription"
-msgstr "Alle Abonnements"
+msgstr "Standard Abonnement"
#: actions/useradminpanel.php:241
-#, fuzzy
msgid "Automatically subscribe new users to this user."
-msgstr ""
-"Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für Nicht-"
-"Menschen)"
+msgstr "Neue Nutzer abonnieren automatisch diesen Nutzer"
#: actions/useradminpanel.php:250
-#, fuzzy
msgid "Invitations"
-msgstr "Einladung(en) verschickt"
+msgstr "Einladungen"
#: actions/useradminpanel.php:255
-#, fuzzy
msgid "Invitations enabled"
-msgstr "Einladung(en) verschickt"
+msgstr "Einladungen aktivieren"
#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
-msgstr ""
+msgstr "Ist es Nutzern erlaubt neue Nutzer einzuladen."
#: actions/userauthorization.php:105
msgid "Authorize subscription"
@@ -4245,7 +4236,6 @@ msgstr "Akzeptieren"
#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
-#, fuzzy
msgid "Subscribe to this user"
msgstr "Abonniere diesen Benutzer"
@@ -4403,7 +4393,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Eigene"
@@ -4468,22 +4458,22 @@ msgstr "Konnte Nachricht nicht mit neuer URI versehen."
msgid "DB error inserting hashtag: %s"
msgstr "Datenbankfehler beim Einfügen des Hashtags: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr "Problem bei Speichern der Nachricht. Sie ist zu lang."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in "
"ein paar Minuten ab."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4492,31 +4482,57 @@ msgstr ""
"Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in "
"ein paar Minuten ab."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr ""
"Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Problem bei Speichern der Nachricht."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problem bei Speichern der Nachricht."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Datenbankfehler beim Einfügen der Antwort: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Bereits abonniert!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Dieser Benutzer hat dich blockiert."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Nicht abonniert!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Konnte Abonnement nicht löschen."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Konnte Abonnement nicht löschen."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Herzlich willkommen bei %1$s, @%2$s!"
@@ -4567,127 +4583,127 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Seite ohne Titel"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Hauptnavigation"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Startseite"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Persönliches Profil und Freundes-Zeitleiste"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Ändere deine E-Mail, dein Avatar, Passwort, Profil"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Verbinden"
-#: lib/action.php:445
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Konnte nicht zum Server umleiten: %s"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "Hauptnavigation"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Einladen"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Abmelden"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Von der Seite abmelden"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Neues Konto erstellen"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Auf der Seite anmelden"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Hilfe"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Hilf mir!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Suchen"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Suche nach Leuten oder Text"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "Seitennachricht"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "Lokale Ansichten"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "Neue Nachricht"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Unternavigation"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Über"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr "AGB"
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Privatsphäre"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Quellcode"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:752
+#: lib/action.php:751
#, fuzzy
msgid "Badge"
msgstr "Stups"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "StatusNet-Software-Lizenz"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4696,12 +4712,12 @@ msgstr ""
"**%%site.name%%** ist ein Microbloggingdienst von [%%site.broughtby%%](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** ist ein Microbloggingdienst."
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4712,42 +4728,42 @@ msgstr ""
"(Version %s) betrieben, die unter der [GNU Affero General Public License]"
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "StatusNet-Software-Lizenz"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
#, fuzzy
msgid "All "
msgstr "Alle "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "Lizenz."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Seitenerstellung"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "Später"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Vorher"
@@ -5057,81 +5073,86 @@ msgstr "Problem beim Speichern der Nachricht."
msgid "Specify the name of the user to subscribe to"
msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Unbekannter Benutzer."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "%s abonniert"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "%s nicht mehr abonniert"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Befehl noch nicht implementiert."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Benachrichtigung deaktiviert."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Konnte Benachrichtigung nicht deaktivieren."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Benachrichtigung aktiviert."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Konnte Benachrichtigung nicht aktivieren."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Du hast dieses Profil nicht abonniert."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Du hast diese Benutzer bereits abonniert:"
msgstr[1] "Du hast diese Benutzer bereits abonniert:"
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "Niemand hat Dich abonniert."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Die Gegenseite konnte Dich nicht abonnieren."
msgstr[1] "Die Gegenseite konnte Dich nicht abonnieren."
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "Du bist in keiner Gruppe Mitglied."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du bist Mitglied dieser Gruppe:"
msgstr[1] "Du bist Mitglied dieser Gruppen:"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5245,19 +5266,19 @@ msgstr "Zu Favoriten hinzufügen"
#: lib/feed.php:85
msgid "RSS 1.0"
-msgstr ""
+msgstr "RSS 1.0"
#: lib/feed.php:87
msgid "RSS 2.0"
-msgstr ""
+msgstr "RSS 2.0"
#: lib/feed.php:89
msgid "Atom"
-msgstr ""
+msgstr "Atom"
#: lib/feed.php:91
msgid "FOAF"
-msgstr ""
+msgstr "FOAF"
#: lib/feedlist.php:64
msgid "Export data"
@@ -5324,12 +5345,12 @@ msgid "Blocked"
msgstr "Blockiert"
#: lib/groupnav.php:102
-#, fuzzy, php-format
+#, php-format
msgid "%s blocked users"
-msgstr "Benutzer blockieren"
+msgstr "in %s blockierte Nutzer"
#: lib/groupnav.php:108
-#, fuzzy, php-format
+#, php-format
msgid "Edit %s group properties"
msgstr "%s Gruppeneinstellungen bearbeiten"
@@ -5338,14 +5359,14 @@ msgid "Logo"
msgstr "Logo"
#: lib/groupnav.php:114
-#, fuzzy, php-format
+#, php-format
msgid "Add or edit %s logo"
msgstr "%s Logo hinzufügen oder bearbeiten"
#: lib/groupnav.php:120
-#, fuzzy, php-format
+#, php-format
msgid "Add or edit %s design"
-msgstr "%s Logo hinzufügen oder bearbeiten"
+msgstr "%s Design hinzufügen oder bearbeiten"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
@@ -5356,7 +5377,7 @@ msgid "Groups with most posts"
msgstr "Gruppen mit den meisten Beiträgen"
#: lib/grouptagcloudsection.php:56
-#, fuzzy, php-format
+#, php-format
msgid "Tags in %s group's notices"
msgstr "Tags in den Nachrichten der Gruppe %s"
@@ -5395,16 +5416,16 @@ msgstr "Unbekannter Dateityp"
#: lib/imagefile.php:217
msgid "MB"
-msgstr ""
+msgstr "MB"
#: lib/imagefile.php:219
msgid "kB"
-msgstr ""
+msgstr "kB"
#: lib/jabber.php:220
#, php-format
msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
#: lib/jabber.php:400
#, fuzzy, php-format
@@ -5420,14 +5441,12 @@ msgid "Leave"
msgstr "Verlassen"
#: lib/logingroupnav.php:80
-#, fuzzy
msgid "Login with a username and password"
-msgstr "Anmelden mit einem Benutzernamen und Passwort"
+msgstr "Mit Nutzernamen und Passwort anmelden"
#: lib/logingroupnav.php:86
-#, fuzzy
msgid "Sign up for a new account"
-msgstr "Für ein neues Konto registrieren"
+msgstr "Registriere ein neues Nutzerkonto"
#: lib/mail.php:172
msgid "Email address confirmation"
@@ -5495,11 +5514,9 @@ msgstr ""
"$s ändern.\n"
#: lib/mail.php:258
-#, fuzzy, php-format
+#, php-format
msgid "Bio: %s"
-msgstr ""
-"Biografie: %s\n"
-"\n"
+msgstr "Biografie: %s"
#: lib/mail.php:286
#, php-format
@@ -5666,7 +5683,6 @@ msgstr ""
"Nachrichten schicken, die nur Du sehen kannst."
#: lib/mailbox.php:227 lib/noticelist.php:481
-#, fuzzy
msgid "from"
msgstr "von"
@@ -5687,39 +5703,45 @@ msgid "Sorry, no incoming email allowed."
msgstr "Sorry, keinen eingehenden E-Mails gestattet."
#: lib/mailhandler.php:228
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported message type: %s"
-msgstr "Bildformat wird nicht unterstützt."
+msgstr "Nachrichten-Typ %s wird nicht unterstützt."
#: lib/mediafile.php:98 lib/mediafile.php:123
msgid "There was a database error while saving your file. Please try again."
msgstr ""
+"Beim Speichern der Datei trat ein Datenbank Fehler auf. Bitte versuche es "
+"noch einmal."
#: lib/mediafile.php:142
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
msgstr ""
+"Die Größe der hoch geladenen Datei überschreitet die upload_max_filesize "
+"Angabe in der php.ini."
#: lib/mediafile.php:147
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form."
msgstr ""
+"Die Größe der hoch geladenen Datei überschreitet die MAX_FILE_SIZE Angabe, "
+"die im HTML Formular angegeben wurde."
#: lib/mediafile.php:152
msgid "The uploaded file was only partially uploaded."
-msgstr ""
+msgstr "Die Datei wurde nur teilweise auf den Server geladen."
#: lib/mediafile.php:159
msgid "Missing a temporary folder."
-msgstr ""
+msgstr "Kein temporäres Verzeichnis gefunden."
#: lib/mediafile.php:162
msgid "Failed to write file to disk."
-msgstr ""
+msgstr "Konnte die Datei nicht auf die Festplatte schreiben."
#: lib/mediafile.php:165
msgid "File upload stopped by extension."
-msgstr ""
+msgstr "Upload der Datei wurde wegen der Dateiendung gestoppt."
#: lib/mediafile.php:179 lib/mediafile.php:216
msgid "File exceeds user's quota."
@@ -5745,7 +5767,6 @@ msgid "%s is not a supported file type on this server."
msgstr ""
#: lib/messageform.php:120
-#, fuzzy
msgid "Send a direct notice"
msgstr "Versende eine direkte Nachricht"
@@ -5754,14 +5775,12 @@ msgid "To"
msgstr "An"
#: lib/messageform.php:159 lib/noticeform.php:185
-#, fuzzy
msgid "Available characters"
msgstr "Verfügbare Zeichen"
#: lib/noticeform.php:160
-#, fuzzy
msgid "Send a notice"
-msgstr "Nachricht versenden"
+msgstr "Nachricht senden"
#: lib/noticeform.php:173
#, php-format
@@ -5777,14 +5796,12 @@ msgid "Attach a file"
msgstr ""
#: lib/noticeform.php:212
-#, fuzzy
msgid "Share my location"
-msgstr "Konnte Tags nicht speichern."
+msgstr "Teile meinen Aufenthaltsort"
#: lib/noticeform.php:215
-#, fuzzy
msgid "Do not share my location"
-msgstr "Konnte Tags nicht speichern."
+msgstr "Teile meinen Aufenthaltsort nicht"
#: lib/noticeform.php:216
msgid ""
@@ -5798,21 +5815,20 @@ msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
#: lib/noticelist.php:430
-#, fuzzy
msgid "N"
-msgstr "Nein"
+msgstr "N"
#: lib/noticelist.php:430
msgid "S"
-msgstr ""
+msgstr "S"
#: lib/noticelist.php:431
msgid "E"
-msgstr ""
+msgstr "O"
#: lib/noticelist.php:431
msgid "W"
-msgstr ""
+msgstr "W"
#: lib/noticelist.php:438
msgid "at"
@@ -5823,9 +5839,8 @@ msgid "in context"
msgstr "im Zusammenhang"
#: lib/noticelist.php:582
-#, fuzzy
msgid "Repeated by"
-msgstr "Erstellt"
+msgstr "Wiederholt von"
#: lib/noticelist.php:609
msgid "Reply to this notice"
@@ -5836,9 +5851,8 @@ msgid "Reply"
msgstr "Antworten"
#: lib/noticelist.php:654
-#, fuzzy
msgid "Notice repeated"
-msgstr "Nachricht gelöscht."
+msgstr "Nachricht wiederholt"
#: lib/nudgeform.php:116
msgid "Nudge this user"
@@ -5869,11 +5883,6 @@ msgstr "Fehler beim Einfügen des entfernten Profils"
msgid "Duplicate notice"
msgstr "Notiz löschen"
-#: lib/oauthstore.php:465 lib/subs.php:48
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Konnte neues Abonnement nicht eintragen."
@@ -5907,7 +5916,7 @@ msgid "Your sent messages"
msgstr "Deine gesendeten Nachrichten"
#: lib/personaltagcloudsection.php:56
-#, fuzzy, php-format
+#, php-format
msgid "Tags in %s's notices"
msgstr "Tags in %ss Nachrichten"
@@ -5974,28 +5983,24 @@ msgid "Popular"
msgstr "Beliebt"
#: lib/repeatform.php:107
-#, fuzzy
msgid "Repeat this notice?"
-msgstr "Auf diese Nachricht antworten"
+msgstr "Diese Nachricht wiederholen?"
#: lib/repeatform.php:132
-#, fuzzy
msgid "Repeat this notice"
-msgstr "Auf diese Nachricht antworten"
+msgstr "Diese Nachricht wiederholen"
#: lib/router.php:665
msgid "No single user defined for single-user mode."
msgstr ""
#: lib/sandboxform.php:67
-#, fuzzy
msgid "Sandbox"
-msgstr "Posteingang"
+msgstr "Spielwiese"
#: lib/sandboxform.php:78
-#, fuzzy
msgid "Sandbox this user"
-msgstr "Benutzer freigeben"
+msgstr "Diesen Nutzer auf die Spielwiese setzen"
#: lib/searchaction.php:120
msgid "Search site"
@@ -6035,14 +6040,12 @@ msgid "More..."
msgstr ""
#: lib/silenceform.php:67
-#, fuzzy
msgid "Silence"
-msgstr "Seitennachricht"
+msgstr "Stummschalten"
#: lib/silenceform.php:78
-#, fuzzy
msgid "Silence this user"
-msgstr "Benutzer blockieren"
+msgstr "Nutzer verstummen lassen"
#: lib/subgroupnav.php:83
#, php-format
@@ -6059,36 +6062,6 @@ msgstr "Leute, die %s abonniert haben"
msgid "Groups %s is a member of"
msgstr "Gruppen in denen %s Mitglied ist"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Bereits abonniert!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Dieser Benutzer hat dich blockiert."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Konnte nicht abbonieren."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Die Gegenseite konnte Dich nicht abonnieren."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Nicht abonniert!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Konnte Abonnement nicht löschen."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Konnte Abonnement nicht löschen."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
@@ -6109,19 +6082,17 @@ msgstr "Top-Schreiber"
#: lib/unsandboxform.php:69
msgid "Unsandbox"
-msgstr ""
+msgstr "Von Spielwiese freigeben"
#: lib/unsandboxform.php:80
-#, fuzzy
msgid "Unsandbox this user"
msgstr "Benutzer freigeben"
#: lib/unsilenceform.php:67
msgid "Unsilence"
-msgstr ""
+msgstr "Stummschalten aufheben"
#: lib/unsilenceform.php:78
-#, fuzzy
msgid "Unsilence this user"
msgstr "Benutzer freigeben"
@@ -6147,7 +6118,7 @@ msgstr "Profil Einstellungen ändern"
#: lib/userprofile.php:252
msgid "Edit"
-msgstr ""
+msgstr "Bearbeiten"
#: lib/userprofile.php:275
msgid "Send a direct message to this user"
@@ -6159,7 +6130,7 @@ msgstr "Nachricht"
#: lib/userprofile.php:314
msgid "Moderate"
-msgstr ""
+msgstr "Moderieren"
#: lib/util.php:871
msgid "a few seconds ago"
@@ -6216,6 +6187,7 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s ist keine gültige Farbe! Verwenden Sie 3 oder 6 Hex-Zeichen."
#: lib/xmppmanager.php:402
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Nachricht zu lang - maximal %d Zeichen erlaubt, du hast %d gesendet"
+msgstr ""
+"Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index f28a6623d..90078d0c0 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:55:58+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:02:37+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: el\n"
"X-Message-Group: out-statusnet\n"
@@ -102,7 +102,6 @@ msgstr "Δεν υπάρχει τέτοια σελίδα"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Κανένας τέτοιος χρήστης."
@@ -554,7 +553,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Λογαριασμός"
@@ -937,7 +936,7 @@ msgstr "Ομάδες με τα περισσότερα μέλη"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -1688,7 +1687,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Διαχειριστής"
@@ -2028,7 +2027,7 @@ msgstr "Λάθος όνομα χρήστη ή κωδικός"
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Σύνδεση"
@@ -2978,7 +2977,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -3843,7 +3842,8 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
@@ -4273,7 +4273,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Προσωπικά"
@@ -4336,48 +4336,74 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:790
+#: classes/Notice.php:811
msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr ""
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Απέτυχε η συνδρομή."
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Απέτυχε η διαγραφή συνδρομής."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Απέτυχε η διαγραφή συνδρομής."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
@@ -4428,125 +4454,125 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Αρχή"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Σύνδεση"
-#: lib/action.php:445
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Αδυναμία ανακατεύθηνσης στο διακομιστή: %s"
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Προσκάλεσε φίλους και συναδέλφους σου να γίνουν μέλη στο %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Αποσύνδεση"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Δημιουργία ενός λογαριασμού"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Βοήθεια"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Βοηθήστε με!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr ""
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr ""
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr ""
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Περί"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "Συχνές ερωτήσεις"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr ""
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr ""
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Επικοινωνία"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:783
+#: lib/action.php:782
#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4555,13 +4581,13 @@ msgstr ""
"To **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου) που "
"έφερε κοντά σας το [%%site.broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, fuzzy, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
"Το **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου). "
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4569,41 +4595,41 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr ""
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr ""
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr ""
@@ -4909,82 +4935,87 @@ msgstr ""
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Κανένας τέτοιος χρήστης."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:690
+#: lib/command.php:703
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "Δεν είστε μέλος καμίας ομάδας."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Ομάδες με τα περισσότερα μέλη"
msgstr[1] "Ομάδες με τα περισσότερα μέλη"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5647,10 +5678,6 @@ msgstr ""
msgid "Duplicate notice"
msgstr "Διαγραφή μηνύματος"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Απέτυχε η εισαγωγή νέας συνδρομής."
@@ -5831,36 +5858,6 @@ msgstr ""
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr ""
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Απέτυχε η συνδρομή."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Απέτυχε η συνδρομή."
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Απέτυχε η διαγραφή συνδρομής."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Απέτυχε η διαγραφή συνδρομής."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 50431ddfa..ea92b0b77 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:56:01+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:02:40+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 (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: out-statusnet\n"
@@ -100,7 +100,6 @@ msgstr "No such page"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "No such user."
@@ -558,7 +557,7 @@ msgstr ""
"the ability to <strong>%3$s</strong> your %4$s account data. You should only "
"give access to your %4$s account to third parties you trust."
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Account"
@@ -934,7 +933,7 @@ msgstr "You are not the owner of this application."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "There was a problem with your session token."
@@ -1685,7 +1684,7 @@ msgstr "%s group members, page %d"
msgid "A list of the users in this group."
msgstr "A list of the users in this group."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
@@ -2065,7 +2064,7 @@ msgstr "Incorrect username or password."
msgid "Error setting user. You are probably not authorized."
msgstr "Error setting user. You are probably not authorised."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Login"
@@ -3035,7 +3034,7 @@ msgstr "Error with confirmation code."
msgid "Registration successful"
msgstr "Registration successful"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Register"
@@ -3939,7 +3938,8 @@ msgstr "No code entered"
msgid "You are not subscribed to that profile."
msgstr "You are not subscribed to that profile."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Could not save subscription."
@@ -4396,7 +4396,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Personal"
@@ -4460,22 +4460,22 @@ msgstr "Could not update message with new URI."
msgid "DB error inserting hashtag: %s"
msgstr "DB error inserting hashtag: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Problem saving notice."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Problem saving notice. Unknown user."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Too many notices too fast; take a breather and post again in a few minutes."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4483,30 +4483,56 @@ msgid ""
msgstr ""
"Too many notices too fast; take a breather and post again in a few minutes."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "You are banned from posting notices on this site."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Problem saving notice."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problem saving notice."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "DB error inserting reply: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "You have been banned from subscribing."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "User has blocked you."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Not subscribed!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Couldn't delete subscription."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Couldn't delete subscription."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Welcome to %1$s, @%2$s!"
@@ -4556,126 +4582,126 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Untitled page"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Primary site navigation"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Home"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Personal profile and friends timeline"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Change your e-mail, avatar, password, profile"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Connect"
-#: lib/action.php:445
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Could not redirect to server: %s"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "Primary site navigation"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invite"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invite friends and colleagues to join you on %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Logout"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Logout from the site"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Create an account"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Login to the site"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Help"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Help me!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Search"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Search for people or text"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "Site notice"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "Local views"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "Page notice"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Secondary site navigation"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "About"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "F.A.Q."
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Privacy"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Source"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr "Badge"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "StatusNet software licence"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4684,12 +4710,12 @@ msgstr ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%)."
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** is a microblogging service."
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4700,41 +4726,41 @@ msgstr ""
"s, available under the [GNU Affero General Public Licence](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "Site content license"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "All "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "licence."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "After"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Before"
@@ -5047,83 +5073,88 @@ msgstr "Error saving notice."
msgid "Specify the name of the user to subscribe to"
msgstr "Specify the name of the user to subscribe to"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "No such user."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Subscribed to %s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Specify the name of the user to unsubscribe from"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Unsubscribed from %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Command not yet implemented."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notification off."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Can't turn off notification."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notification on."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Can't turn on notification."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "You are not subscribed to that profile."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "You are already subscribed to these users:"
msgstr[1] "You are already subscribed to these users:"
-#: lib/command.php:690
+#: lib/command.php:703
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Could not subscribe other to you."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Could not subscribe other to you."
msgstr[1] "Could not subscribe other to you."
-#: lib/command.php:712
+#: lib/command.php:725
#, fuzzy
msgid "You are not a member of any groups."
msgstr "You are not a member of that group."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "You are not a member of that group."
msgstr[1] "You are not a member of that group."
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5806,10 +5837,6 @@ msgstr "Error inserting remote profile."
msgid "Duplicate notice"
msgstr "Duplicate notice"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "You have been banned from subscribing."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Couldn't insert new subscription."
@@ -5991,36 +6018,6 @@ msgstr "People subscribed to %s"
msgid "Groups %s is a member of"
msgstr "Groups %s is a member of"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "User has blocked you."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Could not subscribe."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Could not subscribe other to you."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Not subscribed!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Couldn't delete subscription."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Couldn't delete subscription."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 06c3ee045..3ce394aa6 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:56:07+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:02:43+0000\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: out-statusnet\n"
@@ -102,7 +102,6 @@ msgstr "No existe tal página"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "No existe ese usuario."
@@ -564,7 +563,7 @@ msgstr ""
"permiso para <strong>%3$s</strong> la información de tu cuenta %4$s. Sólo "
"debes dar acceso a tu cuenta %4$s a terceras partes en las que confíes."
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Cuenta"
@@ -943,7 +942,7 @@ msgstr "No eres el propietario de esta aplicación."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Hubo problemas con tu clave de sesión."
@@ -1691,7 +1690,7 @@ msgstr "%1$s miembros de grupo, página %2$d"
msgid "A list of the users in this group."
msgstr "Lista de los usuarios en este grupo."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
@@ -2075,7 +2074,7 @@ msgstr "Nombre de usuario o contraseña incorrectos."
msgid "Error setting user. You are probably not authorized."
msgstr "Error al configurar el usuario. Posiblemente no tengas autorización."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
@@ -3040,7 +3039,7 @@ msgstr "El código de invitación no es válido."
msgid "Registration successful"
msgstr "Registro exitoso."
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrarse"
@@ -3916,7 +3915,8 @@ msgstr "No ingresó código"
msgid "You are not subscribed to that profile."
msgstr "No te has suscrito a ese perfil."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "No se ha podido guardar la suscripción."
@@ -4359,7 +4359,7 @@ msgstr ""
msgid "Plugins"
msgstr "Complementos"
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Sesiones"
@@ -4421,22 +4421,22 @@ msgstr "No se pudo actualizar mensaje con nuevo URI."
msgid "DB error inserting hashtag: %s"
msgstr "Error de la BD al insertar la etiqueta clave: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr "Ha habido un problema al guardar el mensaje. Es muy largo."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Ha habido un problema al guardar el mensaje. Usuario desconocido."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Demasiados avisos demasiado rápido; para y publicar nuevamente en unos "
"minutos."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4445,30 +4445,56 @@ msgstr ""
"Demasiados avisos demasiado rápido; para y publicar nuevamente en unos "
"minutos."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "Tienes prohibido publicar avisos en este sitio."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Hubo un problema al guardar el aviso."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Hubo un problema al guardar el aviso."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Error de BD al insertar respuesta: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Se te ha prohibido la suscripción."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "El usuario te ha bloqueado."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "¡No estás suscrito!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "No se pudo eliminar la suscripción."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "No se pudo eliminar la suscripción."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Bienvenido a %1$s, @%2$s!"
@@ -4519,124 +4545,124 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Página sin título"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Navegación de sitio primario"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Inicio"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Perfil personal y línea de tiempo de amigos"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Cambia tu correo electrónico, avatar, contraseña, perfil"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Conectarse"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Conectar a los servicios"
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Cambiar la configuración del sitio"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invitar"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invita a amigos y colegas a unirse a %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Salir"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Salir de sitio"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Crear una cuenta"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Ingresar a sitio"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Ayuda"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Ayúdame!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Buscar"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Buscar personas o texto"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "Aviso de sitio"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "Vistas locales"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "Aviso de página"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Navegación de sitio secundario"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Acerca de"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "Preguntas Frecuentes"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Privacidad"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Fuente"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Ponerse en contacto"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr "Insignia"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Licencia de software de StatusNet"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4645,12 +4671,12 @@ msgstr ""
"**%%site.name%%** es un servicio de microblogueo de [%%site.broughtby%%**](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** es un servicio de microblogueo."
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4661,43 +4687,43 @@ msgstr ""
"disponible bajo la [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "Licencia de contenido del sitio"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Derechos de autor de contenido y datos por los colaboradores. Todos los "
"derechos reservados."
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "Todo"
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "Licencia."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginación"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "Después"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Antes"
@@ -5005,80 +5031,85 @@ msgstr "Hubo un problema al guardar el aviso."
msgid "Specify the name of the user to subscribe to"
msgstr "Especificar el nombre del usuario a suscribir"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "No existe ese usuario."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Suscrito a %s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Especificar el nombre del usuario para desuscribirse de"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Desuscrito de %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Todavía no se implementa comando."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notificación no activa."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "No se puede desactivar notificación."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notificación activada."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "No se puede activar notificación."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr "No estás suscrito a nadie."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ya estás suscrito a estos usuarios:"
msgstr[1] "Ya estás suscrito a estos usuarios:"
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "Nadie está suscrito a ti."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "No se pudo suscribir otro a ti."
msgstr[1] "No se pudo suscribir otro a ti."
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "No eres miembro de ningún grupo"
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Eres miembro de este grupo:"
msgstr[1] "Eres miembro de estos grupos:"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5759,10 +5790,6 @@ msgstr "Error al insertar perfil remoto"
msgid "Duplicate notice"
msgstr "Duplicar aviso"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Se te ha prohibido la suscripción."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "No se pudo insertar una nueva suscripción."
@@ -5949,36 +5976,6 @@ msgstr "Personas suscritas a %s"
msgid "Groups %s is a member of"
msgstr "%s es miembro de los grupos"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "El usuario te ha bloqueado."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "No se pudo suscribir."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "No se pudo suscribir otro a ti."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "¡No estás suscrito!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "No se pudo eliminar la suscripción."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "No se pudo eliminar la suscripción."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 1d328d4f1..877debaec 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:56:13+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:02:49+0000\n"
"Last-Translator: Ahmad Sufi Mahmudi\n"
"Language-Team: Persian\n"
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-Language-Code: fa\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
@@ -105,7 +105,6 @@ msgstr "چنین صفحه‌ای وجود ندارد"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "چنین کاربری وجود ندارد."
@@ -557,7 +556,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "حساب کاربری"
@@ -941,7 +940,7 @@ msgstr "شما یک عضو این گروه نیستید."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -1689,7 +1688,7 @@ msgstr "اعضای گروه %s، صفحهٔ %d"
msgid "A list of the users in this group."
msgstr "یک فهرست از کاربران در این گروه"
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "مدیر"
@@ -2042,7 +2041,7 @@ msgstr "نام کاربری یا رمز عبور نادرست."
msgid "Error setting user. You are probably not authorized."
msgstr "خطا در تنظیم کاربر. شما احتمالا اجازه ی این کار را ندارید."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "ورود"
@@ -2995,7 +2994,7 @@ msgstr "با عرض تاسف، کد دعوت نا معتبر است."
msgid "Registration successful"
msgstr "ثبت نام با موفقیت انجام شد."
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "ثبت نام"
@@ -3844,7 +3843,8 @@ msgstr "کدی وارد نشد"
msgid "You are not subscribed to that profile."
msgstr "شما به این پروفيل متعهد نشدید"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr ""
@@ -4266,7 +4266,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "شخصی"
@@ -4328,22 +4328,22 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr "مشکل در ذخیره کردن پیام. بسیار طولانی."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "مشکل در ذخیره کردن پیام. کاربر نا شناخته."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"تعداد خیلی زیاد آگهی و بسیار سریع؛ استراحت کنید و مجددا دقایقی دیگر ارسال "
"کنید."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4351,30 +4351,54 @@ msgstr ""
"تعداد زیاد پیام های دو نسخه ای و بسرعت؛ استراحت کنید و دقایقی دیگر مجددا "
"ارسال کنید."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "شما از فرستادن پست در این سایت مردود شدید ."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "مشکل در ذخیره کردن آگهی."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "مشکل در ذخیره کردن آگهی."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "قبلا تایید شده !"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr ""
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "تایید نشده!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr ""
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr ""
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "خوش امدید به %1$s , @%2$s!"
@@ -4424,136 +4448,136 @@ msgstr "%s گروه %s را ترک کرد."
msgid "Untitled page"
msgstr "صفحه ی بدون عنوان"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "خانه"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "آدرس ایمیل، آواتار، کلمه ی عبور، پروفایل خود را تغییر دهید"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "وصل‌شدن"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr "متصل شدن به خدمات"
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "تغییر پیکربندی سایت"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "دعوت‌کردن"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr " به شما ملحق شوند %s دوستان و همکاران را دعوت کنید تا در"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "خروج"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "خارج شدن از سایت ."
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "یک حساب کاربری بسازید"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "ورود به وب‌گاه"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "کمک"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "به من کمک کنید!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "جست‌وجو"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "جستجو برای شخص با متن"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "خبر سایت"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "دید محلی"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "خبر صفحه"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "دربارهٔ"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "سوال‌های رایج"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "خصوصی"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "منبع"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "تماس"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "StatusNet مجوز نرم افزار"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4561,41 +4585,41 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "مجوز محتویات سایت"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "همه "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "مجوز."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "صفحه بندى"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "بعد از"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "قبل از"
@@ -4904,77 +4928,82 @@ msgstr "خطا هنگام ذخیره ی آگهی"
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "چنین کاربری وجود ندارد."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "دستور هنوز اجرا نشده"
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "ناتوان در خاموش کردن آگاه سازی."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "آگاه سازی فعال است."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "ناتوان در روشن کردن آگاه سازی."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "فرمان ورود از کار افتاده است"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr "شما توسط هیچ کس تصویب نشده اید ."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "هم اکنون شما این کاربران را دنبال می‌کنید: "
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "هیچکس شما را تایید نکرده ."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "هیچکس شما را تایید نکرده ."
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "شما در هیچ گروهی عضو نیستید ."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "شما یک عضو این گروه نیستید."
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5638,10 +5667,6 @@ msgstr ""
msgid "Duplicate notice"
msgstr ""
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr ""
@@ -5819,34 +5844,6 @@ msgstr ""
msgid "Groups %s is a member of"
msgstr "هست عضو %s گروه"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "قبلا تایید شده !"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr ""
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr ""
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "تایید نشده!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr ""
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr ""
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index f37da7b0f..e1222193b 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:56:10+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:02:46+0000\n"
"Language-Team: Finnish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
"X-Message-Group: out-statusnet\n"
@@ -107,7 +107,6 @@ msgstr "Sivua ei ole."
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Käyttäjää ei ole."
@@ -573,7 +572,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Käyttäjätili"
@@ -958,7 +957,7 @@ msgstr "Sinä et kuulu tähän ryhmään."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Istuntoavaimesi kanssa oli ongelma."
@@ -1722,7 +1721,7 @@ msgstr "Ryhmän %s jäsenet, sivu %d"
msgid "A list of the users in this group."
msgstr "Lista ryhmän käyttäjistä."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Ylläpito"
@@ -2103,7 +2102,7 @@ msgstr "Väärä käyttäjätunnus tai salasana"
msgid "Error setting user. You are probably not authorized."
msgstr "Sinulla ei ole valtuutusta tähän."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Kirjaudu sisään"
@@ -3083,7 +3082,7 @@ msgstr "Virheellinen kutsukoodin."
msgid "Registration successful"
msgstr "Rekisteröityminen onnistui"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Rekisteröidy"
@@ -3984,7 +3983,8 @@ msgstr "Koodia ei ole syötetty."
msgid "You are not subscribed to that profile."
msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Tilausta ei onnistuttu tallentamaan."
@@ -4436,7 +4436,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Omat"
@@ -4500,23 +4500,23 @@ msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut."
msgid "DB error inserting hashtag: %s"
msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka "
"päivityksien lähettämista muutaman minuutin päästä."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4524,30 +4524,57 @@ msgstr ""
"Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka "
"päivityksien lähettämista muutaman minuutin päästä."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "Päivityksesi tähän palveluun on estetty."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Tietokantavirhe tallennettaessa vastausta: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Käyttäjä on asettanut eston sinulle."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Ei ole tilattu!."
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Ei voitu poistaa tilausta."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Ei voitu poistaa tilausta."
+
+#: classes/User.php:372
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Viesti käyttäjälle %1$s, %2$s"
@@ -4598,127 +4625,127 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Nimetön sivu"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Ensisijainen sivunavigointi"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Koti"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Henkilökohtainen profiili ja kavereiden aikajana"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Muuta sähköpostiosoitettasi, kuvaasi, salasanaasi, profiiliasi"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Yhdistä"
-#: lib/action.php:445
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "Ensisijainen sivunavigointi"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Kutsu"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Kirjaudu ulos"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Kirjaudu ulos palvelusta"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Luo uusi käyttäjätili"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Kirjaudu sisään palveluun"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Ohjeet"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Auta minua!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Haku"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Hae ihmisiä tai tekstiä"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "Palvelun ilmoitus"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "Paikalliset näkymät"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "Sivuilmoitus"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Toissijainen sivunavigointi"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Tietoa"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "UKK"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Yksityisyys"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Lähdekoodi"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Ota yhteyttä"
-#: lib/action.php:752
+#: lib/action.php:751
#, fuzzy
msgid "Badge"
msgstr "Tönäise"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "StatusNet-ohjelmiston lisenssi"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4727,12 +4754,12 @@ msgstr ""
"**%%site.name%%** on mikroblogipalvelu, jonka tarjoaa [%%site.broughtby%%](%%"
"site.broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** on mikroblogipalvelu. "
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4743,42 +4770,42 @@ msgstr ""
"versio %s, saatavilla lisenssillä [GNU Affero General Public License](http://"
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "StatusNet-ohjelmiston lisenssi"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "Kaikki "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "lisenssi."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Sivutus"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "Myöhemmin"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Aiemmin"
@@ -5096,83 +5123,88 @@ msgstr "Ongelma päivityksen tallentamisessa."
msgid "Specify the name of the user to subscribe to"
msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Käyttäjää ei ole."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Käyttäjän %s päivitykset tilattu"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Käyttäjän %s päivitysten tilaus lopetettu"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Komentoa ei ole vielä toteutettu."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Ilmoitukset pois päältä."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Ilmoituksia ei voi pistää pois päältä."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Ilmoitukset päällä."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Ilmoituksia ei voi pistää päälle."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
msgstr[1] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
-#: lib/command.php:690
+#: lib/command.php:703
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Toista ei voitu asettaa tilaamaan sinua."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Toista ei voitu asettaa tilaamaan sinua."
msgstr[1] "Toista ei voitu asettaa tilaamaan sinua."
-#: lib/command.php:712
+#: lib/command.php:725
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Sinä et kuulu tähän ryhmään."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Sinä et kuulu tähän ryhmään."
msgstr[1] "Sinä et kuulu tähän ryhmään."
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5863,11 +5895,6 @@ msgstr "Virhe tapahtui uuden etäprofiilin lisäämisessä"
msgid "Duplicate notice"
msgstr "Poista päivitys"
-#: lib/oauthstore.php:465 lib/subs.php:48
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Ei voitu lisätä uutta tilausta."
@@ -6055,36 +6082,6 @@ msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
msgid "Groups %s is a member of"
msgstr "Ryhmät, joiden jäsen %s on"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Käyttäjä on asettanut eston sinulle."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Ei voitu tilata."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Toista ei voitu asettaa tilaamaan sinua."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Ei ole tilattu!."
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Ei voitu poistaa tilausta."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Ei voitu poistaa tilausta."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index ad0ae7fc5..663f4fc1d 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -14,12 +14,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:56:16+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:02:52+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: out-statusnet\n"
@@ -104,7 +104,6 @@ msgstr "Page non trouvée"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Utilisateur non trouvé."
@@ -573,7 +572,7 @@ msgstr ""
"devriez donner l’accès à votre compte %4$s qu’aux tiers à qui vous faites "
"confiance."
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Compte"
@@ -953,7 +952,7 @@ msgstr "Vous n’êtes pas le propriétaire de cette application."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Un problème est survenu avec votre jeton de session."
@@ -1698,7 +1697,7 @@ msgstr "Membres du groupe %1$s - page %2$d"
msgid "A list of the users in this group."
msgstr "Liste des utilisateurs inscrits à ce groupe."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrer"
@@ -2093,7 +2092,7 @@ msgstr ""
"Erreur lors de la mise en place de l’utilisateur. Vous n’y êtes probablement "
"pas autorisé."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Ouvrir une session"
@@ -3068,7 +3067,7 @@ msgstr "Désolé, code d’invitation invalide."
msgid "Registration successful"
msgstr "Compte créé avec succès"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Créer un compte"
@@ -3978,7 +3977,8 @@ msgstr "Aucun code entré"
msgid "You are not subscribed to that profile."
msgstr "Vous n’êtes pas abonné(e) à ce profil."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Impossible d’enregistrer l’abonnement."
@@ -4445,7 +4445,7 @@ msgstr ""
msgid "Plugins"
msgstr "Extensions"
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Version"
@@ -4506,22 +4506,22 @@ msgstr "Impossible de mettre à jour le message avec un nouvel URI."
msgid "DB error inserting hashtag: %s"
msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr "Problème lors de l’enregistrement de l’avis ; trop long."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Erreur lors de l’enregistrement de l’avis. Utilisateur inconnu."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Trop d’avis, trop vite ! Faites une pause et publiez à nouveau dans quelques "
"minutes."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4529,29 +4529,53 @@ msgstr ""
"Trop de messages en double trop vite ! Prenez une pause et publiez à nouveau "
"dans quelques minutes."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "Il vous est interdit de poster des avis sur ce site."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Problème lors de l’enregistrement de l’avis."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
msgid "Problem saving group inbox."
msgstr "Problème lors de l’enregistrement de la boîte de réception du groupe."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Erreur de base de donnée en insérant la réponse :%s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Il vous avez été interdit de vous abonner."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Déjà abonné !"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Cet utilisateur vous a bloqué."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Pas abonné !"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Impossible de supprimer l’abonnement à soi-même."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Impossible de cesser l’abonnement"
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Bienvenue à %1$s, @%2$s !"
@@ -4601,124 +4625,124 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Page sans nom"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Navigation primaire du site"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Accueil"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Profil personnel et flux des amis"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Modifier votre courriel, avatar, mot de passe, profil"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Connecter"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Se connecter aux services"
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Modifier la configuration du site"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Inviter"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviter des amis et collègues à vous rejoindre dans %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Fermeture de session"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Fermer la session"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Créer un compte"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Ouvrir une session"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Aide"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "À l’aide !"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Rechercher"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Rechercher des personnes ou du texte"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "Notice du site"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "Vues locales"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "Avis de la page"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Navigation secondaire du site"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "À propos"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr "CGU"
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Confidentialité"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Source"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr "Insigne"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Licence du logiciel StatusNet"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4727,12 +4751,12 @@ msgstr ""
"**%%site.name%%** est un service de microblogging qui vous est proposé par "
"[%%site.broughtby%%](%%site.broughtbyurl%%)."
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** est un service de micro-blogging."
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4743,45 +4767,45 @@ msgstr ""
"version %s, disponible sous la licence [GNU Affero General Public License] "
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "Licence du contenu du site"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Le contenu et les données de %1$s sont privés et confidentiels."
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"Le contenu et les données sont sous le droit d’auteur de %1$s. Tous droits "
"réservés."
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Le contenu et les données sont sous le droit d’auteur du contributeur. Tous "
"droits réservés."
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "Tous "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "licence."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "Après"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Avant"
@@ -5088,82 +5112,87 @@ msgstr "Problème lors de l’enregistrement de l’avis."
msgid "Specify the name of the user to subscribe to"
msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Utilisateur non trouvé."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Abonné à %s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Désabonné de %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Cette commande n’a pas encore été implémentée."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Avertissements désactivés."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Impossible de désactiver les avertissements."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Avertissements activés."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Impossible d’activer les avertissements."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "La commande d’ouverture de session est désactivée"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Ce lien n’est utilisable qu’une seule fois, et est valable uniquement "
"pendant 2 minutes : %s"
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr "Vous n’êtes abonné(e) à personne."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Vous êtes abonné à cette personne :"
msgstr[1] "Vous êtes abonné à ces personnes :"
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "Personne ne s’est abonné à vous."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Cette personne est abonnée à vous :"
msgstr[1] "Ces personnes sont abonnées à vous :"
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "Vous n’êtes membre d’aucun groupe."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Vous êtes membre de ce groupe :"
msgstr[1] "Vous êtes membre de ces groupes :"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5953,10 +5982,6 @@ msgstr "Erreur lors de l’insertion du profil distant"
msgid "Duplicate notice"
msgstr "Dupliquer l’avis"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Il vous avez été interdit de vous abonner."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Impossible d’insérer un nouvel abonnement."
@@ -6133,34 +6158,6 @@ msgstr "Abonnés de %s"
msgid "Groups %s is a member of"
msgstr "Groupes de %s"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Déjà abonné !"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Cet utilisateur vous a bloqué."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Impossible de s’abonner."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Impossible d’abonner une autre personne à votre profil."
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Pas abonné !"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Impossible de supprimer l’abonnement à soi-même."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Impossible de cesser l’abonnement"
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 25adc9987..abbf011aa 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:56:19+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:02:55+0000\n"
"Language-Team: Irish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ga\n"
"X-Message-Group: out-statusnet\n"
@@ -107,7 +107,6 @@ msgstr "Non existe a etiqueta."
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Ningún usuario."
@@ -569,7 +568,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
#, fuzzy
msgid "Account"
msgstr "Sobre"
@@ -968,7 +967,7 @@ msgstr "Non estás suscrito a ese perfil"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
#, fuzzy
msgid "There was a problem with your session token."
msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
@@ -1756,7 +1755,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -2137,7 +2136,7 @@ msgstr "Usuario ou contrasinal incorrectos."
msgid "Error setting user. You are probably not authorized."
msgstr "Non está autorizado."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Inicio de sesión"
@@ -3122,7 +3121,7 @@ msgstr "Acounteceu un erro co código de confirmación."
msgid "Registration successful"
msgstr "Xa estas rexistrado!!"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Rexistrar"
@@ -4036,7 +4035,8 @@ msgstr "Non se inseriu ningún código"
msgid "You are not subscribed to that profile."
msgstr "Non estás suscrito a ese perfil"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Non se pode gardar a subscrición."
@@ -4492,7 +4492,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Persoal"
@@ -4556,23 +4556,23 @@ msgstr "Non se puido actualizar a mensaxe coa nova URI."
msgid "DB error inserting hashtag: %s"
msgstr "Erro ó inserir o hashtag na BD: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro "
"duns minutos."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4581,30 +4581,57 @@ msgstr ""
"Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro "
"duns minutos."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "Tes restrinxido o envio de chíos neste sitio."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Erro ó inserir a contestación na BD: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Este usuario non che permite suscribirte a el."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "O usuario bloqueoute."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Non está suscrito!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Non se pode eliminar a subscrición."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Non se pode eliminar a subscrición."
+
+#: classes/User.php:372
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Mensaxe de %1$s en %2$s"
@@ -4658,134 +4685,134 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Persoal"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:441
#, fuzzy
msgid "Change your email, avatar, password, profile"
msgstr "Cambiar contrasinal"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Conectar"
-#: lib/action.php:445
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Non se pode redireccionar ao servidor: %s"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "Navegación de subscricións"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invitar"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, fuzzy, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
"Emprega este formulario para invitar ós teus amigos e colegas a empregar "
"este servizo."
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Sair"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:464
+#: lib/action.php:463
#, fuzzy
msgid "Create an account"
msgstr "Crear nova conta"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Axuda"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgid "Help me!"
msgstr "Axuda"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Buscar"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:494
+#: lib/action.php:493
#, fuzzy
msgid "Site notice"
msgstr "Novo chío"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:626
+#: lib/action.php:625
#, fuzzy
msgid "Page notice"
msgstr "Novo chío"
-#: lib/action.php:728
+#: lib/action.php:727
#, fuzzy
msgid "Secondary site navigation"
msgstr "Navegación de subscricións"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Sobre"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "Preguntas frecuentes"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Privacidade"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Fonte"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4794,12 +4821,12 @@ msgstr ""
"**%%site.name%%** é un servizo de microbloguexo que che proporciona [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** é un servizo de microbloguexo."
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4810,44 +4837,44 @@ msgstr ""
"%s, dispoñible baixo licenza [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "Atopar no contido dos chíos"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
#, fuzzy
msgid "All "
msgstr "Todos"
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1142
+#: lib/action.php:1141
#, fuzzy
msgid "After"
msgstr "« Despois"
-#: lib/action.php:1150
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "Antes »"
@@ -5170,55 +5197,60 @@ msgstr "Aconteceu un erro ó gardar o chío."
msgid "Specify the name of the user to subscribe to"
msgstr "Especifica o nome do usuario ó que queres suscribirte"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Ningún usuario."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Suscrito a %s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Especifica o nome de usuario ó que queres deixar de seguir"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Desuscribir de %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Comando non implementado."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notificación desactivada."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "No se pode desactivar a notificación."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notificación habilitada."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Non se pode activar a notificación."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Non estás suscrito a ese perfil"
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Xa estas suscrito a estes usuarios:"
@@ -5227,12 +5259,12 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:690
+#: lib/command.php:703
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Outro usuario non se puido suscribir a ti."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Outro usuario non se puido suscribir a ti."
@@ -5241,12 +5273,12 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:712
+#: lib/command.php:725
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Non estás suscrito a ese perfil"
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Non estás suscrito a ese perfil"
@@ -5255,7 +5287,7 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:728
+#: lib/command.php:741
#, fuzzy
msgid ""
"Commands:\n"
@@ -6031,11 +6063,6 @@ msgstr "Aconteceu un erro ó inserir o perfil remoto"
msgid "Duplicate notice"
msgstr "Eliminar chío"
-#: lib/oauthstore.php:465 lib/subs.php:48
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "Este usuario non che permite suscribirte a el."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Non se puido inserir a nova subscrición."
@@ -6227,36 +6254,6 @@ msgstr "Suscrito a %s"
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "O usuario bloqueoute."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "No se pode suscribir."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Outro usuario non se puido suscribir a ti."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Non está suscrito!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Non se pode eliminar a subscrición."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Non se pode eliminar a subscrición."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index c67c14fc2..d90c74f5e 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: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:56:22+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:02:58+0000\n"
"Language-Team: Hebrew\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: he\n"
"X-Message-Group: out-statusnet\n"
@@ -104,7 +104,6 @@ msgstr "אין הודעה כזו."
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "אין משתמש כזה."
@@ -562,7 +561,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
#, fuzzy
msgid "Account"
msgstr "אודות"
@@ -957,7 +956,7 @@ msgstr "לא שלחנו אלינו את הפרופיל הזה"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -1727,7 +1726,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -2077,7 +2076,7 @@ msgstr "שם משתמש או סיסמה לא נכונים."
msgid "Error setting user. You are probably not authorized."
msgstr "לא מורשה."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "היכנס"
@@ -3036,7 +3035,7 @@ msgstr "שגיאה באישור הקוד."
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "הירשם"
@@ -3891,7 +3890,8 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "יצירת המנוי נכשלה."
@@ -4342,7 +4342,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "אישי"
@@ -4405,51 +4405,78 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:215
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+#, fuzzy
+msgid "User has blocked you."
+msgstr "למשתמש אין פרופיל."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "לא מנוי!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "מחיקת המנוי לא הצליחה."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "מחיקת המנוי לא הצליחה."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
@@ -4503,131 +4530,131 @@ msgstr "הסטטוס של %1$s ב-%2$s "
msgid "Untitled page"
msgstr ""
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "בית"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "התחבר"
-#: lib/action.php:445
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "נכשלה ההפניה לשרת: %s"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "הרשמות"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "צא"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:464
+#: lib/action.php:463
#, fuzzy
msgid "Create an account"
msgstr "צור חשבון חדש"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "עזרה"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgid "Help me!"
msgstr "עזרה"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "חיפוש"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:494
+#: lib/action.php:493
#, fuzzy
msgid "Site notice"
msgstr "הודעה חדשה"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:626
+#: lib/action.php:625
#, fuzzy
msgid "Page notice"
msgstr "הודעה חדשה"
-#: lib/action.php:728
+#: lib/action.php:727
#, fuzzy
msgid "Secondary site navigation"
msgstr "הרשמות"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "אודות"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "רשימת שאלות נפוצות"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "פרטיות"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "מקור"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "צור קשר"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4636,12 +4663,12 @@ msgstr ""
"**%%site.name%%** הוא שרות ביקרובלוג הניתן על ידי [%%site.broughtby%%](%%"
"site.broughtbyurl%%)."
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** הוא שרות ביקרובלוג."
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4652,43 +4679,43 @@ msgstr ""
"s, המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)"
-#: lib/action.php:802
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "הודעה חדשה"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1142
+#: lib/action.php:1141
#, fuzzy
msgid "After"
msgstr "<< אחרי"
-#: lib/action.php:1150
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "לפני >>"
@@ -5003,83 +5030,88 @@ msgstr "בעיה בשמירת ההודעה."
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "אין משתמש כזה."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "לא שלחנו אלינו את הפרופיל הזה"
msgstr[1] "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:690
+#: lib/command.php:703
#, fuzzy
msgid "No one is subscribed to you."
msgstr "הרשמה מרוחקת"
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "הרשמה מרוחקת"
msgstr[1] "הרשמה מרוחקת"
-#: lib/command.php:712
+#: lib/command.php:725
#, fuzzy
msgid "You are not a member of any groups."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "לא שלחנו אלינו את הפרופיל הזה"
msgstr[1] "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5762,10 +5794,6 @@ msgstr "שגיאה בהכנסת פרופיל מרוחק"
msgid "Duplicate notice"
msgstr "הודעה חדשה"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "הכנסת מנוי חדש נכשלה."
@@ -5953,37 +5981,6 @@ msgstr "הרשמה מרוחקת"
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-#, fuzzy
-msgid "User has blocked you."
-msgstr "למשתמש אין פרופיל."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr ""
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "לא מנוי!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "מחיקת המנוי לא הצליחה."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "מחיקת המנוי לא הצליחה."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index c9ed505a2..d8f5480ac 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:56:25+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:03:01+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: hsb\n"
"X-Message-Group: out-statusnet\n"
@@ -103,7 +103,6 @@ msgstr "Strona njeeksistuje"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Wužiwar njeeksistuje"
@@ -546,7 +545,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Konto"
@@ -922,7 +921,7 @@ msgstr "Njejsy wobsedźer tuteje aplikacije."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -1646,7 +1645,7 @@ msgstr "%1$s skupinskich čłonow, strona %2$d"
msgid "A list of the users in this group."
msgstr "Lisćina wužiwarjow w tutej skupinje."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
@@ -1978,7 +1977,7 @@ msgstr "Wopačne wužiwarske mjeno abo hesło."
msgid "Error setting user. You are probably not authorized."
msgstr "Zmylk při nastajenju wužiwarja. Snano njejsy awtorizowany."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Přizjewić"
@@ -2898,7 +2897,7 @@ msgstr "Wodaj, njepłaćiwy přeprošenski kod."
msgid "Registration successful"
msgstr "Registrowanje wuspěšne"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrować"
@@ -3724,7 +3723,8 @@ msgstr "Žadyn kod zapodaty"
msgid "You are not subscribed to that profile."
msgstr "Njejsy tón profil abonował."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr ""
@@ -4146,7 +4146,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Wersija"
@@ -4205,48 +4205,72 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:790
+#: classes/Notice.php:811
msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Hižo abonowany!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Wužiwar je će zablokował."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Njeje abonowany!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Sebjeabonement njeje so dał zničić."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Abonoment njeje so dał zničić."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
@@ -4296,136 +4320,136 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Strona bjez titula"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Zwjazać"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Přeprosyć"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr ""
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Konto załožić"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Pomoc"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Pomhaj!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Pytać"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Za ludźimi abo tekstom pytać"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr ""
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr ""
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Wo"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "Huste prašenja"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Priwatnosć"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Žórło"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4433,41 +4457,41 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr ""
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr ""
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr ""
@@ -4764,54 +4788,59 @@ msgstr ""
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Wužiwar njeeksistuje"
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Sy tutu wosobu abonował:"
@@ -4819,11 +4848,11 @@ msgstr[1] "Sy tutej wosobje abonował:"
msgstr[2] "Sy tute wosoby abonował:"
msgstr[3] "Sy tute wosoby abonował:"
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Tuta wosoba je će abonowała:"
@@ -4831,11 +4860,11 @@ msgstr[1] "Tutej wosobje stej će abonowałoj:"
msgstr[2] "Tute wosoby su će abonowali:"
msgstr[3] "Tute wosoby su će abonowali:"
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Sy čłon tuteje skupiny:"
@@ -4843,7 +4872,7 @@ msgstr[1] "Sy čłon tuteju skupinow:"
msgstr[2] "Sy čłon tutych skupinow:"
msgstr[3] "Sy čłon tutych skupinow:"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5495,10 +5524,6 @@ msgstr "Zmylk při zasunjenju zdaleneho profila"
msgid "Duplicate notice"
msgstr "Dwójna zdźělenka"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr ""
@@ -5675,34 +5700,6 @@ msgstr ""
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Hižo abonowany!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Wužiwar je će zablokował."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Abonowanje njebě móžno"
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Njeje abonowany!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Sebjeabonement njeje so dał zničić."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Abonoment njeje so dał zničić."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index a8d95a851..b3fd3770a 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:56:28+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:03:04+0000\n"
"Language-Team: Interlingua\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: out-statusnet\n"
@@ -98,7 +98,6 @@ msgstr "Pagina non existe"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Usator non existe."
@@ -558,7 +557,7 @@ msgstr ""
"<strong>%3$s</strong> le datos de tu conto de %4$s. Tu debe solmente dar "
"accesso a tu conto de %4$s a tertie personas in le quales tu ha confidentia."
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Conto"
@@ -939,7 +938,7 @@ msgstr "Tu non es le proprietario de iste application."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Il habeva un problema con tu indicio de session."
@@ -1682,7 +1681,7 @@ msgstr "Membros del gruppo %1$s, pagina %2$d"
msgid "A list of the users in this group."
msgstr "Un lista de usatores in iste gruppo."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
@@ -2068,7 +2067,7 @@ msgid "Error setting user. You are probably not authorized."
msgstr ""
"Error de acceder al conto de usator. Tu probabilemente non es autorisate."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Aperir session"
@@ -3032,7 +3031,7 @@ msgstr "Pardono, le codice de invitation es invalide."
msgid "Registration successful"
msgstr "Registration succedite"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Crear conto"
@@ -3930,7 +3929,8 @@ msgstr "Nulle codice entrate"
msgid "You are not subscribed to that profile."
msgstr "Tu non es subscribite a iste profilo."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Non poteva salveguardar le subscription."
@@ -4392,7 +4392,7 @@ msgstr ""
msgid "Plugins"
msgstr "Plug-ins"
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Version"
@@ -4453,22 +4453,22 @@ msgstr "Non poteva actualisar message con nove URI."
msgid "DB error inserting hashtag: %s"
msgstr "Error in base de datos durante insertion del marca (hashtag): %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr "Problema salveguardar nota. Troppo longe."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Problema salveguardar nota. Usator incognite."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Troppo de notas troppo rapidemente; face un pausa e publica de novo post "
"alcun minutas."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4476,29 +4476,53 @@ msgstr ""
"Troppo de messages duplicate troppo rapidemente; face un pausa e publica de "
"novo post alcun minutas."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "Il te es prohibite publicar notas in iste sito."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Problema salveguardar nota."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
msgid "Problem saving group inbox."
msgstr "Problema salveguardar le cassa de entrata del gruppo."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Error del base de datos durante le insertion del responsa: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Tu ha essite blocate del subscription."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Ja subscribite!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Le usator te ha blocate."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Non subscribite!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Non poteva deler auto-subscription."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Non poteva deler subscription."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Benvenite a %1$s, @%2$s!"
@@ -4548,124 +4572,124 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Pagina sin titulo"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Navigation primari del sito"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Initio"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Profilo personal e chronologia de amicos"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Cambiar tu e-mail, avatar, contrasigno, profilo"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Connecter"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Connecter con servicios"
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Modificar le configuration del sito"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invitar"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invitar amicos e collegas a accompaniar te in %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Clauder session"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Terminar le session del sito"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Crear un conto"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Identificar te a iste sito"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Adjuta"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Adjuta me!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Cercar"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Cercar personas o texto"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "Aviso del sito"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "Vistas local"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "Aviso de pagina"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Navigation secundari del sito"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "A proposito"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr "CdS"
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Confidentialitate"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Fonte"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr "Insignia"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Licentia del software StatusNet"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4674,12 +4698,12 @@ msgstr ""
"**%%site.name%%** es un servicio de microblog offerite per [%%site.broughtby%"
"%](%%site.broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** es un servicio de microblog. "
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4690,42 +4714,42 @@ msgstr ""
"net/), version %s, disponibile sub le [GNU Affero General Public License]"
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "Licentia del contento del sito"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Le contento e datos de %1$s es private e confidential."
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Contento e datos sub copyright de %1$s. Tote le derectos reservate."
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Contento e datos sub copyright del contributores. Tote le derectos reservate."
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "Totes "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "licentia."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "Post"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Ante"
@@ -5028,82 +5052,87 @@ msgstr "Errur durante le salveguarda del nota."
msgid "Specify the name of the user to subscribe to"
msgstr "Specifica le nomine del usator al qual subscriber te"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Usator non existe."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Subscribite a %s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Specifica le nomine del usator al qual cancellar le subscription"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Subscription a %s cancellate"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Commando non ancora implementate."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notification disactivate."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Non pote disactivar notification."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notification activate."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Non pote activar notification."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "Le commando de apertura de session es disactivate"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Iste ligamine pote esser usate solmente un vice, e es valide durante "
"solmente 2 minutas: %s"
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr "Tu non es subscribite a alcuno."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Tu es subscribite a iste persona:"
msgstr[1] "Tu es subscribite a iste personas:"
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "Necuno es subscribite a te."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Iste persona es subscribite a te:"
msgstr[1] "Iste personas es subscribite a te:"
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "Tu non es membro de alcun gruppo."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Tu es membro de iste gruppo:"
msgstr[1] "Tu es membro de iste gruppos:"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5888,10 +5917,6 @@ msgstr "Error durante le insertion del profilo remote"
msgid "Duplicate notice"
msgstr "Duplicar nota"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Tu ha essite blocate del subscription."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Non poteva inserer nove subscription."
@@ -6068,34 +6093,6 @@ msgstr "Personas qui seque %s"
msgid "Groups %s is a member of"
msgstr "Gruppos del quales %s es membro"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Ja subscribite!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Le usator te ha blocate."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Non poteva subscriber te."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Non poteva subcriber altere persona a te."
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Non subscribite!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Non poteva deler auto-subscription."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Non poteva deler subscription."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 3c1772861..4ff880978 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:56:30+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:03:19+0000\n"
"Language-Team: Icelandic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
"X-Message-Group: out-statusnet\n"
@@ -107,7 +107,6 @@ msgstr "Ekkert þannig merki."
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Enginn svoleiðis notandi."
@@ -564,7 +563,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Aðgangur"
@@ -950,7 +949,7 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Það komu upp vandamál varðandi setutókann þinn."
@@ -1709,7 +1708,7 @@ msgstr "Hópmeðlimir %s, síða %d"
msgid "A list of the users in this group."
msgstr "Listi yfir notendur í þessum hóp."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Stjórnandi"
@@ -2087,7 +2086,7 @@ msgstr "Rangt notendanafn eða lykilorð."
msgid "Error setting user. You are probably not authorized."
msgstr "Engin heimild."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Innskráning"
@@ -3060,7 +3059,7 @@ msgstr ""
msgid "Registration successful"
msgstr "Nýskráning tókst"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Nýskrá"
@@ -3939,7 +3938,8 @@ msgstr "Enginn lykill sleginn inn"
msgid "You are not subscribed to that profile."
msgstr "Þú ert ekki áskrifandi."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Gat ekki vistað áskrift."
@@ -4389,7 +4389,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Persónulegt"
@@ -4453,51 +4453,78 @@ msgstr "Gat ekki uppfært skilaboð með nýju veffangi."
msgid "DB error inserting hashtag: %s"
msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Gat ekki vistað babl. Óþekktur notandi."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Of mikið babl í einu; slakaðu aðeins á og haltu svo áfram eftir nokkrar "
"mínútur."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Vandamál komu upp við að vista babl."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Vandamál komu upp við að vista babl."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Gagnagrunnsvilla við innsetningu svars: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi"
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Notandinn hefur lokað á þig."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Ekki í áskrift!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Gat ekki eytt áskrift."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Gat ekki eytt áskrift."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
@@ -4547,128 +4574,128 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Ónafngreind síða"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Stikl aðalsíðu"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Heim"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Persónuleg síða og vinarás"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
"Breyttu tölvupóstinum þínum, einkennismyndinni þinni, lykilorðinu þínu, "
"persónulegu síðunni þinni"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Tengjast"
-#: lib/action.php:445
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Gat ekki framsent til vefþjóns: %s"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "Stikl aðalsíðu"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Bjóða"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Bjóða vinum og vandamönnum að slást í hópinn á %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Útskráning"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Skrá þig út af síðunni"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Búa til aðgang"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Skrá þig inn á síðuna"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Hjálp"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Hjálp!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Leita"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Leita að fólki eða texta"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "Babl vefsíðunnar"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "Staðbundin sýn"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "Babl síðunnar"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Stikl undirsíðu"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Um"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "Spurt og svarað"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Friðhelgi"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Frumþula"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Tengiliður"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Hugbúnaðarleyfi StatusNet"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4677,12 +4704,12 @@ msgstr ""
"**%%site.name%%** er örbloggsþjónusta í boði [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** er örbloggsþjónusta."
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4693,42 +4720,42 @@ msgstr ""
"sem er gefinn út undir [GNU Affero almenningsleyfinu](http://www.fsf.org/"
"licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "Hugbúnaðarleyfi StatusNet"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "Allt "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "leyfi."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Uppröðun"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "Eftir"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Áður"
@@ -5044,83 +5071,88 @@ msgstr "Vandamál komu upp við að vista babl."
msgid "Specify the name of the user to subscribe to"
msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Enginn svoleiðis notandi."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Nú ert þú áskrifandi að %s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Nú ert þú ekki lengur áskrifandi að %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Skipun hefur ekki verið fullbúin"
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Tilkynningar af."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Get ekki slökkt á tilkynningum."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Tilkynningar á."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Get ekki kveikt á tilkynningum."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Þú ert ekki áskrifandi."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Þú ert nú þegar í áskrift að þessum notendum:"
msgstr[1] "Þú ert nú þegar í áskrift að þessum notendum:"
-#: lib/command.php:690
+#: lib/command.php:703
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
msgstr[1] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-#: lib/command.php:712
+#: lib/command.php:725
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Þú ert ekki meðlimur í þessum hópi."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Þú ert ekki meðlimur í þessum hópi."
msgstr[1] "Þú ert ekki meðlimur í þessum hópi."
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5797,11 +5829,6 @@ msgstr "Villa kom upp við að setja inn persónulega fjarsíðu"
msgid "Duplicate notice"
msgstr "Eyða babli"
-#: lib/oauthstore.php:465 lib/subs.php:48
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi"
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Gat ekki sett inn nýja áskrift."
@@ -5986,36 +6013,6 @@ msgstr "Fólk sem eru áskrifendur að %s"
msgid "Groups %s is a member of"
msgstr "Hópar sem %s er meðlimur í"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Notandinn hefur lokað á þig."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Gat ekki farið í áskrift."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Ekki í áskrift!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Gat ekki eytt áskrift."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Gat ekki eytt áskrift."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index ec02b5363..3c2b8cc8a 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:56:42+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:03:22+0000\n"
"Language-Team: Italian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
"X-Message-Group: out-statusnet\n"
@@ -101,7 +101,6 @@ msgstr "Pagina inesistente."
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Utente inesistente."
@@ -562,7 +561,7 @@ msgstr ""
"<strong>%3$s</strong> ai dati del tuo account %4$s. È consigliato fornire "
"accesso al proprio account %4$s solo ad applicazioni di cui ci si può fidare."
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Account"
@@ -618,7 +617,7 @@ msgstr "Messaggio eliminato."
#: actions/apistatusesshow.php:144
msgid "No status with that ID found."
-msgstr "Nessun stato trovato con quel ID."
+msgstr "Nessuno stato trovato con quel ID."
#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
#: lib/mailhandler.php:60
@@ -940,7 +939,7 @@ msgstr "Questa applicazione non è di tua proprietà."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Si è verificato un problema con il tuo token di sessione."
@@ -1686,7 +1685,7 @@ msgstr "Membri del gruppo %1$s, pagina %2$d"
msgid "A list of the users in this group."
msgstr "Un elenco degli utenti in questo gruppo."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Amministra"
@@ -2070,7 +2069,7 @@ msgstr "Nome utente o password non corretto."
msgid "Error setting user. You are probably not authorized."
msgstr "Errore nell'impostare l'utente. Forse non hai l'autorizzazione."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Accedi"
@@ -3030,7 +3029,7 @@ msgstr "Codice di invito non valido."
msgid "Registration successful"
msgstr "Registrazione riuscita"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registra"
@@ -3928,7 +3927,8 @@ msgstr "Nessun codice inserito"
msgid "You are not subscribed to that profile."
msgstr "Non hai una abbonamento a quel profilo."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Impossibile salvare l'abbonamento."
@@ -4390,7 +4390,7 @@ msgstr ""
msgid "Plugins"
msgstr "Plugin"
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Versione"
@@ -4453,22 +4453,22 @@ msgstr "Impossibile aggiornare il messaggio con il nuovo URI."
msgid "DB error inserting hashtag: %s"
msgstr "Errore del DB nell'inserire un hashtag: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr "Problema nel salvare il messaggio. Troppo lungo."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Problema nel salvare il messaggio. Utente sconosciuto."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra "
"qualche minuto."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4476,29 +4476,53 @@ msgstr ""
"Troppi messaggi duplicati troppo velocemente; fai una pausa e scrivi di "
"nuovo tra qualche minuto."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "Ti è proibito inviare messaggi su questo sito."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Problema nel salvare il messaggio."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
msgid "Problem saving group inbox."
msgstr "Problema nel salvare la casella della posta del gruppo."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Errore del DB nell'inserire la risposta: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Non ti è possibile abbonarti."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Hai già l'abbonamento!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "L'utente non ti consente di seguirlo."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Non hai l'abbonamento!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Impossibile eliminare l'auto-abbonamento."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Impossibile eliminare l'abbonamento."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Benvenuti su %1$s, @%2$s!"
@@ -4548,124 +4572,124 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Pagina senza nome"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Esplorazione sito primaria"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Home"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Profilo personale e attività degli amici"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Modifica la tua email, immagine, password o il tuo profilo"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Connetti"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Connettiti con altri servizi"
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Modifica la configurazione del sito"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invita"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Invita amici e colleghi a seguirti su %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Esci"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Termina la tua sessione sul sito"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Crea un account"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Accedi al sito"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Aiuto"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Aiutami!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Cerca"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Cerca persone o del testo"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "Messaggio del sito"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "Viste locali"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "Pagina messaggio"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Esplorazione secondaria del sito"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Informazioni"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr "TOS"
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Privacy"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Sorgenti"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Contatti"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr "Badge"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Licenza del software StatusNet"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4674,12 +4698,12 @@ msgstr ""
"**%%site.name%%** è un servizio di microblog offerto da [%%site.broughtby%%]"
"(%%site.broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** è un servizio di microblog. "
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4690,44 +4714,44 @@ msgstr ""
"s, disponibile nei termini della licenza [GNU Affero General Public License]"
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "Licenza del contenuto del sito"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "I contenuti e i dati di %1$s sono privati e confidenziali."
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"I contenuti e i dati sono copyright di %1$s. Tutti i diritti riservati."
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"I contenuti e i dati sono forniti dai collaboratori. Tutti i diritti "
"riservati."
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "Tutti "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "licenza."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginazione"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "Successivi"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Precedenti"
@@ -5029,82 +5053,87 @@ msgstr "Errore nel salvare il messaggio."
msgid "Specify the name of the user to subscribe to"
msgstr "Specifica il nome dell'utente a cui abbonarti."
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Utente inesistente."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Abbonati a %s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento."
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Abbonamento a %s annullato"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Comando non ancora implementato."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notifiche disattivate."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Impossibile disattivare le notifiche."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notifiche attivate."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Impossibile attivare le notifiche."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "Il comando di accesso è disabilitato"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Questo collegamento è utilizzabile una sola volta ed è valido solo per 2 "
"minuti: %s"
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr "Il tuo abbonamento è stato annullato."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Persona di cui hai già un abbonamento:"
msgstr[1] "Persone di cui hai già un abbonamento:"
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "Nessuno è abbonato ai tuoi messaggi."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Questa persona è abbonata ai tuoi messaggi:"
msgstr[1] "Queste persone sono abbonate ai tuoi messaggi:"
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "Non fai parte di alcun gruppo."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Non fai parte di questo gruppo:"
msgstr[1] "Non fai parte di questi gruppi:"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5891,10 +5920,6 @@ msgstr "Errore nell'inserire il profilo remoto"
msgid "Duplicate notice"
msgstr "Messaggio duplicato"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Non ti è possibile abbonarti."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Impossibile inserire un nuovo abbonamento."
@@ -6071,34 +6096,6 @@ msgstr "Persone abbonate a %s"
msgid "Groups %s is a member of"
msgstr "Gruppi di cui %s fa parte"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Hai già l'abbonamento!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "L'utente non ti consente di seguirlo."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Impossibile abbonarsi."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Impossibile abbonare altri a te."
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Non hai l'abbonamento!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Impossibile eliminare l'auto-abbonamento."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Impossibile eliminare l'abbonamento."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index ba52e7bfb..9b8fd009d 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:56:45+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:03:25+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: out-statusnet\n"
@@ -101,7 +101,6 @@ msgstr "そのようなページはありません。"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "そのようなユーザはいません。"
@@ -556,7 +555,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "アカウント"
@@ -933,7 +932,7 @@ msgstr "このアプリケーションのオーナーではありません。"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "あなたのセッショントークンに関する問題がありました。"
@@ -1679,7 +1678,7 @@ msgstr "%1$s グループメンバー、ページ %2$d"
msgid "A list of the users in this group."
msgstr "このグループのユーザのリスト。"
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "管理者"
@@ -2062,7 +2061,7 @@ msgstr "ユーザ名またはパスワードが間違っています。"
msgid "Error setting user. You are probably not authorized."
msgstr "ユーザ設定エラー。 あなたはたぶん承認されていません。"
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "ログイン"
@@ -3020,7 +3019,7 @@ msgstr "すみません、不正な招待コード。"
msgid "Registration successful"
msgstr "登録成功"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "登録"
@@ -3921,7 +3920,8 @@ msgstr "コードが入力されていません"
msgid "You are not subscribed to that profile."
msgstr "あなたはそのプロファイルにフォローされていません。"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "フォローを保存できません。"
@@ -4371,7 +4371,7 @@ msgstr ""
msgid "Plugins"
msgstr "プラグイン"
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "バージョン"
@@ -4435,21 +4435,21 @@ msgstr "新しいURIでメッセージをアップデートできませんでし
msgid "DB error inserting hashtag: %s"
msgstr "ハッシュタグ追加 DB エラー: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr "つぶやきを保存する際に問題が発生しました。長すぎです。"
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "つぶやきを保存する際に問題が発生しました。不明なユーザです。"
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"多すぎるつぶやきが速すぎます; 数分間の休みを取ってから再投稿してください。"
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4457,29 +4457,53 @@ msgstr ""
"多すぎる重複メッセージが速すぎます; 数分間休みを取ってから再度投稿してくださ"
"い。"
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "あなたはこのサイトでつぶやきを投稿するのが禁止されています。"
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "つぶやきを保存する際に問題が発生しました。"
-#: classes/Notice.php:790
+#: classes/Notice.php:811
msgid "Problem saving group inbox."
msgstr "グループ受信箱を保存する際に問題が発生しました。"
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "返信を追加する際にデータベースエラー : %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "あなたはフォローが禁止されました。"
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "すでにフォローしています!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "ユーザはあなたをブロックしました。"
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "フォローしていません!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "自己フォローを削除できません。"
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "フォローを削除できません"
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "ようこそ %1$s、@%2$s!"
@@ -4529,124 +4553,124 @@ msgstr ""
msgid "Untitled page"
msgstr "名称未設定ページ"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "プライマリサイトナビゲーション"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "ホーム"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "パーソナルプロファイルと友人のタイムライン"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "メールアドレス、アバター、パスワード、プロパティの変更"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "接続"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr "サービスへ接続"
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "サイト設定の変更"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "招待"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "友人や同僚が %s で加わるよう誘ってください。"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "ログアウト"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "サイトからログアウト"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "アカウントを作成"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "サイトへログイン"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "ヘルプ"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "助けて!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "検索"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "人々かテキストを検索"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "サイトつぶやき"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "ローカルビュー"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "ページつぶやき"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "セカンダリサイトナビゲーション"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "About"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "よくある質問"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "プライバシー"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "ソース"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "連絡先"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr "バッジ"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "StatusNet ソフトウェアライセンス"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4655,12 +4679,12 @@ msgstr ""
"**%%site.name%%** は [%%site.broughtby%%](%%site.broughtbyurl%%) が提供するマ"
"イクロブログサービスです。 "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** はマイクロブログサービスです。 "
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4671,41 +4695,41 @@ msgstr ""
"いています。 ライセンス [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)。"
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "サイト内容ライセンス"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "全て "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "ライセンス。"
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "ページ化"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "<<後"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "前>>"
@@ -5006,77 +5030,82 @@ msgstr "つぶやき保存エラー。"
msgid "Specify the name of the user to subscribe to"
msgstr "フォローするユーザの名前を指定してください"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "そのようなユーザはいません。"
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "%s をフォローしました"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "フォローをやめるユーザの名前を指定してください"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "%s のフォローをやめる"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "コマンドはまだ実装されていません。"
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "通知オフ。"
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "通知をオフできません。"
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "通知オン。"
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "通知をオンできません。"
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "ログインコマンドが無効になっています。"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "このリンクは、かつてだけ使用可能であり、2分間だけ良いです: %s"
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr "あなたはだれにもフォローされていません。"
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "あなたはこの人にフォローされています:"
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "誰もフォローしていません。"
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "この人はあなたにフォローされている:"
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "あなたはどのグループのメンバーでもありません。"
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "あなたはこのグループのメンバーではありません:"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5829,10 +5858,6 @@ msgstr "リモートプロファイル追加エラー"
msgid "Duplicate notice"
msgstr "重複したつぶやき"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "あなたはフォローが禁止されました。"
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "サブスクリプションを追加できません"
@@ -6009,34 +6034,6 @@ msgstr "人々は %s をフォローしました。"
msgid "Groups %s is a member of"
msgstr "グループ %s はメンバー"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "すでにフォローしています!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "ユーザはあなたをブロックしました。"
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "フォローできません。"
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "他の人があなたをフォローできません。"
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "フォローしていません!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "自己フォローを削除できません。"
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "フォローを削除できません"
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index dd89d1047..047593b47 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: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:56:48+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:03:28+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: out-statusnet\n"
@@ -105,7 +105,6 @@ msgstr "그러한 태그가 없습니다."
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "그러한 사용자는 없습니다."
@@ -567,7 +566,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "계정"
@@ -957,7 +956,7 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "당신의 세션토큰관련 문제가 있습니다."
@@ -1736,7 +1735,7 @@ msgstr "%s 그룹 회원, %d페이지"
msgid "A list of the users in this group."
msgstr "이 그룹의 회원리스트"
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "관리자"
@@ -2108,7 +2107,7 @@ msgstr "틀린 계정 또는 비밀 번호"
msgid "Error setting user. You are probably not authorized."
msgstr "인증이 되지 않았습니다."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "로그인"
@@ -3075,7 +3074,7 @@ msgstr "확인 코드 오류"
msgid "Registration successful"
msgstr "회원 가입이 성공적입니다."
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "회원가입"
@@ -3963,7 +3962,8 @@ msgstr "코드가 입력 되지 않았습니다."
msgid "You are not subscribed to that profile."
msgstr "당신은 이 프로필에 구독되지 않고있습니다."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "구독을 저장할 수 없습니다."
@@ -4410,7 +4410,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "개인적인"
@@ -4474,23 +4474,23 @@ msgstr "새 URI와 함께 메시지를 업데이트할 수 없습니다."
msgid "DB error inserting hashtag: %s"
msgstr "해쉬테그를 추가 할 때에 데이타베이스 에러 : %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "통지를 저장하는데 문제가 발생했습니다."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "게시글 저장문제. 알려지지않은 회원"
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 "
"해보세요."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4499,30 +4499,57 @@ msgstr ""
"너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 "
"해보세요."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "이 사이트에 게시글 포스팅으로부터 당신은 금지되었습니다."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "통지를 저장하는데 문제가 발생했습니다."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "통지를 저장하는데 문제가 발생했습니다."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "이 회원은 구독으로부터 당신을 차단해왔다."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "회원이 당신을 차단해왔습니다."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "구독하고 있지 않습니다!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "예약 구독을 삭제 할 수 없습니다."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "예약 구독을 삭제 할 수 없습니다."
+
+#: classes/User.php:372
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "%2$s에서 %1$s까지 메시지"
@@ -4573,127 +4600,127 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "제목없는 페이지"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "주 사이트 네비게이션"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "홈"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "개인 프로필과 친구 타임라인"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "당신의 이메일, 아바타, 비밀 번호, 프로필을 변경하세요."
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "연결"
-#: lib/action.php:445
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "서버에 재접속 할 수 없습니다 : %s"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "주 사이트 네비게이션"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "초대"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "%s에 친구를 가입시키기 위해 친구와 동료를 초대합니다."
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "로그아웃"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "이 사이트로부터 로그아웃"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "계정 만들기"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "이 사이트 로그인"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "도움말"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "도움이 필요해!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "검색"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "프로필이나 텍스트 검색"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "사이트 공지"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "로컬 뷰"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "페이지 공지"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "보조 사이트 네비게이션"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "정보"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "자주 묻는 질문"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "개인정보 취급방침"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "소스 코드"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "연락하기"
-#: lib/action.php:752
+#: lib/action.php:751
#, fuzzy
msgid "Badge"
msgstr "찔러 보기"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "라코니카 소프트웨어 라이선스"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4702,12 +4729,12 @@ msgstr ""
"**%%site.name%%** 는 [%%site.broughtby%%](%%site.broughtbyurl%%)가 제공하는 "
"마이크로블로깅서비스입니다."
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4718,42 +4745,42 @@ msgstr ""
"을 사용합니다. StatusNet는 [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 있습니다."
-#: lib/action.php:802
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "라코니카 소프트웨어 라이선스"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "모든 것"
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "라이선스"
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "페이지수"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "뒷 페이지"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "앞 페이지"
@@ -5071,80 +5098,85 @@ msgstr "통지를 저장하는데 문제가 발생했습니다."
msgid "Specify the name of the user to subscribe to"
msgstr "구독하려는 사용자의 이름을 지정하십시오."
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "그러한 사용자는 없습니다."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "%s에게 구독되었습니다."
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "구독을 해제하려는 사용자의 이름을 지정하십시오."
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "%s에서 구독을 해제했습니다."
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "명령이 아직 실행되지 않았습니다."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "알림끄기."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "알림을 끌 수 없습니다."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "알림이 켜졌습니다."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "알림을 켤 수 없습니다."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "당신은 이 프로필에 구독되지 않고있습니다."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다."
-#: lib/command.php:690
+#: lib/command.php:703
#, fuzzy
msgid "No one is subscribed to you."
msgstr "다른 사람을 구독 하실 수 없습니다."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "다른 사람을 구독 하실 수 없습니다."
-#: lib/command.php:712
+#: lib/command.php:725
#, fuzzy
msgid "You are not a member of any groups."
msgstr "당신은 해당 그룹의 멤버가 아닙니다."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다."
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5821,11 +5853,6 @@ msgstr "리모트 프로필 추가 오류"
msgid "Duplicate notice"
msgstr "통지 삭제"
-#: lib/oauthstore.php:465 lib/subs.php:48
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "이 회원은 구독으로부터 당신을 차단해왔다."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "예약 구독을 추가 할 수 없습니다."
@@ -6013,36 +6040,6 @@ msgstr "%s에 의해 구독되는 사람들"
msgid "Groups %s is a member of"
msgstr "%s 그룹들은 의 멤버입니다."
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "회원이 당신을 차단해왔습니다."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "구독 하실 수 없습니다."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "다른 사람을 구독 하실 수 없습니다."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "구독하고 있지 않습니다!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "예약 구독을 삭제 할 수 없습니다."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "예약 구독을 삭제 할 수 없습니다."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 5e7aba59f..16697578b 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:56:51+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:03:31+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: out-statusnet\n"
@@ -101,7 +101,6 @@ msgstr "Нема таква страница"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Нема таков корисник."
@@ -562,7 +561,7 @@ msgstr ""
"<strong>%3$s</strong> податоците за Вашата %4$s сметка. Треба да дозволувате "
"пристап до Вашата %4$s сметка само на трети страни на кои им верувате."
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Сметка"
@@ -943,7 +942,7 @@ msgstr "Не сте сопственик на овој програм."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Се појави проблем со Вашиот сесиски жетон."
@@ -1691,7 +1690,7 @@ msgstr "Членови на групата %1$s, стр. %2$d"
msgid "A list of the users in this group."
msgstr "Листа на корисниците на овааг група."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Администратор"
@@ -2077,7 +2076,7 @@ msgstr "Неточно корисничко име или лозинка"
msgid "Error setting user. You are probably not authorized."
msgstr "Грешка при поставувањето на корисникот. Веројатно не се заверени."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Најава"
@@ -3045,7 +3044,7 @@ msgstr "Жалиме, неважечки код за поканата."
msgid "Registration successful"
msgstr "Регистрацијата е успешна"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистрирај се"
@@ -3951,7 +3950,8 @@ msgstr "Нема внесено код"
msgid "You are not subscribed to that profile."
msgstr "Не сте претплатени на тој профил."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Не можев да ја зачувам претплатата."
@@ -4413,7 +4413,7 @@ msgstr ""
msgid "Plugins"
msgstr "Приклучоци"
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Верзија"
@@ -4475,22 +4475,22 @@ msgstr "Не можев да ја подновам пораката со нов
msgid "DB error inserting hashtag: %s"
msgstr "Грешка во базата на податоци при вметнувањето на хеш-ознака: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr "Проблем со зачувувањето на белешката. Премногу долго."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Проблем со зачувувањето на белешката. Непознат корисник."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Премногу забелњшки за прекратко време; здивнете малку и продолжете за "
"неколку минути."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4498,29 +4498,54 @@ msgstr ""
"Премногу дуплирани пораки во прекратко време; здивнете малку и продолжете за "
"неколку минути."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "Забрането Ви е да објавувате забелешки на оваа веб-страница."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Проблем во зачувувањето на белешката."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
msgid "Problem saving group inbox."
msgstr "Проблем при зачувувањето на групното приемно сандаче."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Одговор од внесот во базата: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Блокирани сте од претплаќање."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Веќе претплатено!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Корисникот Ве има блокирано."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Не сте претплатени!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Не можам да ја избришам самопретплатата."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Претплата не може да се избрише."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добредојдовте на %1$s, @%2$s!"
@@ -4570,124 +4595,124 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Страница без наслов"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Главна навигација"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Дома"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Личен профил и историја на пријатели"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Промена на е-пошта, аватар, лозинка, профил"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Поврзи се"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Поврзи се со услуги"
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Промена на конфигурацијата на веб-страницата"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Покани"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Поканете пријатели и колеги да Ви се придружат на %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Одјави се"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Одјава"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Создај сметка"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Најава"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Помош"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Напомош!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Барај"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Пребарајте луѓе или текст"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "Напомена за веб-страницата"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "Локални прегледи"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "Напомена за страницата"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Споредна навигација"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "За"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "ЧПП"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr "Услови"
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Приватност"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Изворен код"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr "Значка"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Лиценца на програмот StatusNet"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4696,12 +4721,12 @@ msgstr ""
"**%%site.name%%** е сервис за микроблогирање што ви го овозможува [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** е сервис за микроблогирање."
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4712,45 +4737,45 @@ msgstr ""
"верзија %s, достапен пд [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "Лиценца на содржините на веб-страницата"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Содржината и податоците на %1$s се лични и доверливи."
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"Авторските права на содржината и податоците се во сопственост на %1$s. Сите "
"права задржани."
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Авторските права на содржината и податоците им припаѓаат на учесниците. Сите "
"права задржани."
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "Сите "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "лиценца."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Прелом на страници"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "По"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Пред"
@@ -5053,80 +5078,85 @@ msgstr "Грешка при зачувувањето на белешката."
msgid "Specify the name of the user to subscribe to"
msgstr "Назначете го името на корисникот на којшто сакате да се претплатите"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Нема таков корисник."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Претплатено на %s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Назначете го името на корисникот од кого откажувате претплата."
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Претплатата на %s е откажана"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Наредбата сè уште не е имплементирана."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Известувањето е исклучено."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Не можам да исклучам известување."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Известувањето е вклучено."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Не можам да вклучам известување."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "Наредбата за најава е оневозможена"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "Оваа врска може да се употреби само еднаш, и трае само 2 минути: %s"
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr "Не сте претплатени никому."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Не ни го испративте тој профил."
msgstr[1] "Не ни го испративте тој профил."
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "Никој не е претплатен на Вас."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Оддалечена претплата"
msgstr[1] "Оддалечена претплата"
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "Не членувате во ниедна група."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Не ни го испративте тој профил."
msgstr[1] "Не ни го испративте тој профил."
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5915,10 +5945,6 @@ msgstr "Грешка во внесувањето на оддалечениот
msgid "Duplicate notice"
msgstr "Дуплирај забелешка"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Блокирани сте од претплаќање."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Не може да се внесе нова претплата."
@@ -6095,35 +6121,6 @@ msgstr "Луѓе претплатени на %s"
msgid "Groups %s is a member of"
msgstr "Групи кадешто членува %s"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Веќе претплатено!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Корисникот Ве има блокирано."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Претплатата е неуспешна."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Не можев да прептлатам друг корисник на Вас."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Не сте претплатени!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Не можам да ја избришам самопретплатата."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Претплата не може да се избрише."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 5e48b8635..c107f4906 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:56:54+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:03:34+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 (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: out-statusnet\n"
@@ -98,7 +98,6 @@ msgstr "Ingen slik side"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Ingen slik bruker"
@@ -552,7 +551,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Konto"
@@ -925,7 +924,7 @@ msgstr "Du er ikke eieren av dette programmet."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -1663,7 +1662,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr "En liste over brukerne i denne gruppen."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
@@ -2021,7 +2020,7 @@ msgstr "Feil brukernavn eller passord"
msgid "Error setting user. You are probably not authorized."
msgstr "Ikke autorisert."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
@@ -2959,7 +2958,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -3824,7 +3823,8 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "Klarte ikke å lagre avatar-informasjonen"
@@ -4260,7 +4260,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Personlig"
@@ -4323,48 +4323,74 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:790
+#: classes/Notice.php:811
msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr ""
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Alle abonnementer"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Klarte ikke å lagre avatar-informasjonen"
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr ""
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
@@ -4417,126 +4443,126 @@ msgstr "%1$s sin status på %2$s"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Hjem"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Koble til"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Logg ut"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:464
+#: lib/action.php:463
#, fuzzy
msgid "Create an account"
msgstr "Opprett en ny konto"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Hjelp"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgid "Help me!"
msgstr "Hjelp"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Søk"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr ""
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr ""
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Om"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "OSS/FAQ"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr ""
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Kilde"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4545,12 +4571,12 @@ msgstr ""
"**%%site.name%%** er en mikrobloggingtjeneste av [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** er en mikrobloggingtjeneste. "
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4558,41 +4584,41 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr ""
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr ""
-#: lib/action.php:1150
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "Tidligere »"
@@ -4898,83 +4924,88 @@ msgstr ""
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Ingen slik bruker"
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Ikke autorisert."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ikke autorisert."
msgstr[1] "Ikke autorisert."
-#: lib/command.php:690
+#: lib/command.php:703
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Svar til %s"
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Svar til %s"
msgstr[1] "Svar til %s"
-#: lib/command.php:712
+#: lib/command.php:725
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du er allerede logget inn!"
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du er allerede logget inn!"
msgstr[1] "Du er allerede logget inn!"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5653,10 +5684,6 @@ msgstr ""
msgid "Duplicate notice"
msgstr ""
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr ""
@@ -5842,36 +5869,6 @@ msgstr "Svar til %s"
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr ""
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr ""
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Alle abonnementer"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr ""
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 54c042b2f..34f28afbd 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:57:00+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:03:41+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: out-statusnet\n"
@@ -100,7 +100,6 @@ msgstr "Deze pagina bestaat niet"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Onbekende gebruiker."
@@ -572,7 +571,7 @@ msgstr ""
"van het type \"<strong>%3$s</strong> tot uw gebruikersgegevens. Geef alleen "
"toegang tot uw gebruiker bij %4$s aan derde partijen die u vertrouwt."
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Gebruiker"
@@ -952,7 +951,7 @@ msgstr "U bent niet de eigenaar van deze applicatie."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Er is een probleem met uw sessietoken."
@@ -1705,7 +1704,7 @@ msgstr "%1$s groeps leden, pagina %2$d"
msgid "A list of the users in this group."
msgstr "Ledenlijst van deze groep"
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Beheerder"
@@ -2095,7 +2094,7 @@ msgstr ""
"Er is een fout opgetreden bij het maken van de instellingen. U hebt "
"waarschijnlijk niet de juiste rechten."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Aanmelden"
@@ -3068,7 +3067,7 @@ msgstr "Sorry. De uitnodigingscode is ongeldig."
msgid "Registration successful"
msgstr "De registratie is voltooid"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registreren"
@@ -3975,7 +3974,8 @@ msgstr "Er is geen code ingevoerd"
msgid "You are not subscribed to that profile."
msgstr "U bent niet geabonneerd op dat profiel."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Het was niet mogelijk het abonnement op te slaan."
@@ -4440,7 +4440,7 @@ msgstr ""
msgid "Plugins"
msgstr "Plug-ins"
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Versie"
@@ -4503,26 +4503,26 @@ msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI."
msgid "DB error inserting hashtag: %s"
msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr ""
"Er is een probleem opgetreden bij het opslaan van de mededeling. Deze is te "
"lang."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr ""
"Er was een probleem bij het opslaan van de mededeling. De gebruiker is "
"onbekend."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"U hebt te snel te veel mededelingen verstuurd. Kom even op adem en probeer "
"het over enige tijd weer."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4530,33 +4530,57 @@ msgstr ""
"Te veel duplicaatberichten te snel achter elkaar. Neem een adempauze en "
"plaats over een aantal minuten pas weer een bericht."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr ""
"U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
msgid "Problem saving group inbox."
msgstr ""
"Er is een probleem opgetreden bij het opslaan van het Postvak IN van de "
"groep."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
"Er is een databasefout opgetreden bij het invoegen van het antwoord: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "U mag zich niet abonneren."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "U bent al gebonneerd!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Deze gebruiker negeert u."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Niet geabonneerd!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Het was niet mogelijk het abonnement op uzelf te verwijderen."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Kon abonnement niet verwijderen."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Welkom bij %1$s, @%2$s!"
@@ -4606,124 +4630,124 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Naamloze pagina"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Primaire sitenavigatie"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Start"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Persoonlijk profiel en tijdlijn van vrienden"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Uw e-mailadres, avatar, wachtwoord of profiel wijzigen"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Koppelen"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Met diensten verbinden"
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Websiteinstellingen wijzigen"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Uitnodigen"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Afmelden"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Van de site afmelden"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Gebruiker aanmaken"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Bij de site aanmelden"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Help"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Help me!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Zoeken"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Naar gebruikers of tekst zoeken"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "Mededeling van de website"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "Lokale weergaven"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "Mededeling van de pagina"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Secundaire sitenavigatie"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Over"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "Veel gestelde vragen"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr "Gebruiksvoorwaarden"
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Privacy"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Broncode"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Contact"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr "Widget"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Licentie van de StatusNet-software"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4732,12 +4756,12 @@ msgstr ""
"**%%site.name%%** is een microblogdienst van [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** is een microblogdienst. "
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4748,45 +4772,45 @@ msgstr ""
"versie %s, beschikbaar onder de [GNU Affero General Public License](http://"
"www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "Licentie voor siteinhoud"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Inhoud en gegevens van %1$s zijn persoonlijk en vertrouwelijk."
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"Auteursrechten op inhoud en gegevens rusten bij %1$s. Alle rechten "
"voorbehouden."
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Auteursrechten op inhoud en gegevens rusten bij de respectievelijke "
"gebruikers. Alle rechten voorbehouden."
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "Alle "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "licentie."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginering"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "Later"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Eerder"
@@ -5091,83 +5115,88 @@ msgstr "Er is een fout opgetreden bij het opslaan van de mededeling."
msgid "Specify the name of the user to subscribe to"
msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Onbekende gebruiker."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Geabonneerd op %s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
"Geef de naam op van de gebruiker waarvoor u het abonnement wilt opzeggen"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Uw abonnement op %s is opgezegd"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Dit commando is nog niet geïmplementeerd."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notificaties uitgeschakeld."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Het is niet mogelijk de mededelingen uit te schakelen."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notificaties ingeschakeld."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Het is niet mogelijk de notificatie uit te schakelen."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "Het aanmeldcommando is uitgeschakeld"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Deze verwijzing kan slechts één keer gebruikt worden en is twee minuten "
"geldig: %s"
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr "U bent op geen enkele gebruiker geabonneerd."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "U bent geabonneerd op deze gebruiker:"
msgstr[1] "U bent geabonneerd op deze gebruikers:"
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "Niemand heeft een abonnenment op u."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Deze gebruiker is op u geabonneerd:"
msgstr[1] "Deze gebruikers zijn op u geabonneerd:"
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "U bent lid van geen enkele groep."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "U bent lid van deze groep:"
msgstr[1] "U bent lid van deze groepen:"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5959,10 +5988,6 @@ msgstr ""
msgid "Duplicate notice"
msgstr "Duplicaatmelding"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "U mag zich niet abonneren."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Kon nieuw abonnement niet toevoegen."
@@ -6139,34 +6164,6 @@ msgstr "Gebruikers met een abonnement op %s"
msgid "Groups %s is a member of"
msgstr "Groepen waar %s lid van is"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "U bent al gebonneerd!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Deze gebruiker negeert u."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Kan niet abonneren "
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Het was niet mogelijk om een ander op u te laten abonneren"
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Niet geabonneerd!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Het was niet mogelijk het abonnement op uzelf te verwijderen."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Kon abonnement niet verwijderen."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index b82d1f96a..02da6a191 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: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:56:57+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:03:37+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 (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
"X-Message-Group: out-statusnet\n"
@@ -105,7 +105,6 @@ msgstr "Dette emneord finst ikkje."
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Brukaren finst ikkje."
@@ -565,7 +564,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Konto"
@@ -955,7 +954,7 @@ msgstr "Du er ikkje medlem av den gruppa."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Det var eit problem med sesjons billetten din."
@@ -1736,7 +1735,7 @@ msgstr "%s medlemmar i gruppa, side %d"
msgid "A list of the users in this group."
msgstr "Ei liste over brukarane i denne gruppa."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
@@ -2110,7 +2109,7 @@ msgstr "Feil brukarnamn eller passord"
msgid "Error setting user. You are probably not authorized."
msgstr "Ikkje autorisert."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logg inn"
@@ -3085,7 +3084,7 @@ msgstr "Feil med stadfestingskode."
msgid "Registration successful"
msgstr "Registreringa gikk bra"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrér"
@@ -3977,7 +3976,8 @@ msgstr "Ingen innskriven kode"
msgid "You are not subscribed to that profile."
msgstr "Du tingar ikkje oppdateringar til den profilen."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Kunne ikkje lagra abonnement."
@@ -4429,7 +4429,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Personleg"
@@ -4493,22 +4493,22 @@ msgstr "Kunne ikkje oppdatere melding med ny URI."
msgid "DB error inserting hashtag: %s"
msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Feil ved lagring av notis. Ukjend brukar."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4516,30 +4516,57 @@ msgid ""
msgstr ""
"For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Databasefeil, kan ikkje lagra svar: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Brukar har blokkert deg."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Ikkje tinga."
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Kan ikkje sletta tinging."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Kan ikkje sletta tinging."
+
+#: classes/User.php:372
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Melding til %1$s på %2$s"
@@ -4590,127 +4617,127 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Ingen tittel"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Navigasjon for hovudsida"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Heim"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Personleg profil og oversyn over vener"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Endra e-posten, avataren, passordet eller profilen"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Kopla til"
-#: lib/action.php:445
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Klarte ikkje å omdirigera til tenaren: %s"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "Navigasjon for hovudsida"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Invitér"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Inviter vennar og kollega til å bli med deg på %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Logg ut"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Logg ut or sida"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Opprett ny konto"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Logg inn or sida"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Hjelp"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Hjelp meg!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Søk"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Søk etter folk eller innhald"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "Statusmelding"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "Lokale syningar"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "Sidenotis"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Andrenivås side navigasjon"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Om"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "OSS"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Personvern"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Kjeldekode"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:752
+#: lib/action.php:751
#, fuzzy
msgid "Badge"
msgstr "Dult"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "StatusNets programvarelisens"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4719,12 +4746,12 @@ msgstr ""
"**%%site.name%%** er ei mikrobloggingteneste av [%%site.broughtby%%](%%site."
"broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** er ei mikrobloggingteneste. "
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4735,42 +4762,42 @@ msgstr ""
"%s, tilgjengeleg under [GNU Affero General Public License](http://www.fsf."
"org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "StatusNets programvarelisens"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "Alle"
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "lisens."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginering"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "« Etter"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Før »"
@@ -5088,83 +5115,88 @@ msgstr "Eit problem oppstod ved lagring av notis."
msgid "Specify the name of the user to subscribe to"
msgstr "Spesifer namnet til brukaren du vil tinge"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Brukaren finst ikkje."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Tingar %s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Spesifer namnet til brukar du vil fjerne tinging på"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Tingar ikkje %s lengre"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Kommando ikkje implementert."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notifikasjon av."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Kan ikkje skru av notifikasjon."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notifikasjon på."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Kan ikkje slå på notifikasjon."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Du tingar ikkje oppdateringar til den profilen."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Du tingar allereie oppdatering frå desse brukarane:"
msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:"
-#: lib/command.php:690
+#: lib/command.php:703
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Kan ikkje tinga andre til deg."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Kan ikkje tinga andre til deg."
msgstr[1] "Kan ikkje tinga andre til deg."
-#: lib/command.php:712
+#: lib/command.php:725
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du er ikkje medlem av den gruppa."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du er ikkje medlem av den gruppa."
msgstr[1] "Du er ikkje medlem av den gruppa."
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5848,11 +5880,6 @@ msgstr "Feil med å henta inn ekstern profil"
msgid "Duplicate notice"
msgstr "Slett notis"
-#: lib/oauthstore.php:465 lib/subs.php:48
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Kan ikkje leggja til ny tinging."
@@ -6040,36 +6067,6 @@ msgstr "Mennesker som tingar %s"
msgid "Groups %s is a member of"
msgstr "Grupper %s er medlem av"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Brukar har blokkert deg."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Kan ikkje tinga."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Kan ikkje tinga andre til deg."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Ikkje tinga."
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Kan ikkje sletta tinging."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Kan ikkje sletta tinging."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index a66185027..d404e00bd 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:57:04+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:03:44+0000\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pl\n"
"X-Message-Group: out-statusnet\n"
@@ -103,7 +103,6 @@ msgstr "Nie ma takiej strony"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Brak takiego użytkownika."
@@ -562,7 +561,7 @@ msgstr ""
"uzyskać możliwość <strong>%3$s</strong> danych konta %4$s. Dostęp do konta %4"
"$s powinien być udostępniany tylko zaufanym osobom trzecim."
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Konto"
@@ -938,7 +937,7 @@ msgstr "Nie jesteś właścicielem tej aplikacji."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Wystąpił problem z tokenem sesji."
@@ -1675,7 +1674,7 @@ msgstr "Członkowie grupy %1$s, strona %2$d"
msgid "A list of the users in this group."
msgstr "Lista użytkowników znajdujących się w tej grupie."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Administrator"
@@ -2059,7 +2058,7 @@ msgstr "Niepoprawna nazwa użytkownika lub hasło."
msgid "Error setting user. You are probably not authorized."
msgstr "Błąd podczas ustawiania użytkownika. Prawdopodobnie brak upoważnienia."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Zaloguj się"
@@ -3019,7 +3018,7 @@ msgstr "Nieprawidłowy kod zaproszenia."
msgid "Registration successful"
msgstr "Rejestracja powiodła się"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Zarejestruj się"
@@ -3919,7 +3918,8 @@ msgstr "Nie podano kodu"
msgid "You are not subscribed to that profile."
msgstr "Nie jesteś subskrybowany do tego profilu."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Nie można zapisać subskrypcji."
@@ -4380,7 +4380,7 @@ msgstr ""
msgid "Plugins"
msgstr "Wtyczki"
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Wersja"
@@ -4444,22 +4444,22 @@ msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL."
msgid "DB error inserting hashtag: %s"
msgstr "Błąd bazy danych podczas wprowadzania znacznika mieszania: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr "Problem podczas zapisywania wpisu. Za długi."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Za dużo wpisów w za krótkim czasie, weź głęboki oddech i wyślij ponownie za "
"kilka minut."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4467,29 +4467,53 @@ msgstr ""
"Za dużo takich samych wiadomości w za krótkim czasie, weź głęboki oddech i "
"wyślij ponownie za kilka minut."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "Zabroniono ci wysyłania wpisów na tej witrynie."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Problem podczas zapisywania wpisu."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
msgid "Problem saving group inbox."
msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Zablokowano subskrybowanie."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Już subskrybowane."
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Użytkownik zablokował cię."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Niesubskrybowane."
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Nie można usunąć autosubskrypcji."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Nie można usunąć subskrypcji."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Witaj w %1$s, @%2$s."
@@ -4539,124 +4563,124 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Strona bez nazwy"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Główna nawigacja witryny"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Strona domowa"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Profil osobisty i oś czasu przyjaciół"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Zmień adres e-mail, awatar, hasło, profil"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Połącz"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Połącz z serwisami"
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Zmień konfigurację witryny"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Zaproś"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Wyloguj się"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Wyloguj się z witryny"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Utwórz konto"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Zaloguj się na witrynie"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Pomoc"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Pomóż mi."
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Wyszukaj"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Wyszukaj osoby lub tekst"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "Wpis witryny"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "Lokalne widoki"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "Wpis strony"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Druga nawigacja witryny"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "O usłudze"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr "TOS"
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Prywatność"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Kod źródłowy"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr "Odznaka"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Licencja oprogramowania StatusNet"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4665,12 +4689,12 @@ msgstr ""
"**%%site.name%%** jest usługą mikroblogowania prowadzoną przez [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** jest usługą mikroblogowania. "
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4681,45 +4705,45 @@ msgstr ""
"status.net/) w wersji %s, dostępnego na [Powszechnej Licencji Publicznej GNU "
"Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "Licencja zawartości witryny"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Treść i dane %1$s są prywatne i poufne."
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"Prawa autorskie do treści i danych są własnością %1$s. Wszystkie prawa "
"zastrzeżone."
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Prawa autorskie do treści i danych są własnością współtwórców. Wszystkie "
"prawa zastrzeżone."
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "Wszystko "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "licencja."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginacja"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "Później"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Wcześniej"
@@ -5021,85 +5045,90 @@ msgstr "Błąd podczas zapisywania wpisu."
msgid "Specify the name of the user to subscribe to"
msgstr "Podaj nazwę użytkownika do subskrybowania."
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Brak takiego użytkownika."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Subskrybowano użytkownika %s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji."
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Usunięto subskrypcję użytkownika %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Nie zaimplementowano polecenia."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Wyłączono powiadomienia."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Nie można wyłączyć powiadomień."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Włączono powiadomienia."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Nie można włączyć powiadomień."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "Polecenie logowania jest wyłączone"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Tego odnośnika można użyć tylko raz i będzie prawidłowy tylko przez dwie "
"minuty: %s."
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr "Nie subskrybujesz nikogo."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Subskrybujesz tę osobę:"
msgstr[1] "Subskrybujesz te osoby:"
msgstr[2] "Subskrybujesz te osoby:"
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "Nikt cię nie subskrybuje."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Ta osoba cię subskrybuje:"
msgstr[1] "Te osoby cię subskrybują:"
msgstr[2] "Te osoby cię subskrybują:"
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "Nie jesteś członkiem żadnej grupy."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Jesteś członkiem tej grupy:"
msgstr[1] "Jesteś członkiem tych grup:"
msgstr[2] "Jesteś członkiem tych grup:"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5884,10 +5913,6 @@ msgstr "Błąd podczas wprowadzania zdalnego profilu"
msgid "Duplicate notice"
msgstr "Duplikat wpisu"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Zablokowano subskrybowanie."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Nie można wprowadzić nowej subskrypcji."
@@ -6065,34 +6090,6 @@ msgstr "Osoby subskrybowane do %s"
msgid "Groups %s is a member of"
msgstr "Grupy %s są członkiem"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Już subskrybowane."
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Użytkownik zablokował cię."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Nie można subskrybować."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Nie można subskrybować innych do ciebie."
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Niesubskrybowane."
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Nie można usunąć autosubskrypcji."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Nie można usunąć subskrypcji."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 7b700eded..5fb83226e 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:57:07+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:03:46+0000\n"
"Language-Team: Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: out-statusnet\n"
@@ -102,7 +102,6 @@ msgstr "Página não encontrada."
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Utilizador não encontrado."
@@ -558,7 +557,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Conta"
@@ -940,7 +939,7 @@ msgstr "Não é membro deste grupo."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Ocorreu um problema com a sua sessão."
@@ -1702,7 +1701,7 @@ msgstr "Membros do grupo %1$s, página %2$d"
msgid "A list of the users in this group."
msgstr "Uma lista dos utilizadores neste grupo."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Gestor"
@@ -2086,7 +2085,7 @@ msgstr "Nome de utilizador ou senha incorrectos."
msgid "Error setting user. You are probably not authorized."
msgstr "Erro ao preparar o utilizador. Provavelmente não está autorizado."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Entrar"
@@ -3061,7 +3060,7 @@ msgstr "Desculpe, código de convite inválido."
msgid "Registration successful"
msgstr "Registo efectuado"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registar"
@@ -3964,7 +3963,8 @@ msgstr "Nenhum código introduzido"
msgid "You are not subscribed to that profile."
msgstr "Não subscreveu esse perfil."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Não foi possível gravar a subscrição."
@@ -4424,7 +4424,7 @@ msgstr ""
msgid "Plugins"
msgstr "Plugins"
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Versão"
@@ -4489,22 +4489,22 @@ msgstr "Não foi possível actualizar a mensagem com a nova URI."
msgid "DB error inserting hashtag: %s"
msgstr "Erro na base de dados ao inserir a marca: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr "Problema na gravação da nota. Demasiado longa."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Problema na gravação da nota. Utilizador desconhecido."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Demasiadas notas, demasiado rápido; descanse e volte a publicar daqui a "
"alguns minutos."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4512,30 +4512,54 @@ msgstr ""
"Demasiadas mensagens duplicadas, demasiado rápido; descanse e volte a "
"publicar daqui a alguns minutos."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "Está proibido de publicar notas neste site."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Problema na gravação da nota."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problema na gravação da nota."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Foi bloqueado de fazer subscrições"
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Já subscrito!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "O utilizador bloqueou-o."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Não subscrito!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Não foi possível apagar a auto-subscrição."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Não foi possível apagar a subscrição."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "%1$s dá-lhe as boas-vindas, @%2$s!"
@@ -4585,124 +4609,124 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "Página sem título"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Navegação primária deste site"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Início"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Perfil pessoal e notas dos amigos"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Altere o seu endereço electrónico, avatar, senha, perfil"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Ligar"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Ligar aos serviços"
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Alterar a configuração do site"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Convidar"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convidar amigos e colegas para se juntarem a si em %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Sair"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Terminar esta sessão"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Criar uma conta"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Iniciar uma sessão"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Ajuda"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Ajudem-me!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Pesquisa"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Procurar pessoas ou pesquisar texto"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "Aviso do site"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "Vistas locais"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "Aviso da página"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Navegação secundária deste site"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Sobre"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr "Termos"
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Privacidade"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Código"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Contacto"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr "Emblema"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Licença de software do StatusNet"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4711,12 +4735,12 @@ msgstr ""
"**%%site.name%%** é um serviço de microblogues disponibilizado por [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** é um serviço de microblogues. "
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4727,41 +4751,41 @@ msgstr ""
"disponibilizado nos termos da [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "Licença de conteúdos do site"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "Tudo "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "licença."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginação"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "Posteriores"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Anteriores"
@@ -5066,82 +5090,87 @@ msgstr "Erro ao gravar nota."
msgid "Specify the name of the user to subscribe to"
msgstr "Introduza o nome do utilizador para subscrever"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Utilizador não encontrado."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Subscreveu %s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Introduza o nome do utilizador para deixar de subscrever"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Deixou de subscrever %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Comando ainda não implementado."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notificação desligada."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Não foi possível desligar a notificação."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notificação ligada."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Não foi possível ligar a notificação."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "Comando para iniciar sessão foi desactivado"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Esta ligação é utilizável uma única vez e só durante os próximos 2 minutos: %"
"s"
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr "Não subscreveu ninguém."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Subscreveu esta pessoa:"
msgstr[1] "Subscreveu estas pessoas:"
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "Ninguém subscreve as suas notas."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Esta pessoa subscreve as suas notas:"
msgstr[1] "Estas pessoas subscrevem as suas notas:"
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "Não está em nenhum grupo."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Está no grupo:"
msgstr[1] "Está nos grupos:"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5925,10 +5954,6 @@ msgstr "Erro ao inserir perfil remoto"
msgid "Duplicate notice"
msgstr "Nota duplicada"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Foi bloqueado de fazer subscrições"
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Não foi possível inserir nova subscrição."
@@ -6105,34 +6130,6 @@ msgstr "Pessoas que subscrevem %s"
msgid "Groups %s is a member of"
msgstr "Grupos de que %s é membro"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Já subscrito!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "O utilizador bloqueou-o."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Não foi possível subscrever."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Não foi possível que outro o subscrevesse."
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Não subscrito!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Não foi possível apagar a auto-subscrição."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Não foi possível apagar a subscrição."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 0d3d92e18..93e575677 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:57:10+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:03:50+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 (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: out-statusnet\n"
@@ -101,7 +101,6 @@ msgstr "Esta página não existe."
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Este usuário não existe."
@@ -567,7 +566,7 @@ msgstr ""
"fornecer acesso à sua conta %4$s somente para terceiros nos quais você "
"confia."
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Conta"
@@ -945,7 +944,7 @@ msgstr "Você não é o dono desta aplicação."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Ocorreu um problema com o seu token de sessão."
@@ -1694,7 +1693,7 @@ msgstr "Membros do grupo %1$s, pág. %2$d"
msgid "A list of the users in this group."
msgstr "Uma lista dos usuários deste grupo."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Admin"
@@ -2081,7 +2080,7 @@ msgid "Error setting user. You are probably not authorized."
msgstr ""
"Erro na configuração do usuário. Você provavelmente não tem autorização."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Entrar"
@@ -3053,7 +3052,7 @@ msgstr "Desculpe, mas o código do convite é inválido."
msgid "Registration successful"
msgstr "Registro realizado com sucesso"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrar-se"
@@ -3380,9 +3379,9 @@ msgid "Statistics"
msgstr "Estatísticas"
#: actions/showapplication.php:203
-#, fuzzy, php-format
+#, php-format
msgid "Created by %1$s - %2$s access by default - %3$d users"
-msgstr "criado por %1$s - %2$s acessa por padrão - %3$d usuários"
+msgstr "Criado por %1$s - acesso %2$s por padrão - %3$d usuários"
#: actions/showapplication.php:213
msgid "Application actions"
@@ -3425,14 +3424,13 @@ msgstr ""
"assinatura em texto plano."
#: actions/showapplication.php:309
-#, fuzzy
msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "Tem certeza que deseja excluir esta mensagem?"
+msgstr "Tem certeza que deseja restaurar sua chave e segredo de consumidor?"
#: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s's favorite notices, page %2$d"
-msgstr "Mensagens favoritas de %s"
+msgstr "Mensagens favoritas de %1$s, pág. %2$d"
#: actions/showfavorites.php:132
msgid "Could not retrieve favorite notices."
@@ -3492,9 +3490,9 @@ msgid "%s group"
msgstr "Grupo %s"
#: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
msgid "%1$s group, page %2$d"
-msgstr "Membros do grupo %1$s, pág. %2$d"
+msgstr "Grupo %1$s, pág. %2$d"
#: actions/showgroup.php:218
msgid "Group profile"
@@ -3617,9 +3615,9 @@ msgid " tagged %s"
msgstr " etiquetada %s"
#: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s, page %2$d"
-msgstr "%1$s e amigos, pág. %2$d"
+msgstr "%1$s, pág. %2$d"
#: actions/showstream.php:122
#, php-format
@@ -3953,7 +3951,8 @@ msgstr "Não foi digitado nenhum código"
msgid "You are not subscribed to that profile."
msgstr "Você não está assinando esse perfil."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Não foi possível salvar a assinatura."
@@ -4055,9 +4054,9 @@ msgid "SMS"
msgstr "SMS"
#: actions/tag.php:68
-#, fuzzy, php-format
+#, php-format
msgid "Notices tagged with %1$s, page %2$d"
-msgstr "Usuários auto-etiquetados com %1$s - pág. %2$d"
+msgstr "Mensagens etiquetadas com %1$s, pág. %2$d"
#: actions/tag.php:86
#, php-format
@@ -4342,9 +4341,9 @@ msgid "Enjoy your hotdog!"
msgstr "Aproveite o seu cachorro-quente!"
#: actions/usergroups.php:64
-#, fuzzy, php-format
+#, php-format
msgid "%1$s groups, page %2$d"
-msgstr "Membros do grupo %1$s, pág. %2$d"
+msgstr "Grupos de %1$s, pág. %2$d"
#: actions/usergroups.php:130
msgid "Search for more groups"
@@ -4417,7 +4416,7 @@ msgstr ""
msgid "Plugins"
msgstr "Plugins"
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Versão"
@@ -4478,22 +4477,22 @@ msgstr "Não foi possível atualizar a mensagem com a nova URI."
msgid "DB error inserting hashtag: %s"
msgstr "Erro no banco de dados durante a inserção da hashtag: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr "Problema no salvamento da mensagem. Ela é muito extensa."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Problema no salvamento da mensagem. Usuário desconhecido."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Muitas mensagens em um período curto de tempo; dê uma respirada e publique "
"novamente daqui a alguns minutos."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4501,30 +4500,53 @@ msgstr ""
"Muitas mensagens duplicadas em um período curto de tempo; dê uma respirada e "
"publique novamente daqui a alguns minutos."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "Você está proibido de publicar mensagens neste site."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Problema no salvamento da mensagem."
-#: classes/Notice.php:790
-#, fuzzy
+#: classes/Notice.php:811
msgid "Problem saving group inbox."
-msgstr "Problema no salvamento da mensagem."
+msgstr "Problema no salvamento das mensagens recebidas do grupo."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Erro no banco de dados na inserção da reposta: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Você está proibido de assinar."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Já assinado!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "O usuário bloqueou você."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Não assinado!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Não foi possível excluir a auto-assinatura."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Não foi possível excluir a assinatura."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Bem vindo(a) a %1$s, @%2$s!"
@@ -4574,124 +4596,124 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Página sem título"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Navegação primária no site"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Início"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Perfil pessoal e fluxo de mensagens dos amigos"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Mude seu e-mail, avatar, senha, perfil"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Conectar"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Conecte-se a outros serviços"
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Mude as configurações do site"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Convidar"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Convide seus amigos e colegas para unir-se a você no %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Sair"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Sai do site"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Cria uma conta"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Autentique-se no site"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Ajuda"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Ajudem-me!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Procurar"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Procura por pessoas ou textos"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "Mensagem do site"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "Visualizações locais"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "Notícia da página"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Navegação secundária no site"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Sobre"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr "Termos de uso"
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Privacidade"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Fonte"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Contato"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr "Mini-aplicativo"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Licença do software StatusNet"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4700,12 +4722,12 @@ msgstr ""
"**%%site.name%%** é um serviço de microblog disponibilizado por [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** é um serviço de microblog. "
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4716,43 +4738,43 @@ msgstr ""
"versão %s, disponível sob a [GNU Affero General Public License] (http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "Licença do conteúdo do site"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "O conteúdo e os dados de %1$s são privados e confidenciais."
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Conteúdo e dados licenciados sob %1$s. Todos os direitos reservados."
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Conteúdo e dados licenciados pelos colaboradores. Todos os direitos "
"reservados."
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "Todas "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "licença."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginação"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "Próximo"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Anterior"
@@ -4785,32 +4807,33 @@ msgid "Design configuration"
msgstr "Configuração da aparência"
#: lib/adminpanelaction.php:322
-#, fuzzy
msgid "User configuration"
-msgstr "Configuração dos caminhos"
+msgstr "Configuração do usuário"
#: lib/adminpanelaction.php:327
-#, fuzzy
msgid "Access configuration"
-msgstr "Configuração da aparência"
+msgstr "Configuração do acesso"
#: lib/adminpanelaction.php:332
msgid "Paths configuration"
msgstr "Configuração dos caminhos"
#: lib/adminpanelaction.php:337
-#, fuzzy
msgid "Sessions configuration"
-msgstr "Configuração da aparência"
+msgstr "Configuração das sessões"
#: lib/apiauth.php:95
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
+"Os recursos de API exigem acesso de leitura e escrita, mas você possui "
+"somente acesso de leitura."
#: lib/apiauth.php:273
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
+"A tentativa de autenticação na API falhou, identificação = %1$s, proxy = %2"
+"$s, ip = %3$s"
#: lib/applicationeditform.php:136
msgid "Edit application"
@@ -5055,82 +5078,87 @@ msgstr "Erro no salvamento da mensagem."
msgid "Specify the name of the user to subscribe to"
msgstr "Especifique o nome do usuário que será assinado"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Este usuário não existe."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Efetuada a assinatura de %s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Especifique o nome do usuário cuja assinatura será cancelada"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Cancelada a assinatura de %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "O comando não foi implementado ainda."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notificação desligada."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Não é possível desligar a notificação."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notificação ligada."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Não é possível ligar a notificação."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "O comando para autenticação está desabilitado"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Este link é utilizável somente uma vez e é válido somente por dois minutos: %"
"s"
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr "Você não está assinando ninguém."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Você já está assinando esta pessoa:"
msgstr[1] "Você já está assinando estas pessoas:"
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "Ninguém o assinou ainda."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Esta pessoa está assinando você:"
msgstr[1] "Estas pessoas estão assinando você:"
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "Você não é membro de nenhum grupo."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Você é membro deste grupo:"
msgstr[1] "Você é membro destes grupos:"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5917,10 +5945,6 @@ msgstr "Erro na inserção do perfil remoto"
msgid "Duplicate notice"
msgstr "Duplicar a mensagem"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Você está proibido de assinar."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Não foi possível inserir a nova assinatura."
@@ -6028,7 +6052,7 @@ msgstr "Repetir esta mensagem"
#: lib/router.php:665
msgid "No single user defined for single-user mode."
-msgstr ""
+msgstr "Nenhum usuário definido para o modo de usuário único."
#: lib/sandboxform.php:67
msgid "Sandbox"
@@ -6097,34 +6121,6 @@ msgstr "Assinantes de %s"
msgid "Groups %s is a member of"
msgstr "Grupos dos quais %s é membro"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Já assinado!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "O usuário bloqueou você."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Não foi possível assinar."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Não foi possível fazer com que outros o assinem."
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Não assinado!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Não foi possível excluir a auto-assinatura."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Não foi possível excluir a assinatura."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index e1dd38e99..57cb89884 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:57:13+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:03:52+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: out-statusnet\n"
@@ -104,7 +104,6 @@ msgstr "Нет такой страницы"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Нет такого пользователя."
@@ -565,7 +564,7 @@ msgstr ""
"предоставлять разрешение на доступ к вашей учётной записи %4$s только тем "
"сторонним приложениям, которым вы доверяете."
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Настройки"
@@ -942,7 +941,7 @@ msgstr "Вы не являетесь владельцем этого прило
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
@@ -1695,7 +1694,7 @@ msgstr "Участники группы %1$s, страница %2$d"
msgid "A list of the users in this group."
msgstr "Список пользователей, являющихся членами этой группы."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Настройки"
@@ -2081,7 +2080,7 @@ msgstr "Некорректное имя или пароль."
msgid "Error setting user. You are probably not authorized."
msgstr "Ошибка установки пользователя. Вы, вероятно, не авторизованы."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Вход"
@@ -3036,7 +3035,7 @@ msgstr "Извините, неверный пригласительный код
msgid "Registration successful"
msgstr "Регистрация успешна!"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Регистрация"
@@ -3942,7 +3941,8 @@ msgstr "Код не введён"
msgid "You are not subscribed to that profile."
msgstr "Вы не подписаны на этот профиль."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Не удаётся сохранить подписку."
@@ -4403,7 +4403,7 @@ msgstr ""
msgid "Plugins"
msgstr "Плагины"
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Версия"
@@ -4464,22 +4464,22 @@ msgstr "Не удаётся обновить сообщение с новым UR
msgid "DB error inserting hashtag: %s"
msgstr "Ошибка баз данных при вставке хеш-тегов для %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr "Проблемы с сохранением записи. Слишком длинно."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Проблема при сохранении записи. Неизвестный пользователь."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Слишком много записей за столь короткий срок; передохните немного и "
"попробуйте вновь через пару минут."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4487,29 +4487,53 @@ msgstr ""
"Слишком много одинаковых записей за столь короткий срок; передохните немного "
"и попробуйте вновь через пару минут."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "Вам запрещено поститься на этом сайте (бан)"
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Проблемы с сохранением записи."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
msgid "Problem saving group inbox."
msgstr "Проблемы с сохранением входящих сообщений группы."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Ошибка баз данных при вставке ответа для %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Вы заблокированы от подписки."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Уже подписаны!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Пользователь заблокировал Вас."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Не подписаны!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Невозможно удалить самоподписку."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Не удаётся удалить подписку."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добро пожаловать на %1$s, @%2$s!"
@@ -4559,124 +4583,124 @@ msgstr "%1$s — %2$s"
msgid "Untitled page"
msgstr "Страница без названия"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Главная навигация"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Моё"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Личный профиль и лента друзей"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Изменить ваш email, аватару, пароль, профиль"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Соединить"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Соединить с сервисами"
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Изменить конфигурацию сайта"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Пригласить"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Пригласите друзей и коллег стать такими же как вы участниками %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Выход"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Выйти"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Создать новый аккаунт"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Войти"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Помощь"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Помощь"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Поиск"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Искать людей или текст"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "Новая запись"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "Локальные виды"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "Новая запись"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Навигация по подпискам"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "О проекте"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "ЧаВо"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr "TOS"
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Пользовательское соглашение"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Исходный код"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Контактная информация"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr "Бедж"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "StatusNet лицензия"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4685,12 +4709,12 @@ msgstr ""
"**%%site.name%%** — это сервис микроблогинга, созданный для вас при помощи [%"
"%site.broughtby%%](%%site.broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** — сервис микроблогинга. "
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4702,44 +4726,44 @@ msgstr ""
"лицензией [GNU Affero General Public License](http://www.fsf.org/licensing/"
"licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "Лицензия содержимого сайта"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Содержание и данные %1$s являются личными и конфиденциальными."
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
"Авторские права на содержание и данные принадлежат %1$s. Все права защищены."
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Авторские права на содержание и данные принадлежат разработчикам. Все права "
"защищены."
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "All "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "license."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Разбиение на страницы"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "Сюда"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Туда"
@@ -5041,83 +5065,88 @@ msgstr "Проблемы с сохранением записи."
msgid "Specify the name of the user to subscribe to"
msgstr "Укажите имя пользователя для подписки."
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Нет такого пользователя."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Подписано на %s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Укажите имя пользователя для отмены подписки."
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Отписано от %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Команда ещё не выполнена."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Оповещение отсутствует."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Нет оповещения."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Есть оповещение."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Есть оповещение."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "Команда входа отключена"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "Эта ссылка действительна только один раз в течение 2 минут: %s"
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr "Вы ни на кого не подписаны."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Вы подписаны на этих людей:"
msgstr[1] "Вы подписаны на этих людей:"
msgstr[2] "Вы подписаны на этих людей:"
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "Никто не подписан на вас."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Эти люди подписались на вас:"
msgstr[1] "Эти люди подписались на вас:"
msgstr[2] "Эти люди подписались на вас:"
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "Вы не состоите ни в одной группе."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Вы являетесь участником следующих групп:"
msgstr[1] "Вы являетесь участником следующих групп:"
msgstr[2] "Вы являетесь участником следующих групп:"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5901,10 +5930,6 @@ msgstr "Ошибка вставки удалённого профиля"
msgid "Duplicate notice"
msgstr "Дублировать запись"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Вы заблокированы от подписки."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Не удаётся вставить новую подписку."
@@ -6081,34 +6106,6 @@ msgstr "Люди подписанные на %s"
msgid "Groups %s is a member of"
msgstr "Группы, в которых состоит %s"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Уже подписаны!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Пользователь заблокировал Вас."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Подписка неудачна."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Не удаётся подписать других на вашу ленту."
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Не подписаны!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Невозможно удалить самоподписку."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Не удаётся удалить подписку."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/statusnet.po b/locale/statusnet.po
index 6fbf80065..13b038cbf 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: 2010-02-18 22:55+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+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"
@@ -96,7 +96,6 @@ msgstr ""
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr ""
@@ -536,7 +535,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr ""
@@ -909,7 +908,7 @@ msgstr ""
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -1625,7 +1624,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1955,7 +1954,7 @@ msgstr ""
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr ""
@@ -2873,7 +2872,7 @@ msgstr ""
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -3697,7 +3696,8 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr ""
@@ -4119,7 +4119,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr ""
@@ -4178,48 +4178,72 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:790
+#: classes/Notice.php:811
msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr ""
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr ""
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr ""
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
@@ -4269,136 +4293,136 @@ msgstr ""
msgid "Untitled page"
msgstr ""
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr ""
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr ""
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr ""
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr ""
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr ""
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr ""
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr ""
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr ""
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr ""
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr ""
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr ""
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr ""
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr ""
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4406,41 +4430,41 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr ""
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr ""
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr ""
@@ -4734,80 +4758,84 @@ msgstr ""
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr ""
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] ""
msgstr[1] ""
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] ""
msgstr[1] ""
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] ""
msgstr[1] ""
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5459,10 +5487,6 @@ msgstr ""
msgid "Duplicate notice"
msgstr ""
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr ""
@@ -5639,34 +5663,6 @@ msgstr ""
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr ""
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr ""
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr ""
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr ""
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr ""
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index cc959b8ea..ed733a719 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:57:16+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:03:56+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: out-statusnet\n"
@@ -100,7 +100,6 @@ msgstr "Ingen sådan sida"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Ingen sådan användare."
@@ -553,7 +552,7 @@ msgstr ""
"möjligheten att <strong>%3$s</strong> din %4$s kontoinformation. Du bör bara "
"ge tillgång till ditt %4$s-konto till tredje-parter du litar på."
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Konto"
@@ -931,7 +930,7 @@ msgstr "Du är inte ägaren av denna applikation."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Det var ett problem med din sessions-token."
@@ -1674,7 +1673,7 @@ msgstr "%1$s gruppmedlemmar, sida %2$d"
msgid "A list of the users in this group."
msgstr "En lista av användarna i denna grupp."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Administratör"
@@ -2059,7 +2058,7 @@ msgstr "Felaktigt användarnamn eller lösenord."
msgid "Error setting user. You are probably not authorized."
msgstr "Fel vid inställning av användare. Du har sannolikt inte tillstånd."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Logga in"
@@ -3019,7 +3018,7 @@ msgstr "Tyvärr, ogiltig inbjudningskod."
msgid "Registration successful"
msgstr "Registreringen genomförd"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Registrera"
@@ -3918,7 +3917,8 @@ msgstr "Ingen kod ifylld"
msgid "You are not subscribed to that profile."
msgstr "Du är inte prenumerat hos den profilen."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Kunde inte spara prenumeration."
@@ -4382,7 +4382,7 @@ msgstr ""
msgid "Plugins"
msgstr "Insticksmoduler"
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Version"
@@ -4443,22 +4443,22 @@ msgstr "Kunde inte uppdatera meddelande med ny URI."
msgid "DB error inserting hashtag: %s"
msgstr "Databasfel vid infogning av hashtag: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr "Problem vid sparande av notis. För långt."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Problem vid sparande av notis. Okänd användare."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"För många notiser för snabbt; ta en vilopaus och posta igen om ett par "
"minuter."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4466,29 +4466,53 @@ msgstr ""
"För många duplicerade meddelanden för snabbt; ta en vilopaus och posta igen "
"om ett par minuter."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "Du är utestängd från att posta notiser på denna webbplats."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Problem med att spara notis."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
msgid "Problem saving group inbox."
msgstr "Problem med att spara gruppinkorg."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Databasfel vid infogning av svar: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Du har blivit utestängd från att prenumerera."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Redan prenumerant!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Användaren har blockerat dig."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Inte prenumerant!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Kunde inte ta bort själv-prenumeration."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Kunde inte ta bort prenumeration."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Välkommen till %1$s, @%2$s!"
@@ -4538,124 +4562,124 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr "Namnlös sida"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Primär webbplatsnavigation"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Hem"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Personlig profil och vänners tidslinje"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Ändra din e-post, avatar, lösenord, profil"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Anslut"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr "Anslut till tjänster"
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Ändra webbplatskonfiguration"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Bjud in"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Bjud in vänner och kollegor att gå med dig på %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Logga ut"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Logga ut från webbplatsen"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Skapa ett konto"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Logga in på webbplatsen"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Hjälp"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Hjälp mig!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Sök"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Sök efter personer eller text"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "Webbplatsnotis"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "Lokala vyer"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "Sidnotis"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Sekundär webbplatsnavigation"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Om"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "Frågor & svar"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr "Användarvillkor"
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Sekretess"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Källa"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Kontakt"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr "Emblem"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Programvarulicens för StatusNet"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4664,12 +4688,12 @@ msgstr ""
"**%%site.name%%** är en mikrobloggtjänst tillhandahållen av [%%site.broughtby"
"%%](%%site.broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** är en mikrobloggtjänst. "
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4680,42 +4704,42 @@ msgstr ""
"version %s, tillgänglig under [GNU Affero General Public License](http://www."
"fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "Licens för webbplatsinnehåll"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Innehåll och data av %1$s är privat och konfidensiell."
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Innehåll och data copyright av %1$s. Alla rättigheter reserverade."
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Innehåll och data copyright av medarbetare. Alla rättigheter reserverade."
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "Alla "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "licens."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Numrering av sidor"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "Senare"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Tidigare"
@@ -5016,81 +5040,86 @@ msgstr "Fel vid sparande av notis."
msgid "Specify the name of the user to subscribe to"
msgstr "Ange namnet på användaren att prenumerara på"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Ingen sådan användare."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Prenumerar på %s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Ange namnet på användaren att avsluta prenumeration på"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Prenumeration hos %s avslutad"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Kommando inte implementerat än."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Notifikation av."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Kan inte sätta på notifikation."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Notifikation på."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Kan inte stänga av notifikation."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "Inloggningskommando är inaktiverat"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Denna länk är endast användbar en gång, och gäller bara i 2 minuter: %s"
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr "Du prenumererar inte på någon."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Du prenumererar på denna person:"
msgstr[1] "Du prenumererar på dessa personer:"
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "Ingen prenumerar på dig."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Denna person prenumererar på dig:"
msgstr[1] "Dessa personer prenumererar på dig:"
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "Du är inte medlem i några grupper."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Du är en medlem i denna grupp:"
msgstr[1] "Du är en medlem i dessa grupper:"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5872,10 +5901,6 @@ msgstr "Fel vid infogning av fjärrprofilen"
msgid "Duplicate notice"
msgstr "Duplicerad notis"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Du har blivit utestängd från att prenumerera."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Kunde inte infoga ny prenumeration."
@@ -6052,34 +6077,6 @@ msgstr "Personer som prenumererar på %s"
msgid "Groups %s is a member of"
msgstr "Grupper %s är en medlem i"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Redan prenumerant!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Användaren har blockerat dig."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Kunde inte prenumerera."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Kunde inte göra andra till prenumeranter hos dig."
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Inte prenumerant!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Kunde inte ta bort själv-prenumeration."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Kunde inte ta bort prenumeration."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index fce5e5d69..19debf94d 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: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:57:19+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:04:04+0000\n"
"Language-Team: Telugu\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
"X-Message-Group: out-statusnet\n"
@@ -101,7 +101,6 @@ msgstr "అటువంటి పేజీ లేదు"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "అటువంటి వాడుకరి లేరు."
@@ -551,7 +550,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "ఖాతా"
@@ -927,7 +926,7 @@ msgstr "మీరు ఈ ఉపకరణం యొక్క యజమాని
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -1657,7 +1656,7 @@ msgstr "%1$s గుంపు సభ్యులు, పేజీ %2$d"
msgid "A list of the users in this group."
msgstr "ఈ గుంపులో వాడుకరులు జాబితా."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -1996,7 +1995,7 @@ msgstr "వాడుకరిపేరు లేదా సంకేతపదం
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "ప్రవేశించండి"
@@ -2947,7 +2946,7 @@ msgstr "క్షమించండి, తప్పు ఆహ్వాన స
msgid "Registration successful"
msgstr "నమోదు విజయవంతం"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "నమోదు"
@@ -3802,7 +3801,8 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "చందాని సృష్టించలేకపోయాం."
@@ -4232,7 +4232,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "సంచిక"
@@ -4291,51 +4291,77 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:215
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "ఈ సైటులో నోటీసులు రాయడం నుండి మిమ్మల్ని నిషేధించారు."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "చందాచేరడం నుండి మిమ్మల్ని నిషేధించారు."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "ఇప్పటికే చందాచేరారు!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "వాడుకరి మిమ్మల్ని నిరోధించారు."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "చందాదార్లు"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "చందాని తొలగించలేకపోయాం."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "చందాని తొలగించలేకపోయాం."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "@%2$s, %1$sకి స్వాగతం!"
@@ -4386,126 +4412,126 @@ msgstr "%1$s - %2$s"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "ముంగిలి"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "మీ ఈమెయిలు, అవతారం, సంకేతపదం మరియు ప్రౌఫైళ్ళను మార్చుకోండి"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "అనుసంధానించు"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr ""
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "చందాలు"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "ఆహ్వానించు"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "నిష్క్రమించు"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "సైటు నుండి నిష్క్రమించు"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "కొత్త ఖాతా సృష్టించు"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "సైటులోని ప్రవేశించు"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "సహాయం"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "సహాయం కావాలి!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "వెతుకు"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "సైటు గమనిక"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "స్థానిక వీక్షణలు"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "పేజీ గమనిక"
-#: lib/action.php:728
+#: lib/action.php:727
#, fuzzy
msgid "Secondary site navigation"
msgstr "చందాలు"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "గురించి"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "ప్రశ్నలు"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr "సేవా నియమాలు"
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "అంతరంగికత"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "మూలము"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "సంప్రదించు"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr "బాడ్జి"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైసెన్సు"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4514,12 +4540,12 @@ msgstr ""
"**%%site.name%%** అనేది [%%site.broughtby%%](%%site.broughtbyurl%%) వారు "
"అందిస్తున్న మైక్రో బ్లాగింగు సదుపాయం. "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగింగు సదుపాయం."
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4530,42 +4556,42 @@ msgstr ""
"html) కింద లభ్యమయ్యే [స్టేటస్&zwnj;నెట్](http://status.net/) మైక్రోబ్లాగింగ్ ఉపకరణం సంచిక %s "
"పై నడుస్తుంది."
-#: lib/action.php:802
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "కొత్త సందేశం"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "అన్నీ "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "పేజీకరణ"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "తర్వాత"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "ఇంతక్రితం"
@@ -4875,80 +4901,85 @@ msgstr "సందేశాన్ని భద్రపరచడంలో పొ
msgid "Specify the name of the user to subscribe to"
msgstr "ఏవరికి చందా చేరాలనుకుంటున్నారో ఆ వాడుకరి పేరు తెలియజేయండి"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "అటువంటి వాడుకరి లేరు."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "%sకి చందా చేరారు"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "ఎవరి నుండి చందా విరమించాలనుకుంటున్నారో ఆ వాడుకరి పేరు తెలియజేయండి"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "%s నుండి చందా విరమించారు"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr "ఈ లంకెని ఒకే సారి ఉపయోగించగలరు, మరియు అది పనిచేసేది 2 నిమిషాలు మాత్రమే: %s"
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr "మీరు ఎవరికీ చందాచేరలేదు."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "%sకి స్పందనలు"
msgstr[1] "%sకి స్పందనలు"
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "మీకు చందాదార్లు ఎవరూ లేరు."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "%sకి స్పందనలు"
msgstr[1] "%sకి స్పందనలు"
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "మీరు ఏ గుంపులోనూ సభ్యులు కాదు."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5635,10 +5666,6 @@ msgstr "దూరపు ప్రొపైలుని చేర్చటంల
msgid "Duplicate notice"
msgstr "కొత్త సందేశం"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "చందాచేరడం నుండి మిమ్మల్ని నిషేధించారు."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr ""
@@ -5821,36 +5848,6 @@ msgstr "%sకి చందాచేరిన వ్యక్తులు"
msgid "Groups %s is a member of"
msgstr "%s సభ్యులుగా ఉన్న గుంపులు"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "ఇప్పటికే చందాచేరారు!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "వాడుకరి మిమ్మల్ని నిరోధించారు."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "చందా చేర్చలేకపోయాం."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "చందాదార్లు"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "చందాని తొలగించలేకపోయాం."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "చందాని తొలగించలేకపోయాం."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index d65a14b40..441b4458f 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:57:22+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:04: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 (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: out-statusnet\n"
@@ -106,7 +106,6 @@ msgstr "Böyle bir durum mesajı yok."
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Böyle bir kullanıcı yok."
@@ -567,7 +566,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
#, fuzzy
msgid "Account"
msgstr "Hakkında"
@@ -962,7 +961,7 @@ msgstr "Bize o profili yollamadınız"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -1728,7 +1727,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -2080,7 +2079,7 @@ msgstr "Yanlış kullanıcı adı veya parola."
msgid "Error setting user. You are probably not authorized."
msgstr "Yetkilendirilmemiş."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Giriş"
@@ -3048,7 +3047,7 @@ msgstr "Onay kodu hatası."
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Kayıt"
@@ -3905,7 +3904,8 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr "Bize o profili yollamadınız"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "Abonelik oluşturulamadı."
@@ -4350,7 +4350,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Kişisel"
@@ -4413,51 +4413,78 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:215
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Cevap eklenirken veritabanı hatası: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Kullanıcının profili yok."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Abonelik silinemedi."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Abonelik silinemedi."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
@@ -4511,131 +4538,131 @@ msgstr "%1$s'in %2$s'deki durum mesajları "
msgid "Untitled page"
msgstr ""
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Başlangıç"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Bağlan"
-#: lib/action.php:445
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Sunucuya yönlendirme yapılamadı: %s"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "Abonelikler"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Çıkış"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:464
+#: lib/action.php:463
#, fuzzy
msgid "Create an account"
msgstr "Yeni hesap oluştur"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Yardım"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgid "Help me!"
msgstr "Yardım"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Ara"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:494
+#: lib/action.php:493
#, fuzzy
msgid "Site notice"
msgstr "Yeni durum mesajı"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:626
+#: lib/action.php:625
#, fuzzy
msgid "Page notice"
msgstr "Yeni durum mesajı"
-#: lib/action.php:728
+#: lib/action.php:727
#, fuzzy
msgid "Secondary site navigation"
msgstr "Abonelikler"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Hakkında"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "SSS"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Gizlilik"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Kaynak"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "İletişim"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4644,12 +4671,12 @@ msgstr ""
"**%%site.name%%** [%%site.broughtby%%](%%site.broughtbyurl%%)\" tarafından "
"hazırlanan anında mesajlaşma ağıdır. "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4660,43 +4687,43 @@ msgstr ""
"licenses/agpl-3.0.html) lisansı ile korunan [StatusNet](http://status.net/) "
"microbloglama yazılımının %s. versiyonunu kullanmaktadır."
-#: lib/action.php:802
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "Yeni durum mesajı"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1142
+#: lib/action.php:1141
#, fuzzy
msgid "After"
msgstr "« Sonra"
-#: lib/action.php:1150
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "Önce »"
@@ -5013,80 +5040,85 @@ msgstr "Durum mesajını kaydederken hata oluştu."
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Böyle bir kullanıcı yok."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Bize o profili yollamadınız"
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Bize o profili yollamadınız"
-#: lib/command.php:690
+#: lib/command.php:703
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Uzaktan abonelik"
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Uzaktan abonelik"
-#: lib/command.php:712
+#: lib/command.php:725
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Bize o profili yollamadınız"
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Bize o profili yollamadınız"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5772,10 +5804,6 @@ msgstr "Uzak profil eklemede hata oluştu"
msgid "Duplicate notice"
msgstr "Yeni durum mesajı"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Yeni abonelik eklenemedi."
@@ -5962,37 +5990,6 @@ msgstr "Uzaktan abonelik"
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-#, fuzzy
-msgid "User has blocked you."
-msgstr "Kullanıcının profili yok."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr ""
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Abonelik silinemedi."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Abonelik silinemedi."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 9899d51db..3efac8de1 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:57:25+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:04:18+0000\n"
"Language-Team: Ukrainian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: out-statusnet\n"
@@ -103,7 +103,6 @@ msgstr "Немає такої сторінки"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Такого користувача немає."
@@ -562,7 +561,7 @@ msgstr ""
"на доступ до Вашого акаунту %4$s лише тим стороннім додаткам, яким Ви "
"довіряєте."
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "Акаунт"
@@ -940,7 +939,7 @@ msgstr "Ви не є власником цього додатку."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Виникли певні проблеми з токеном поточної сесії."
@@ -1679,7 +1678,7 @@ msgstr "Учасники групи %1$s, сторінка %2$d"
msgid "A list of the users in this group."
msgstr "Список учасників цієї групи."
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "Адмін"
@@ -2066,7 +2065,7 @@ msgstr "Неточне ім’я або пароль."
msgid "Error setting user. You are probably not authorized."
msgstr "Помилка. Можливо, Ви не авторизовані."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Увійти"
@@ -3030,7 +3029,7 @@ msgstr "Даруйте, помилка у коді запрошення."
msgid "Registration successful"
msgstr "Реєстрація успішна"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Реєстрація"
@@ -3928,7 +3927,8 @@ msgstr "Код не введено"
msgid "You are not subscribed to that profile."
msgstr "Ви не підписані до цього профілю."
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
msgstr "Не вдалося зберегти підписку."
@@ -4389,7 +4389,7 @@ msgstr ""
msgid "Plugins"
msgstr "Додатки"
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
msgid "Version"
msgstr "Версія"
@@ -4450,22 +4450,22 @@ msgstr "Не можна оновити повідомлення з новим UR
msgid "DB error inserting hashtag: %s"
msgstr "Помилка бази даних при додаванні теґу: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
msgid "Problem saving notice. Too long."
msgstr "Проблема при збереженні допису. Надто довге."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
msgid "Problem saving notice. Unknown user."
msgstr "Проблема при збереженні допису. Невідомий користувач."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Дуже багато дописів за короткий термін; ходіть подихайте повітрям і "
"повертайтесь за кілька хвилин."
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4473,29 +4473,53 @@ msgstr ""
"Дуже багато повідомлень за короткий термін; ходіть подихайте повітрям і "
"повертайтесь за кілька хвилин."
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "Вам заборонено надсилати дописи до цього сайту."
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Проблема при збереженні допису."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
msgid "Problem saving group inbox."
msgstr "Проблема при збереженні вхідних дописів для групи."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Помилка бази даних при додаванні відповіді: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr "Вас позбавлено можливості підписатись."
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr "Вже підписаний!"
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr "Користувач заблокував Вас."
+
+#: classes/Subscription.php:157
+msgid "Not subscribed!"
+msgstr "Не підписано!"
+
+#: classes/Subscription.php:163
+msgid "Couldn't delete self-subscription."
+msgstr "Не можу видалити самопідписку."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Не вдалося видалити підписку."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Вітаємо на %1$s, @%2$s!"
@@ -4545,124 +4569,124 @@ msgstr "%1$s — %2$s"
msgid "Untitled page"
msgstr "Сторінка без заголовку"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "Відправна навігація по сайту"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Дім"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "Персональний профіль і стрічка друзів"
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr "Змінити електронну адресу, аватару, пароль, профіль"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "З’єднання"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect to services"
msgstr "З’єднання з сервісами"
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr "Змінити конфігурацію сайту"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Запросити"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Запросіть друзів та колег приєднатись до Вас на %s"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Вийти"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "Вийти з сайту"
-#: lib/action.php:464
+#: lib/action.php:463
msgid "Create an account"
msgstr "Створити новий акаунт"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "Увійти на сайт"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Допомога"
-#: lib/action.php:470
+#: lib/action.php:469
msgid "Help me!"
msgstr "Допоможіть!"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Пошук"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "Пошук людей або текстів"
-#: lib/action.php:494
+#: lib/action.php:493
msgid "Site notice"
msgstr "Зауваження сайту"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "Огляд"
-#: lib/action.php:626
+#: lib/action.php:625
msgid "Page notice"
msgstr "Зауваження сторінки"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr "Другорядна навігація по сайту"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Про"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "ЧаПи"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr "Умови"
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Конфіденційність"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Джерело"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Контакт"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr "Бедж"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "Ліцензія програмного забезпечення StatusNet"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4671,12 +4695,12 @@ msgstr ""
"**%%site.name%%** — це сервіс мікроблоґів наданий вам [%%site.broughtby%%](%%"
"site.broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** — це сервіс мікроблоґів. "
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4687,42 +4711,42 @@ msgstr ""
"для мікроблоґів, версія %s, доступному під [GNU Affero General Public "
"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
msgid "Site content license"
msgstr "Ліцензія змісту сайту"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "Зміст і дані %1$s є приватними і конфіденційними."
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "Авторські права на зміст і дані належать %1$s. Всі права захищено."
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Авторські права на зміст і дані належать розробникам. Всі права захищено."
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "Всі "
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "ліцензія."
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Нумерація сторінок"
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr "Вперед"
-#: lib/action.php:1150
+#: lib/action.php:1149
msgid "Before"
msgstr "Назад"
@@ -5023,84 +5047,89 @@ msgstr "Проблема при збереженні допису."
msgid "Specify the name of the user to subscribe to"
msgstr "Зазначте ім’я користувача, до якого бажаєте підписатись"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Такого користувача немає."
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Підписано до %s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "Зазначте ім’я користувача, від якого бажаєте відписатись"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "Відписано від %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "Виконання команди ще не завершено."
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "Сповіщення вимкнуто."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "Не можна вимкнути сповіщення."
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "Сповіщення увімкнуто."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "Не можна увімкнути сповіщення."
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr "Команду входу відключено"
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
"Це посилання можна використати лише раз, воно дійсне протягом 2 хвилин: %s"
-#: lib/command.php:668
+#: lib/command.php:681
msgid "You are not subscribed to anyone."
msgstr "Ви не маєте жодних підписок."
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Ви підписані до цієї особи:"
msgstr[1] "Ви підписані до цих людей:"
msgstr[2] "Ви підписані до цих людей:"
-#: lib/command.php:690
+#: lib/command.php:703
msgid "No one is subscribed to you."
msgstr "До Вас ніхто не підписаний."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Ця особа є підписаною до Вас:"
msgstr[1] "Ці люди підписані до Вас:"
msgstr[2] "Ці люди підписані до Вас:"
-#: lib/command.php:712
+#: lib/command.php:725
msgid "You are not a member of any groups."
msgstr "Ви не є учасником жодної групи."
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Ви є учасником групи:"
msgstr[1] "Ви є учасником таких груп:"
msgstr[2] "Ви є учасником таких груп:"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5881,10 +5910,6 @@ msgstr "Помилка при додаванні віддаленого проф
msgid "Duplicate notice"
msgstr "Дублікат допису"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr "Вас позбавлено можливості підписатись."
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Не вдалося додати нову підписку."
@@ -6061,34 +6086,6 @@ msgstr "Люди підписані до %s"
msgid "Groups %s is a member of"
msgstr "%s бере участь в цих групах"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr "Вже підписаний!"
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr "Користувач заблокував Вас."
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "Невдала підписка."
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "Не вдалося підписати інших до Вас."
-
-#: lib/subs.php:137
-msgid "Not subscribed!"
-msgstr "Не підписано!"
-
-#: lib/subs.php:142
-msgid "Couldn't delete self-subscription."
-msgstr "Не можу видалити самопідписку."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Не вдалося видалити підписку."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index dcfb3d767..34e7f4123 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: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:57:29+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:04:21+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
"X-Message-Group: out-statusnet\n"
@@ -105,7 +105,6 @@ msgstr "Không có tin nhắn nào."
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "Không có user nào."
@@ -569,7 +568,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
#, fuzzy
msgid "Account"
msgstr "Giới thiệu"
@@ -966,7 +965,7 @@ msgstr "Bạn chưa cập nhật thông tin riêng"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
#, fuzzy
msgid "There was a problem with your session token."
msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
@@ -1771,7 +1770,7 @@ msgstr "Thành viên"
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -2161,7 +2160,7 @@ msgstr "Sai tên đăng nhập hoặc mật khẩu."
msgid "Error setting user. You are probably not authorized."
msgstr "Chưa được phép."
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "Đăng nhập"
@@ -3148,7 +3147,7 @@ msgstr "Lỗi xảy ra với mã xác nhận."
msgid "Registration successful"
msgstr "Đăng ký thành công"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "Đăng ký"
@@ -4044,7 +4043,8 @@ msgstr "Không có mã nào được nhập"
msgid "You are not subscribed to that profile."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "Không thể tạo đăng nhận."
@@ -4499,7 +4499,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "Cá nhân"
@@ -4565,51 +4565,78 @@ msgstr "Không thể cập nhật thông tin user với địa chỉ email đã
msgid "DB error inserting hashtag: %s"
msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:218
+#: classes/Notice.php:219
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%s (%s)"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+#, fuzzy
+msgid "User has blocked you."
+msgstr "Người dùng không có thông tin."
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Chưa đăng nhận!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "Không thể xóa đăng nhận."
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "Không thể xóa đăng nhận."
+
+#: classes/User.php:372
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "%s chào mừng bạn "
@@ -4664,135 +4691,135 @@ msgstr "%s (%s)"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "Trang chủ"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:441
#, fuzzy
msgid "Change your email, avatar, password, profile"
msgstr "Thay đổi mật khẩu của bạn"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "Kết nối"
-#: lib/action.php:445
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "Không thể chuyển đến máy chủ: %s"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "Tôi theo"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "Thư mời"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, fuzzy, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
"Điền địa chỉ email và nội dung tin nhắn để gửi thư mời bạn bè và đồng nghiệp "
"của bạn tham gia vào dịch vụ này."
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "Thoát"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:464
+#: lib/action.php:463
#, fuzzy
msgid "Create an account"
msgstr "Tạo tài khoản mới"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "Hướng dẫn"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgid "Help me!"
msgstr "Hướng dẫn"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "Tìm kiếm"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:494
+#: lib/action.php:493
#, fuzzy
msgid "Site notice"
msgstr "Thông báo mới"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:626
+#: lib/action.php:625
#, fuzzy
msgid "Page notice"
msgstr "Thông báo mới"
-#: lib/action.php:728
+#: lib/action.php:727
#, fuzzy
msgid "Secondary site navigation"
msgstr "Tôi theo"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "Giới thiệu"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "FAQ"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "Riêng tư"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "Nguồn"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "Liên hệ"
-#: lib/action.php:752
+#: lib/action.php:751
#, fuzzy
msgid "Badge"
msgstr "Tin đã gửi"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4801,12 +4828,12 @@ msgstr ""
"**%%site.name%%** là dịch vụ gửi tin nhắn được cung cấp từ [%%site.broughtby%"
"%](%%site.broughtbyurl%%). "
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn. "
-#: lib/action.php:787
+#: lib/action.php:786
#, fuzzy, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4817,43 +4844,43 @@ msgstr ""
"quyền [GNU Affero General Public License](http://www.fsf.org/licensing/"
"licenses/agpl-3.0.html)."
-#: lib/action.php:802
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "Tìm theo nội dung của tin nhắn"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1142
+#: lib/action.php:1141
#, fuzzy
msgid "After"
msgstr "Sau"
-#: lib/action.php:1150
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "Trước"
@@ -5176,82 +5203,87 @@ msgstr "Có lỗi xảy ra khi lưu tin nhắn."
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "Không có user nào."
+
+#: lib/command.php:561
#, fuzzy, php-format
msgid "Subscribed to %s"
msgstr "Theo nhóm này"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, fuzzy, php-format
msgid "Unsubscribed from %s"
msgstr "Hết theo"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
#, fuzzy
msgid "Notification off."
msgstr "Không có mã số xác nhận."
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
#, fuzzy
msgid "Notification on."
msgstr "Không có mã số xác nhận."
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Bạn đã theo những người này:"
-#: lib/command.php:690
+#: lib/command.php:703
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Không thể tạo favorite."
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "Không thể tạo favorite."
-#: lib/command.php:712
+#: lib/command.php:725
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "Bạn chưa cập nhật thông tin riêng"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -6001,10 +6033,6 @@ msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân"
msgid "Duplicate notice"
msgstr "Xóa tin nhắn"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "Không thể chèn thêm vào đăng nhận."
@@ -6197,39 +6225,6 @@ msgstr "Theo nhóm này"
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-#, fuzzy
-msgid "User has blocked you."
-msgstr "Người dùng không có thông tin."
-
-#: lib/subs.php:63
-#, fuzzy
-msgid "Could not subscribe."
-msgstr "Chưa đăng nhận!"
-
-#: lib/subs.php:82
-#, fuzzy
-msgid "Could not subscribe other to you."
-msgstr "Không thể tạo favorite."
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Chưa đăng nhận!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "Không thể xóa đăng nhận."
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "Không thể xóa đăng nhận."
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 038dd6498..838ed646d 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:57:32+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:04:24+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 (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: out-statusnet\n"
@@ -107,7 +107,6 @@ msgstr "没有该页面"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "没有这个用户。"
@@ -567,7 +566,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
msgid "Account"
msgstr "帐号"
@@ -962,7 +961,7 @@ msgstr "您未告知此个人信息"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
#, fuzzy
msgid "There was a problem with your session token."
msgstr "会话标识有问题,请重试。"
@@ -1748,7 +1747,7 @@ msgstr "%s 组成员, 第 %d 页"
msgid "A list of the users in this group."
msgstr "该组成员列表。"
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr "admin管理员"
@@ -2119,7 +2118,7 @@ msgstr "用户名或密码不正确。"
msgid "Error setting user. You are probably not authorized."
msgstr "未认证。"
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "登录"
@@ -3086,7 +3085,7 @@ msgstr "验证码出错。"
msgid "Registration successful"
msgstr "注册成功。"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr "注册"
@@ -3973,7 +3972,8 @@ msgstr "没有输入验证码"
msgid "You are not subscribed to that profile."
msgstr "您未告知此个人信息"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "无法删除订阅。"
@@ -4426,7 +4426,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "个人"
@@ -4490,52 +4490,80 @@ msgstr "无法添加新URI的信息。"
msgid "DB error inserting hashtag: %s"
msgstr "添加标签时数据库出错:%s"
-#: classes/Notice.php:214
+#: classes/Notice.php:215
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "保存通告时出错。"
-#: classes/Notice.php:218
+#: classes/Notice.php:219
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "保存通告时出错。"
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr "你在短时间里发布了过多的消息,请深呼吸,过几分钟再发消息。"
-#: classes/Notice.php:229
+#: classes/Notice.php:230
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr "你在短时间里发布了过多的消息,请深呼吸,过几分钟再发消息。"
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr "在这个网站你被禁止发布消息。"
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr "保存通告时出错。"
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "保存通告时出错。"
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "添加回复时数据库出错:%s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "那个用户阻止了你的订阅。"
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+#, fuzzy
+msgid "User has blocked you."
+msgstr "用户没有个人信息。"
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "未订阅!"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "无法删除订阅。"
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "无法删除订阅。"
+
+#: classes/User.php:372
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "发送给 %1$s 的 %2$s 消息"
@@ -4587,133 +4615,133 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "无标题页"
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr "主站导航"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "主页"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr "个人资料及朋友年表"
-#: lib/action.php:442
+#: lib/action.php:441
#, fuzzy
msgid "Change your email, avatar, password, profile"
msgstr "修改资料"
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "连接"
-#: lib/action.php:445
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "无法重定向到服务器:%s"
-#: lib/action.php:449
+#: lib/action.php:448
#, fuzzy
msgid "Change site configuration"
msgstr "主站导航"
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr "邀请"
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, fuzzy, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "使用这个表单来邀请好友和同事加入。"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "登出"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr "登出本站"
-#: lib/action.php:464
+#: lib/action.php:463
#, fuzzy
msgid "Create an account"
msgstr "创建新帐号"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr "登入本站"
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "帮助"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgid "Help me!"
msgstr "帮助"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr "搜索"
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr "检索人或文字"
-#: lib/action.php:494
+#: lib/action.php:493
#, fuzzy
msgid "Site notice"
msgstr "新通告"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr "本地显示"
-#: lib/action.php:626
+#: lib/action.php:625
#, fuzzy
msgid "Page notice"
msgstr "新通告"
-#: lib/action.php:728
+#: lib/action.php:727
#, fuzzy
msgid "Secondary site navigation"
msgstr "次项站导航"
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "关于"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "常见问题FAQ"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr "隐私"
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr "来源"
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "联系人"
-#: lib/action.php:752
+#: lib/action.php:751
#, fuzzy
msgid "Badge"
msgstr "呼叫"
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr "StatusNet软件注册证"
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4722,12 +4750,12 @@ msgstr ""
"**%%site.name%%** 是一个微博客服务,提供者为 [%%site.broughtby%%](%%site."
"broughtbyurl%%)。"
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** 是一个微博客服务。"
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4738,43 +4766,43 @@ msgstr ""
"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
"授权。"
-#: lib/action.php:802
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "StatusNet软件注册证"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr "全部"
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr "注册证"
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr "分页"
-#: lib/action.php:1142
+#: lib/action.php:1141
#, fuzzy
msgid "After"
msgstr "« 之后"
-#: lib/action.php:1150
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "之前 »"
@@ -5093,80 +5121,85 @@ msgstr "保存通告时出错。"
msgid "Specify the name of the user to subscribe to"
msgstr "指定要订阅的用户名"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "没有这个用户。"
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "订阅 %s"
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr "指定要取消订阅的用户名"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "取消订阅 %s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "命令尚未实现。"
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "通告关闭。"
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "无法关闭通告。"
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "通告开启。"
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "无法开启通告。"
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "您未告知此个人信息"
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "您已订阅这些用户:"
-#: lib/command.php:690
+#: lib/command.php:703
#, fuzzy
msgid "No one is subscribed to you."
msgstr "无法订阅他人更新。"
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "无法订阅他人更新。"
-#: lib/command.php:712
+#: lib/command.php:725
#, fuzzy
msgid "You are not a member of any groups."
msgstr "您未告知此个人信息"
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "您未告知此个人信息"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5867,11 +5900,6 @@ msgstr "添加远程的个人信息出错"
msgid "Duplicate notice"
msgstr "删除通告"
-#: lib/oauthstore.php:465 lib/subs.php:48
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "那个用户阻止了你的订阅。"
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "无法添加新的订阅。"
@@ -6063,37 +6091,6 @@ msgstr "订阅 %s"
msgid "Groups %s is a member of"
msgstr "%s 组是成员组成了"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-#, fuzzy
-msgid "User has blocked you."
-msgstr "用户没有个人信息。"
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "无法订阅。"
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "无法订阅他人更新。"
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "未订阅!"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "无法删除订阅。"
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "无法删除订阅。"
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index e6996e152..be69293d2 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: 2010-02-18 22:55+0000\n"
-"PO-Revision-Date: 2010-02-18 22:57:35+0000\n"
+"POT-Creation-Date: 2010-02-21 23:02+0000\n"
+"PO-Revision-Date: 2010-02-21 23:04:27+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 (r62678); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.16alpha (r62792); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hant\n"
"X-Message-Group: out-statusnet\n"
@@ -103,7 +103,6 @@ msgstr "無此通知"
#: lib/command.php:163 lib/command.php:302 lib/command.php:355
#: lib/command.php:401 lib/command.php:462 lib/command.php:518
#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
-#: lib/subs.php:34 lib/subs.php:125
msgid "No such user."
msgstr "無此使用者"
@@ -559,7 +558,7 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:442
+#: actions/apioauthauthorize.php:310 lib/action.php:441
#, fuzzy
msgid "Account"
msgstr "關於"
@@ -952,7 +951,7 @@ msgstr "無法連結到伺服器:%s"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1198
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -1710,7 +1709,7 @@ msgstr ""
msgid "A list of the users in this group."
msgstr ""
-#: actions/groupmembers.php:175 lib/action.php:449 lib/groupnav.php:107
+#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
msgid "Admin"
msgstr ""
@@ -2048,7 +2047,7 @@ msgstr "使用者名稱或密碼錯誤"
msgid "Error setting user. You are probably not authorized."
msgstr ""
-#: actions/login.php:188 actions/login.php:241 lib/action.php:467
+#: actions/login.php:188 actions/login.php:241 lib/action.php:466
#: lib/logingroupnav.php:79
msgid "Login"
msgstr "登入"
@@ -2989,7 +2988,7 @@ msgstr "確認碼發生錯誤"
msgid "Registration successful"
msgstr ""
-#: actions/register.php:114 actions/register.php:503 lib/action.php:464
+#: actions/register.php:114 actions/register.php:503 lib/action.php:463
#: lib/logingroupnav.php:85
msgid "Register"
msgstr ""
@@ -3836,7 +3835,8 @@ msgstr ""
msgid "You are not subscribed to that profile."
msgstr ""
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "註冊失敗"
@@ -4272,7 +4272,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:748
+#: actions/version.php:196 lib/action.php:747
#, fuzzy
msgid "Version"
msgstr "地點"
@@ -4335,51 +4335,77 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:215
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "儲存使用者發生錯誤"
-#: classes/Notice.php:218
+#: classes/Notice.php:219
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "儲存使用者發生錯誤"
-#: classes/Notice.php:223
+#: classes/Notice.php:224
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:230
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
-#: classes/Notice.php:235
+#: classes/Notice.php:236
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:320
+#: classes/Notice.php:302 classes/Notice.php:328
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:790
+#: classes/Notice.php:811
#, fuzzy
msgid "Problem saving group inbox."
msgstr "儲存使用者發生錯誤"
-#: classes/Notice.php:850
+#: classes/Notice.php:871
#, php-format
msgid "DB error inserting reply: %s"
msgstr "增加回覆時,資料庫發生錯誤: %s"
-#: classes/Notice.php:1274
+#: classes/Notice.php:1328
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/User.php:385
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+msgid "User has blocked you."
+msgstr ""
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "此帳號已註冊"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "無法刪除帳號"
+
+#: classes/Subscription.php:179
+msgid "Couldn't delete subscription."
+msgstr "無法刪除帳號"
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
@@ -4433,129 +4459,129 @@ msgstr "%1$s的狀態是%2$s"
msgid "Untitled page"
msgstr ""
-#: lib/action.php:434
+#: lib/action.php:433
msgid "Primary site navigation"
msgstr ""
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Home"
msgstr "主頁"
-#: lib/action.php:440
+#: lib/action.php:439
msgid "Personal profile and friends timeline"
msgstr ""
-#: lib/action.php:442
+#: lib/action.php:441
msgid "Change your email, avatar, password, profile"
msgstr ""
-#: lib/action.php:445
+#: lib/action.php:444
msgid "Connect"
msgstr "連結"
-#: lib/action.php:445
+#: lib/action.php:444
#, fuzzy
msgid "Connect to services"
msgstr "無法連結到伺服器:%s"
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Change site configuration"
msgstr ""
-#: lib/action.php:453 lib/subgroupnav.php:105
+#: lib/action.php:452 lib/subgroupnav.php:105
msgid "Invite"
msgstr ""
-#: lib/action.php:454 lib/subgroupnav.php:106
+#: lib/action.php:453 lib/subgroupnav.php:106
#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr ""
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout"
msgstr "登出"
-#: lib/action.php:459
+#: lib/action.php:458
msgid "Logout from the site"
msgstr ""
-#: lib/action.php:464
+#: lib/action.php:463
#, fuzzy
msgid "Create an account"
msgstr "新增帳號"
-#: lib/action.php:467
+#: lib/action.php:466
msgid "Login to the site"
msgstr ""
-#: lib/action.php:470 lib/action.php:733
+#: lib/action.php:469 lib/action.php:732
msgid "Help"
msgstr "求救"
-#: lib/action.php:470
+#: lib/action.php:469
#, fuzzy
msgid "Help me!"
msgstr "求救"
-#: lib/action.php:473 lib/searchaction.php:127
+#: lib/action.php:472 lib/searchaction.php:127
msgid "Search"
msgstr ""
-#: lib/action.php:473
+#: lib/action.php:472
msgid "Search for people or text"
msgstr ""
-#: lib/action.php:494
+#: lib/action.php:493
#, fuzzy
msgid "Site notice"
msgstr "新訊息"
-#: lib/action.php:560
+#: lib/action.php:559
msgid "Local views"
msgstr ""
-#: lib/action.php:626
+#: lib/action.php:625
#, fuzzy
msgid "Page notice"
msgstr "新訊息"
-#: lib/action.php:728
+#: lib/action.php:727
msgid "Secondary site navigation"
msgstr ""
-#: lib/action.php:735
+#: lib/action.php:734
msgid "About"
msgstr "關於"
-#: lib/action.php:737
+#: lib/action.php:736
msgid "FAQ"
msgstr "常見問題"
-#: lib/action.php:741
+#: lib/action.php:740
msgid "TOS"
msgstr ""
-#: lib/action.php:744
+#: lib/action.php:743
msgid "Privacy"
msgstr ""
-#: lib/action.php:746
+#: lib/action.php:745
msgid "Source"
msgstr ""
-#: lib/action.php:750
+#: lib/action.php:749
msgid "Contact"
msgstr "好友名單"
-#: lib/action.php:752
+#: lib/action.php:751
msgid "Badge"
msgstr ""
-#: lib/action.php:780
+#: lib/action.php:779
msgid "StatusNet software license"
msgstr ""
-#: lib/action.php:783
+#: lib/action.php:782
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4564,12 +4590,12 @@ msgstr ""
"**%%site.name%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所提供的微型"
"部落格服務"
-#: lib/action.php:785
+#: lib/action.php:784
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%**是個微型部落格"
-#: lib/action.php:787
+#: lib/action.php:786
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4577,42 +4603,42 @@ msgid ""
"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-#: lib/action.php:802
+#: lib/action.php:801
#, fuzzy
msgid "Site content license"
msgstr "新訊息"
-#: lib/action.php:807
+#: lib/action.php:806
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:812
+#: lib/action.php:811
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:815
+#: lib/action.php:814
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:828
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:834
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1133
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1142
+#: lib/action.php:1141
msgid "After"
msgstr ""
-#: lib/action.php:1150
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "之前的內容»"
@@ -4919,80 +4945,85 @@ msgstr "儲存使用者發生錯誤"
msgid "Specify the name of the user to subscribe to"
msgstr ""
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+#, fuzzy
+msgid "No such user"
+msgstr "無此使用者"
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582
msgid "Specify the name of the user to unsubscribe from"
msgstr ""
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr ""
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr ""
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr ""
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr ""
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr ""
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr ""
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:681
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "此帳號已註冊"
-#: lib/command.php:670
+#: lib/command.php:683
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "此帳號已註冊"
-#: lib/command.php:690
+#: lib/command.php:703
#, fuzzy
msgid "No one is subscribed to you."
msgstr "無此訂閱"
-#: lib/command.php:692
+#: lib/command.php:705
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "無此訂閱"
-#: lib/command.php:712
+#: lib/command.php:725
#, fuzzy
msgid "You are not a member of any groups."
msgstr "無法連結到伺服器:%s"
-#: lib/command.php:714
+#: lib/command.php:727
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "無法連結到伺服器:%s"
-#: lib/command.php:728
+#: lib/command.php:741
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5671,10 +5702,6 @@ msgstr "新增外部個人資料發生錯誤(Error inserting remote profile)"
msgid "Duplicate notice"
msgstr "新訊息"
-#: lib/oauthstore.php:465 lib/subs.php:48
-msgid "You have been banned from subscribing."
-msgstr ""
-
#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "無法新增訂閱"
@@ -5858,36 +5885,6 @@ msgstr "此帳號已註冊"
msgid "Groups %s is a member of"
msgstr ""
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-msgid "User has blocked you."
-msgstr ""
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr ""
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr ""
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "此帳號已註冊"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "無法刪除帳號"
-
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "無法刪除帳號"
-
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
msgid "People Tagcloud as self-tagged"