summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2010-02-24 20:52:45 -0500
committerCraig Andrews <candrews@integralblue.com>2010-02-24 20:52:45 -0500
commitc187bf55974347f7ddb4f28714af57861dce8f08 (patch)
tree4398b456d88ce79977959b25ba1a0f6fe0c1d77f /locale
parent20d6a7caed6636c28cc7b95c584549691dff4388 (diff)
parent8914b69d5055c1bc7d0604ee338ffdaf6b0a8606 (diff)
Merge branch '0.9.x' into 1.0.x
Conflicts: EVENTS.txt db/statusnet.sql lib/queuemanager.php
Diffstat (limited to 'locale')
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po281
-rw-r--r--locale/arz/LC_MESSAGES/statusnet.po309
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po337
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po307
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po309
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po577
-rw-r--r--locale/el/LC_MESSAGES/statusnet.po305
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po285
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po444
-rw-r--r--locale/fa/LC_MESSAGES/statusnet.po300
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po309
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po304
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po309
-rw-r--r--locale/he/LC_MESSAGES/statusnet.po309
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po302
-rw-r--r--locale/ia/LC_MESSAGES/statusnet.po304
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po309
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po306
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po304
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po309
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po306
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po380
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po305
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po309
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po304
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po305
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po334
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po282
-rw-r--r--locale/statusnet.po271
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po304
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po306
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po309
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po304
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po311
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po310
-rw-r--r--locale/zh_TW/LC_MESSAGES/statusnet.po306
36 files changed, 6045 insertions, 5420 deletions
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index c7276b56f..26f956329 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-14 20:05+0000\n"
-"PO-Revision-Date: 2010-02-14 20:05:58+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:01+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62476); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -62,7 +62,7 @@ msgstr "عطّل التسجيل الجديد."
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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 "لا مستخدم كهذا."
@@ -185,11 +184,11 @@ msgstr ""
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:182 actions/apitimelinehome.php:184
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:194 actions/apiusershow.php:101
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "لم يتم العثور على وسيلة API."
@@ -486,7 +485,7 @@ msgstr "حجم غير صالح."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -738,7 +737,7 @@ msgid "Preview"
msgstr "عاين"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -947,7 +946,7 @@ msgstr "احذف هذا الإشعار"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -976,7 +975,7 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
msgid "Do not delete this notice"
msgstr "لا تحذف هذا الإشعار"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "احذف هذا الإشعار"
@@ -1214,7 +1213,7 @@ msgstr ""
msgid "Could not update group."
msgstr "تعذر تحديث المجموعة."
-#: actions/editgroup.php:259 classes/User_group.php:423
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "تعذّر إنشاء الكنى."
@@ -2212,7 +2211,7 @@ msgid "Only "
msgstr ""
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "ليس نسق بيانات مدعوم."
@@ -2645,23 +2644,23 @@ msgstr ""
msgid "Invalid tag: \"%s\""
msgstr "وسم غير صالح: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "لم يمكن حفظ تفضيلات الموقع."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "تعذّر حفظ الملف الشخصي."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "تعذّر حفظ الوسوم."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "حُفظت الإعدادات."
@@ -3020,7 +3019,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "اشترك"
@@ -3056,7 +3055,7 @@ msgstr "لا يمكنك تكرار ملاحظتك الشخصية."
msgid "You already repeated that notice."
msgstr "أنت كررت هذه الملاحظة بالفعل."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "مكرر"
@@ -3726,15 +3725,25 @@ 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 "تعذّر حفظ الاشتراك."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "ليس مُستخدمًا محليًا."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "لا ملف كهذا."
+
+#: actions/subscribe.php:117
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "مُشترك"
@@ -3794,7 +3803,7 @@ msgstr "هؤلاء الأشخاص الذي تستمع إليهم."
msgid "These are the people whose notices %s listens to."
msgstr "هؤلاء الأشخاص الذي يستمع %s إليهم."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3804,16 +3813,16 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "جابر"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "رسائل قصيرة"
@@ -4207,58 +4216,77 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "مشكلة في حفظ الإشعار. طويل جدًا."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "مشكلة في حفظ الإشعار. مستخدم غير معروف."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:237
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:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "مشكلة أثناء حفظ الإشعار."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "مشكلة أثناء حفظ الإشعار."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr ""
-
-#: classes/Notice.php:1271
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "تعذّر حذف الاشتراك."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "أهلا بكم في %1$s يا @%2$s!"
-#: classes/User_group.php:413
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "تعذّر إنشاء المجموعة."
-#: classes/User_group.php:442
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "تعذّر ضبط عضوية المجموعة."
@@ -4459,26 +4487,38 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "الرخصة."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "بعد"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "قبل"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr ""
@@ -4775,54 +4815,64 @@ 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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "ألغِ الاشتراك"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "لست مُشتركًا بأي أحد."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "لست مشتركًا بأحد."
@@ -4832,11 +4882,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "لا أحد مشترك بك."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "لا أحد مشترك بك."
@@ -4846,11 +4896,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "لست عضوًا في أي مجموعة."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "لست عضوًا في أي مجموعة."
@@ -4860,7 +4910,7 @@ msgstr[3] "أنت عضو في هذه المجموعات:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4874,6 +4924,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4901,19 +4952,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "اذهب إلى المُثبّت."
@@ -5329,7 +5380,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "من"
@@ -5449,48 +5500,48 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "ش"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "ج"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "ر"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "غ"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "في"
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "في السياق"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "مكرر بواسطة"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "رُد على هذا الإشعار"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "رُد"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "الإشعار مكرر"
@@ -5522,10 +5573,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 +5749,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"
@@ -5780,67 +5799,67 @@ msgstr "عدّل الأفتار"
msgid "User actions"
msgstr "تصرفات المستخدم"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "عدّل إعدادات الملف الشخصي"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "عدّل"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "أرسل رسالة مباشرة إلى هذا المستخدم"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "رسالة"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:871
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
-#: lib/util.php:873
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
-#: lib/util.php:875
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
-#: lib/util.php:879
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:881
+#: lib/util.php:962
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
-#: lib/util.php:883
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:885
+#: lib/util.php:966
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
-#: lib/util.php:887
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:889
+#: lib/util.php:970
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 2940486d8..cd8640753 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-14 20:05+0000\n"
-"PO-Revision-Date: 2010-02-14 20:06:01+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:08+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 (r62476); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -65,7 +65,7 @@ msgstr "عطّل التسجيل الجديد."
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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 "لا مستخدم كهذا."
@@ -189,13 +188,13 @@ msgstr ""
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:182 actions/apitimelinehome.php:184
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:194 actions/apiusershow.php:101
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
-msgstr "لم يتم العثور على وسيله API."
+msgstr "الـ API method مش موجوده."
#: actions/apiaccountupdatedeliverydevice.php:85
#: actions/apiaccountupdateprofile.php:89
@@ -263,7 +262,7 @@ msgstr "تعذّر تحديث تصميمك."
#: actions/apiblockcreate.php:105
msgid "You cannot block yourself!"
-msgstr "لا يمكنك منع نفسك!"
+msgstr "ما ينفعش تمنع نفسك!"
#: actions/apiblockcreate.php:126
msgid "Block user failed."
@@ -490,7 +489,7 @@ msgstr "حجم غير صالح."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -591,11 +590,11 @@ msgstr "لا إشعار كهذا."
#: actions/apistatusesretweet.php:83
msgid "Cannot repeat your own notice."
-msgstr "لا يمكنك تكرار ملحوظتك الخاصه."
+msgstr "مش نافعه تتكرر الملاحظتك بتاعتك."
#: actions/apistatusesretweet.php:91
msgid "Already repeated that notice."
-msgstr "كرر بالفعل هذه الملاحظه."
+msgstr "الملاحظه اتكررت فعلا."
#: actions/apistatusesshow.php:138
msgid "Status deleted."
@@ -742,7 +741,7 @@ msgid "Preview"
msgstr "عاين"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -951,7 +950,7 @@ msgstr "احذف هذا الإشعار"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -980,7 +979,7 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
msgid "Do not delete this notice"
msgstr "لا تحذف هذا الإشعار"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "احذف هذا الإشعار"
@@ -1218,7 +1217,7 @@ msgstr ""
msgid "Could not update group."
msgstr "تعذر تحديث المجموعه."
-#: actions/editgroup.php:259 classes/User_group.php:423
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "تعذّر إنشاء الكنى."
@@ -1468,11 +1467,11 @@ msgstr "اختيار لبعض المستخدمين المتميزين على %s"
#: actions/file.php:34
msgid "No notice ID."
-msgstr "لا رقم ملاحظه."
+msgstr "ما فيش ملاحظة ID."
#: actions/file.php:38
msgid "No notice."
-msgstr "لا ملاحظه."
+msgstr "ما فيش ملاحظه."
#: actions/file.php:42
msgid "No attachments."
@@ -1480,7 +1479,7 @@ msgstr "لا مرفقات."
#: actions/file.php:51
msgid "No uploaded attachments."
-msgstr "لا مرفقات مرفوعه."
+msgstr "ما فيش فايلات اتعمللها upload."
#: actions/finishremotesubscribe.php:69
msgid "Not expecting this response!"
@@ -2214,7 +2213,7 @@ msgid "Only "
msgstr ""
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr " مش نظام بيانات مدعوم."
@@ -2646,23 +2645,23 @@ msgstr ""
msgid "Invalid tag: \"%s\""
msgstr "وسم غير صالح: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "لم يمكن حفظ تفضيلات الموقع."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "تعذّر حفظ الملف الشخصى."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "تعذّر حفظ الوسوم."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "حُفظت الإعدادات."
@@ -3021,7 +3020,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "اشترك"
@@ -3047,17 +3046,17 @@ msgstr ""
#: actions/repeat.php:64 actions/repeat.php:71
msgid "No notice specified."
-msgstr "لا ملاحظه محدده."
+msgstr "ما فيش ملاحظه متحدده."
#: actions/repeat.php:76
msgid "You can't repeat your own notice."
-msgstr "لا يمكنك تكرار ملاحظتك الشخصيه."
+msgstr "ما ينفعش تكرر الملاحظه بتاعتك."
#: actions/repeat.php:90
msgid "You already repeated that notice."
-msgstr "أنت كررت هذه الملاحظه بالفعل."
+msgstr "انت عيدت الملاحظه دى فعلا."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "مكرر"
@@ -3727,15 +3726,25 @@ 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 "تعذّر حفظ الاشتراك."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "ليس مُستخدمًا محليًا."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "لا ملف كهذا."
+
+#: actions/subscribe.php:117
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "مُشترك"
@@ -3795,7 +3804,7 @@ msgstr "هؤلاء الأشخاص الذى تستمع إليهم."
msgid "These are the people whose notices %s listens to."
msgstr "هؤلاء الأشخاص الذى يستمع %s إليهم."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3805,16 +3814,16 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "جابر"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "رسائل قصيرة"
@@ -3858,7 +3867,7 @@ msgstr "صورة"
#: actions/tagother.php:141
msgid "Tag user"
-msgstr "اوسم المستخدم"
+msgstr "اعمل tag لليوزر"
#: actions/tagother.php:151
msgid ""
@@ -3893,7 +3902,7 @@ msgstr "لم تمنع هذا المستخدم."
#: actions/unsandbox.php:72
msgid "User is not sandboxed."
-msgstr "المستخدم ليس فى صندوق الرمل."
+msgstr "اليوزر مش فى السبوره."
#: actions/unsilence.php:72
msgid "User is not silenced."
@@ -4189,7 +4198,7 @@ msgstr "الخروج من الجروپ فشل."
#: classes/Login_token.php:76
#, php-format
msgid "Could not create login token for %s"
-msgstr "لم يمكن إنشاء توكن الولوج ل%s"
+msgstr "ما نفعش يتعمل امارة تسجيل دخول لـ %s"
#: classes/Message.php:45
msgid "You are banned from sending direct messages."
@@ -4208,58 +4217,77 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "مشكله فى حفظ الإشعار. طويل جدًا."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "مشكله فى حفظ الإشعار. مستخدم غير معروف."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:237
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:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "مشكله أثناء حفظ الإشعار."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "مشكله أثناء حفظ الإشعار."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr ""
-
-#: classes/Notice.php:1271
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "تعذّر حذف الاشتراك."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "أهلا بكم فى %1$s يا @%2$s!"
-#: classes/User_group.php:413
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "تعذّر إنشاء المجموعه."
-#: classes/User_group.php:442
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "تعذّر ضبط عضويه المجموعه."
@@ -4460,26 +4488,38 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "الرخصه."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "بعد"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "قبل"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr ""
@@ -4776,54 +4816,64 @@ 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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "ألغِ الاشتراك"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "لست مُشتركًا بأى أحد."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "لست مشتركًا بأحد."
@@ -4833,11 +4883,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "لا أحد مشترك بك."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "لا أحد مشترك بك."
@@ -4847,11 +4897,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "لست عضوًا فى أى مجموعه."
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "لست عضوًا فى أى مجموعه."
@@ -4861,7 +4911,7 @@ msgstr[3] "أنت عضو فى هذه المجموعات:"
msgstr[4] ""
msgstr[5] ""
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4875,6 +4925,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4902,19 +4953,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "اذهب إلى المُثبّت."
@@ -5320,7 +5371,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "من"
@@ -5440,48 +5491,48 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "ش"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "ج"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "ر"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "غ"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "في"
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "فى السياق"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
-msgstr "مكرر بواسطة"
+msgstr "متكرر من"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "رُد على هذا الإشعار"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "رُد"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "الإشعار مكرر"
@@ -5513,10 +5564,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 +5740,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"
@@ -5771,67 +5790,67 @@ msgstr "عدّل الأفتار"
msgid "User actions"
msgstr "تصرفات المستخدم"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "عدّل إعدادات الملف الشخصي"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "عدّل"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "أرسل رساله مباشره إلى هذا المستخدم"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "رسالة"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:871
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
-#: lib/util.php:873
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "قبل دقيقه تقريبًا"
-#: lib/util.php:875
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "قبل ساعه تقريبًا"
-#: lib/util.php:879
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:881
+#: lib/util.php:962
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
-#: lib/util.php:883
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:885
+#: lib/util.php:966
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
-#: lib/util.php:887
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:889
+#: lib/util.php:970
msgid "about a year ago"
msgstr "قبل سنه تقريبًا"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index efe49b56a..3cb121628 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:14:17+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:11+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -25,9 +25,8 @@ msgid "Access"
msgstr "Достъп"
#: actions/accessadminpanel.php:65
-#, fuzzy
msgid "Site access settings"
-msgstr "Запазване настройките на сайта"
+msgstr "Настройки за достъп до сайта"
#: actions/accessadminpanel.php:158
msgid "Registration"
@@ -62,7 +61,7 @@ msgstr "Изключване на новите регистрации."
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -70,9 +69,8 @@ msgid "Save"
msgstr "Запазване"
#: actions/accessadminpanel.php:189
-#, fuzzy
msgid "Save access settings"
-msgstr "Запазване настройките на сайта"
+msgstr "Запазване настройките за достъп"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -101,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 "Няма такъв потребител"
@@ -163,8 +160,8 @@ msgstr ""
msgid "You and friends"
msgstr "Вие и приятелите"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Бележки от %1$s и приятели в %2$s."
@@ -185,12 +182,12 @@ msgstr "Бележки от %1$s и приятели в %2$s."
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Не е открит методът в API."
@@ -497,7 +494,7 @@ msgstr "Неправилен размер."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -638,7 +635,7 @@ msgstr "Неподдържан формат."
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Отбелязани като любими от %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s бележки отбелязани като любими от %s / %s."
@@ -649,7 +646,7 @@ msgstr "%s бележки отбелязани като любими от %s / %
msgid "%s timeline"
msgstr "Поток на %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -665,12 +662,12 @@ msgstr "%1$s / Реплики на %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s реплики на съобщения от %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Общ поток на %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -680,7 +677,7 @@ msgstr ""
msgid "Repeated to %s"
msgstr "Повторено за %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Повторения на %s"
@@ -690,7 +687,7 @@ msgstr "Повторения на %s"
msgid "Notices tagged with %s"
msgstr "Бележки с етикет %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Бележки от %1$s в %2$s."
@@ -753,7 +750,7 @@ msgid "Preview"
msgstr "Преглед"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Изтриване"
@@ -936,7 +933,7 @@ msgstr "Не членувате в тази група."
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Имаше проблем със сесията ви в сайта."
@@ -965,7 +962,7 @@ msgstr "Изтриване на бележката"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -994,7 +991,7 @@ msgstr "Наистина ли искате да изтриете тази бел
msgid "Do not delete this notice"
msgstr "Да не се изтрива бележката"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Изтриване на бележката"
@@ -1248,7 +1245,7 @@ msgstr "Описанието е твърде дълго (до %d символа)
msgid "Could not update group."
msgstr "Грешка при обновяване на групата."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "Грешка при отбелязване като любима."
@@ -1258,7 +1255,6 @@ msgid "Options saved."
msgstr "Настройките са запазени."
#: actions/emailsettings.php:60
-#, fuzzy
msgid "Email settings"
msgstr "Настройки на е-поща"
@@ -1297,9 +1293,8 @@ msgid "Cancel"
msgstr "Отказ"
#: actions/emailsettings.php:121
-#, fuzzy
msgid "Email address"
-msgstr "Адреси на е-поща"
+msgstr "Адрес на е-поща"
#: actions/emailsettings.php:123
msgid "Email address, like \"UserName@example.org\""
@@ -2079,7 +2074,7 @@ msgstr "Вход"
#: actions/login.php:227
msgid "Login to site"
-msgstr ""
+msgstr "Вход в сайта"
#: actions/login.php:236 actions/register.php:478
msgid "Remember me"
@@ -2328,7 +2323,7 @@ msgid "Only "
msgstr "Само "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Неподдържан формат на данните"
@@ -2771,24 +2766,24 @@ msgstr "Името на езика е твърде дълго (може да е
msgid "Invalid tag: \"%s\""
msgstr "Неправилен етикет: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Грешка при запазване етикетите."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Грешка при запазване на профила."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Грешка при запазване етикетите."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Настройките са запазени."
@@ -3168,7 +3163,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Адрес на профила ви в друга, съвместима услуга за микроблогване"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Абониране"
@@ -3206,7 +3201,7 @@ msgstr "Не можете да повтаряте собствена бележ
msgid "You already repeated that notice."
msgstr "Вече сте повторили тази бележка."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Повторено"
@@ -3267,9 +3262,8 @@ msgid "Replies to %1$s on %2$s!"
msgstr "Отговори до %1$s в %2$s!"
#: actions/rsd.php:146 actions/version.php:157
-#, fuzzy
msgid "StatusNet"
-msgstr "Бележката е изтрита."
+msgstr "StatusNet"
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
@@ -3564,9 +3558,9 @@ msgid " tagged %s"
msgstr "Бележки с етикет %s"
#: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
msgid "%1$s, page %2$d"
-msgstr "Блокирани за %s, страница %d"
+msgstr "%1$s, страница %2$d"
#: actions/showstream.php:122
#, fuzzy, php-format
@@ -3785,7 +3779,6 @@ msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
#: actions/smssettings.php:58
-#, fuzzy
msgid "SMS settings"
msgstr "Настройки за SMS"
@@ -3816,7 +3809,6 @@ msgid "Enter the code you received on your phone."
msgstr "Въведете кода, който получихте по телефона."
#: actions/smssettings.php:138
-#, fuzzy
msgid "SMS phone number"
msgstr "Телефонен номер за SMS"
@@ -3891,16 +3883,27 @@ 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 "Грешка при създаване на нов абонамент."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Не е локален потребител."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Няма такъв файл."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Не сте абонирани за този профил"
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
#, fuzzy
msgid "Subscribed"
msgstr "Абониране"
@@ -3961,7 +3964,7 @@ msgstr "Няма хора, чийто бележки четете."
msgid "These are the people whose notices %s listens to."
msgstr "Хора, чийто бележки %s чете."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3971,16 +3974,16 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s не получава ничии бележки."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4279,9 +4282,8 @@ msgid "%1$s groups, page %2$d"
msgstr "Членове на групата %s, страница %d"
#: actions/usergroups.php:130
-#, fuzzy
msgid "Search for more groups"
-msgstr "Търсене за хора или бележки"
+msgstr "Търсене на още групи"
#: actions/usergroups.php:153
#, php-format
@@ -4399,23 +4401,23 @@ msgstr "Грешка при обновяване на бележката с но
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Проблем при записване на бележката."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Грешка при записване на бележката. Непознат потребител."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
"отново след няколко минути."
-#: classes/Notice.php:229
+#: classes/Notice.php:237
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4424,39 +4426,61 @@ msgstr ""
"Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
"отново след няколко минути."
-#: classes/Notice.php:235
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Забранено ви е да публикувате бележки в този сайт."
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Проблем при записване на бележката."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Проблем при записване на бележката."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Грешка при изтриване на абонамента."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добре дошли в %1$s, @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Грешка при създаване на групата."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "Грешка при създаване на нов абонамент."
@@ -4491,9 +4515,9 @@ msgid "Other options"
msgstr "Други настройки"
#: lib/action.php:144
-#, fuzzy, php-format
+#, php-format
msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
#: lib/action.php:159
msgid "Untitled page"
@@ -4663,26 +4687,38 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "Всички "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "лиценз."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Страниране"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "След"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Преди"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "Не можете да променяте този сайт."
@@ -4993,80 +5029,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
+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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Отписани сте от %s."
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Не сте абонирани за никого."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
msgid "No one is subscribed to you."
msgstr "Никой не е абониран за вас."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
msgid "You are not a member of any groups."
msgstr "Не членувате в нито една група."
-#: lib/command.php:714
+#: lib/command.php:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5080,6 +5125,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5107,19 +5153,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Не е открит файл с настройки. "
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
#, fuzzy
msgid "Go to the installer."
msgstr "Влизане в сайта"
@@ -5542,7 +5588,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "от"
@@ -5665,48 +5711,48 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "С"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "Ю"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "И"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "З"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "в контекст"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Повторено от"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Отговаряне на тази бележка"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Отговор"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Бележката е повторена."
@@ -5739,11 +5785,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 "Грешка при добавяне на нов абонамент."
@@ -5927,36 +5968,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"
@@ -6009,67 +6020,67 @@ msgstr "Редактиране на аватара"
msgid "User actions"
msgstr "Потребителски действия"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Редактиране на профила"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Редактиране"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Изпращате на пряко съобщение до този потребител."
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Съобщение"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "преди няколко секунди"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "преди около минута"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "преди около %d минути"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "преди около час"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "преди около %d часа"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "преди около ден"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "преди около %d дни"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "преди около месец"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "преди около %d месеца"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "преди около година"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index d0b228c08..d94ad8431 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:14:20+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:15+0000\n"
"Language-Team: Catalan\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -66,7 +66,7 @@ msgstr "Inhabilita els nous registres."
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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."
@@ -169,8 +168,8 @@ msgstr ""
msgid "You and friends"
msgstr "Un mateix i amics"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualitzacions de %1$s i amics a %2$s!"
@@ -191,12 +190,12 @@ msgstr "Actualitzacions de %1$s i amics a %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "No s'ha trobat el mètode API!"
@@ -509,7 +508,7 @@ msgstr "Mida invàlida."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -655,7 +654,7 @@ msgstr "El format no està implementat."
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Preferits de %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s actualitzacions favorites per %s / %s."
@@ -666,7 +665,7 @@ msgstr "%s actualitzacions favorites per %s / %s."
msgid "%s timeline"
msgstr "%s línia temporal"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -682,12 +681,12 @@ msgstr "%1$s / Notificacions contestant a %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s notificacions que responen a notificacions de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s línia temporal pública"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s notificacions de tots!"
@@ -697,7 +696,7 @@ msgstr "%s notificacions de tots!"
msgid "Repeated to %s"
msgstr "Respostes a %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Repeticions de %s"
@@ -707,7 +706,7 @@ msgstr "Repeticions de %s"
msgid "Notices tagged with %s"
msgstr "Aviso etiquetats amb %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualitzacions etiquetades amb %1$s el %2$s!"
@@ -769,7 +768,7 @@ msgid "Preview"
msgstr "Vista prèvia"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Suprimeix"
@@ -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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Ha ocorregut algun problema amb la teva sessió."
@@ -983,7 +982,7 @@ msgstr "Eliminar aquesta nota"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1016,7 +1015,7 @@ msgstr "N'estàs segur que vols eliminar aquesta notificació?"
msgid "Do not delete this notice"
msgstr "No es pot esborrar la notificació."
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Eliminar aquesta nota"
@@ -1266,7 +1265,7 @@ msgstr "la descripció és massa llarga (màx. %d caràcters)."
msgid "Could not update group."
msgstr "No s'ha pogut actualitzar el grup."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "No s'han pogut crear els àlies."
@@ -2351,7 +2350,7 @@ msgid "Only "
msgstr "Només "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Format de data no suportat."
@@ -2804,23 +2803,23 @@ msgstr "L'idioma és massa llarg (màx 50 caràcters)."
msgid "Invalid tag: \"%s\""
msgstr "Etiqueta no vàlida: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "No es pot actualitzar l'usuari per autosubscriure."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "No s'han pogut desar les preferències d'ubicació."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "No s'ha pogut guardar el perfil."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "No s'han pogut guardar les etiquetes."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Configuració guardada."
@@ -3210,7 +3209,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL del teu perfil en un altre servei de microblogging compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Subscriure's"
@@ -3253,7 +3252,7 @@ msgstr "No pots registrar-te si no estàs d'acord amb la llicència."
msgid "You already repeated that notice."
msgstr "Ja heu blocat l'usuari."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Repetit"
@@ -3949,15 +3948,26 @@ 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ó."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "No existeix aquest usuari."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "No existeix el fitxer."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "No estàs subscrit a aquest perfil."
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Subscrit"
@@ -4021,7 +4031,7 @@ msgstr "Aquestes són les persones que escoltes."
msgid "These are the people whose notices %s listens to."
msgstr "Aquestes són les persones que %s escolta."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4031,16 +4041,16 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s no escolta a ningú."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4460,23 +4470,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:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Problema en guardar l'avís."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Problema al guardar la notificació. Usuari desconegut."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
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:237
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4485,39 +4495,60 @@ msgstr ""
"Masses notificacions massa ràpid; pren un respir i publica de nou en uns "
"minuts."
-#: classes/Notice.php:235
+#: classes/Notice.php:243
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:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problema en guardar l'avís."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problema en guardar l'avís."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Error de BD en inserir resposta: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "No s'ha pogut crear el grup."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "No s'ha pogut establir la pertinença d'aquest grup."
@@ -4720,26 +4751,38 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "Tot "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "llicència."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginació"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "Posteriors"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Anteriors"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "No podeu fer canvis al lloc."
@@ -5048,82 +5091,91 @@ 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
+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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Has deixat d'estar subscrit a %s"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "No estàs subscrit a aquest perfil."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
#, 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:733
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:753
msgid "You are not a member of any groups."
msgstr "No sou membre de cap grup."
-#: lib/command.php:714
+#: lib/command.php:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5137,6 +5189,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5164,19 +5217,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "No s'ha trobat cap fitxer de configuració. "
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "Podeu voler executar l'instal·lador per a corregir-ho."
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Vés a l'instal·lador."
@@ -5600,7 +5653,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "de"
@@ -5723,49 +5776,49 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "No"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "en context"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Repetit per"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "respondre a aquesta nota"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Respon"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Notificació publicada"
@@ -5799,10 +5852,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 +6033,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"
@@ -6065,67 +6084,67 @@ msgstr "Edita l'avatar"
msgid "User actions"
msgstr "Accions de l'usuari"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Edita la configuració del perfil"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Edita"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Enviar un missatge directe a aquest usuari"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Missatge"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Modera"
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "fa pocs segons"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "fa un minut"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "fa %d minuts"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "fa una hora"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "fa %d hores"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "fa un dia"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "fa %d dies"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "fa un mes"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "fa %d mesos"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "fa un any"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index a5d6db600..dd51424e6 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:14:23+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:18+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -66,7 +66,7 @@ msgstr ""
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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."
@@ -169,8 +168,8 @@ msgstr ""
msgid "You and friends"
msgstr "%s a přátelé"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -191,12 +190,12 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Potvrzující kód nebyl nalezen"
@@ -506,7 +505,7 @@ msgstr "Neplatná velikost"
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -652,7 +651,7 @@ msgstr "Nepodporovaný formát obrázku."
msgid "%1$s / Favorites from %2$s"
msgstr "%1 statusů na %2"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "Mikroblog od %s"
@@ -663,7 +662,7 @@ msgstr "Mikroblog od %s"
msgid "%s timeline"
msgstr ""
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -679,12 +678,12 @@ msgstr "%1 statusů na %2"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -694,7 +693,7 @@ msgstr ""
msgid "Repeated to %s"
msgstr "Odpovědi na %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "Odpovědi na %s"
@@ -704,7 +703,7 @@ msgstr "Odpovědi na %s"
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Mikroblog od %s"
@@ -768,7 +767,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Odstranit"
@@ -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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -986,7 +985,7 @@ msgstr "Odstranit toto oznámení"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1016,7 +1015,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "Žádné takové oznámení."
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Odstranit toto oznámení"
@@ -1270,7 +1269,7 @@ msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
msgid "Could not update group."
msgstr "Nelze aktualizovat uživatele"
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "Nelze uložin informace o obrázku"
@@ -2320,7 +2319,7 @@ msgid "Only "
msgstr ""
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr ""
@@ -2776,25 +2775,25 @@ msgstr ""
msgid "Invalid tag: \"%s\""
msgstr "Neplatná adresa '%s'"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Nelze uložit profil"
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Nelze uložit profil"
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
#, fuzzy
msgid "Couldn't save tags."
msgstr "Nelze uložit profil"
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Nastavení uloženo"
@@ -3161,7 +3160,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Adresa profilu na jiných kompatibilních mikroblozích."
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Odebírat"
@@ -3202,7 +3201,7 @@ msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
msgid "You already repeated that notice."
msgstr "Již jste přihlášen"
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "Vytvořit"
@@ -3890,17 +3889,27 @@ 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"
-#: actions/subscribe.php:55
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
#, fuzzy
-msgid "Not a local user."
-msgstr "Žádný takový uživatel."
+msgid "No such profile."
+msgstr "Žádné takové oznámení."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Neodeslal jste nám profil"
+
+#: actions/subscribe.php:145
#, fuzzy
msgid "Subscribed"
msgstr "Odebírat"
@@ -3961,7 +3970,7 @@ msgstr "Toto jsou lidé, jejiž sdělením nasloucháte"
msgid "These are the people whose notices %s listens to."
msgstr "Toto jsou lidé, jejiž sdělením %s naslouchá"
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3971,17 +3980,17 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1 od teď naslouchá tvým sdělením v %2"
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
#, fuzzy
msgid "Jabber"
msgstr "Žádné Jabber ID."
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
@@ -4405,61 +4414,83 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:218
+#: classes/Notice.php:226
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:237
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:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problém při ukládání sdělení"
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Chyba v DB při vkládání odpovědi: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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 ""
-#: classes/User_group.php:380
+#: classes/User_group.php:423
#, fuzzy
msgid "Could not create group."
msgstr "Nelze uložin informace o obrázku"
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "Nelze vytvořit odebírat"
@@ -4670,28 +4701,40 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1139
+#: lib/action.php:1141
#, fuzzy
msgid "After"
msgstr "« Novější"
-#: lib/action.php:1147
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "Starší »"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr ""
@@ -5002,86 +5045,96 @@ 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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Odhlásit"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Neodeslal jste nám profil"
-#: lib/command.php:670
+#: lib/command.php:711
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:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Vzdálený odběr"
-#: lib/command.php:692
+#: lib/command.php:733
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:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Neodeslal jste nám profil"
-#: lib/command.php:714
+#: lib/command.php:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5095,6 +5148,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5122,20 +5176,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "Žádný potvrzující kód."
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -5559,7 +5613,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr " od "
@@ -5685,51 +5739,51 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "Žádný obsah!"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Vytvořit"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
#, fuzzy
msgid "Reply"
msgstr "odpověď"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Sdělení"
@@ -5763,10 +5817,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 +6002,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"
@@ -6035,68 +6054,68 @@ msgstr "Upravit avatar"
msgid "User actions"
msgstr "Akce uživatele"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "Nastavené Profilu"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Zpráva"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "před pár sekundami"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "asi před minutou"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "asi před %d minutami"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "asi před hodinou"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "asi před %d hodinami"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "asi přede dnem"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "před %d dny"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "asi před měsícem"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "asi před %d mesíci"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "asi před rokem"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index b9e53e254..053187a86 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -13,64 +13,60 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:14:26+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:21+0000\n"
"Language-Team: German\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
-#, fuzzy
msgid "Access"
-msgstr "Akzeptieren"
+msgstr "Zugang"
#: actions/accessadminpanel.php:65
msgid "Site access settings"
msgstr "Zugangseinstellungen speichern"
#: actions/accessadminpanel.php:158
-#, fuzzy
msgid "Registration"
msgstr "Registrieren"
#: actions/accessadminpanel.php:161
-#, fuzzy
msgid "Private"
-msgstr "Privatsphäre"
+msgstr "Privat"
#: actions/accessadminpanel.php:163
msgid "Prohibit anonymous users (not logged in) from viewing site?"
msgstr ""
+"Anonymen (nicht eingeloggten) Nutzern das Betrachten der Seite verbieten?"
#: actions/accessadminpanel.php:167
-#, fuzzy
msgid "Invite only"
-msgstr "Einladen"
+msgstr "Nur auf Einladung"
#: actions/accessadminpanel.php:169
msgid "Make registration invitation only."
-msgstr ""
+msgstr "Registrierung nur bei vorheriger Einladung erlauben."
#: actions/accessadminpanel.php:173
-#, fuzzy
msgid "Closed"
-msgstr "Blockieren"
+msgstr "Geschlossen"
#: actions/accessadminpanel.php:175
msgid "Disable new registrations."
-msgstr ""
+msgstr "Neuregistrierungen deaktivieren."
#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
#: actions/emailsettings.php:195 actions/imsettings.php:163
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -78,9 +74,8 @@ msgid "Save"
msgstr "Speichern"
#: actions/accessadminpanel.php:189
-#, fuzzy
msgid "Save access settings"
-msgstr "Site-Einstellungen speichern"
+msgstr "Zugangs-Einstellungen speichern"
#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
#: actions/showfavorites.php:137 actions/tag.php:51
@@ -109,14 +104,13 @@ 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."
#: actions/all.php:84
-#, fuzzy, php-format
+#, php-format
msgid "%1$s and friends, page %2$d"
-msgstr "%s blockierte Benutzerprofile, Seite %d"
+msgstr "%1$s und Freunde, Seite% 2$d"
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
@@ -181,8 +175,8 @@ msgstr ""
msgid "You and friends"
msgstr "Du und Freunde"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
@@ -203,12 +197,12 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API-Methode nicht gefunden."
@@ -471,9 +465,9 @@ msgid "You are not a member of this group."
msgstr "Du bist kein Mitglied dieser Gruppe."
#: actions/apigroupleave.php:124 actions/leavegroup.php:119
-#, fuzzy, php-format
+#, php-format
msgid "Could not remove user %1$s from group %2$s."
-msgstr "Konnte Benutzer %s nicht aus der Gruppe %s entfernen."
+msgstr "Konnte Benutzer %1$s nicht aus der Gruppe %2$s entfernen."
#: actions/apigrouplist.php:95
#, php-format
@@ -511,7 +505,7 @@ msgstr "Ungültige Größe."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -654,7 +648,7 @@ msgstr "Bildformat wird nicht unterstützt."
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Favoriten von %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s Aktualisierung in den Favoriten von %s / %s."
@@ -665,7 +659,7 @@ msgstr "%s Aktualisierung in den Favoriten von %s / %s."
msgid "%s timeline"
msgstr "%s Zeitleiste"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -681,12 +675,12 @@ msgstr "%1$s / Aktualisierungen erwähnen %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "Nachrichten von %1$, die auf Nachrichten von %2$ / %3$ antworten."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s öffentliche Zeitleiste"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s Nachrichten von allen!"
@@ -696,7 +690,7 @@ msgstr "%s Nachrichten von allen!"
msgid "Repeated to %s"
msgstr "Antworten an %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "Antworten an %s"
@@ -706,7 +700,7 @@ msgstr "Antworten an %s"
msgid "Notices tagged with %s"
msgstr "Nachrichten, die mit %s getagt sind"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Aktualisierungen mit %1$s getagt auf %2$s!"
@@ -768,7 +762,7 @@ msgid "Preview"
msgstr "Vorschau"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Löschen"
@@ -951,7 +945,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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Es gab ein Problem mit deinem Sessiontoken."
@@ -980,7 +974,7 @@ msgstr "Nachricht löschen"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1011,7 +1005,7 @@ msgstr "Bist du sicher, dass du diese Nachricht löschen möchtest?"
msgid "Do not delete this notice"
msgstr "Diese Nachricht nicht löschen"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Nachricht löschen"
@@ -1263,7 +1257,7 @@ msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)."
msgid "Could not update group."
msgstr "Konnte Gruppe nicht aktualisieren."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Konnte keinen Favoriten erstellen."
@@ -2348,7 +2342,7 @@ msgid "Only "
msgstr ""
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Kein unterstütztes Datenformat."
@@ -2386,7 +2380,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 +2529,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 +2589,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 +2659,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 +2735,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
@@ -2797,31 +2791,30 @@ msgstr "Die eingegebene Sprache ist zu lang (maximal 50 Zeichen)"
msgid "Invalid tag: \"%s\""
msgstr "Ungültiger Tag: „%s“"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Autosubscribe konnte nicht aktiviert werden."
-#: actions/profilesettings.php:359
-#, fuzzy
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
-msgstr "Konnte Tags nicht speichern."
+msgstr "Konnte Positions-Einstellungen nicht speichern."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Konnte Profil nicht speichern."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Konnte Tags nicht speichern."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
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 +2847,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 +2893,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!"
@@ -3200,7 +3197,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Profil-URL bei einem anderen kompatiblen Microbloggingdienst"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Abonnieren"
@@ -3238,7 +3235,7 @@ msgstr "Du kannst deine eigene Nachricht nicht wiederholen."
msgid "You already repeated that notice."
msgstr "Du hast diesen Benutzer bereits blockiert."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "Erstellt"
@@ -3366,9 +3363,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 +3477,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 +3677,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 +3720,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 +3731,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,15 +3939,26 @@ 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."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Kein lokaler Benutzer."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Datei nicht gefunden."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Du hast dieses Profil nicht abonniert."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Abonniert"
@@ -3965,9 +3968,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 +4009,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."
@@ -4019,7 +4022,7 @@ msgstr "Dies sind die Leute, deren Nachrichten du liest."
msgid "These are the people whose notices %s listens to."
msgstr "Dies sind die Leute, deren Nachrichten %s liest."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4029,38 +4032,38 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
-#, fuzzy, php-format
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
+#, php-format
msgid "%s is not listening to anyone."
-msgstr "%1$s liest ab sofort "
+msgstr "%s hat niemanden abonniert."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
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 +4131,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 +4157,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 +4195,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 +4241,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"
@@ -4468,22 +4463,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:222
msgid "Problem saving notice. Too long."
msgstr "Problem bei Speichern der Nachricht. Sie ist zu lang."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
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:237
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4492,40 +4487,61 @@ 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:243
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:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problem bei Speichern der Nachricht."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problem bei Speichern der Nachricht."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Datenbankfehler beim Einfügen der Antwort: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Konnte Gruppe nicht erstellen."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Konnte Gruppenmitgliedschaft nicht setzen."
@@ -4730,27 +4746,39 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
#, fuzzy
msgid "All "
msgstr "Alle "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "Lizenz."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Seitenerstellung"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "Später"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Vorher"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
#, fuzzy
msgid "You cannot make changes to this site."
@@ -5057,81 +5085,90 @@ 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
+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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "%s nicht mehr abonniert"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Du hast dieses Profil nicht abonniert."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
msgid "No one is subscribed to you."
msgstr "Niemand hat Dich abonniert."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
msgid "You are not a member of any groups."
msgstr "Du bist in keiner Gruppe Mitglied."
-#: lib/command.php:714
+#: lib/command.php:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5145,6 +5182,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5172,19 +5210,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Keine Konfigurationsdatei gefunden."
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Ich habe an folgenden Stellen nach Konfigurationsdateien gesucht: "
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
#, fuzzy
msgid "Go to the installer."
msgstr "Auf der Seite anmelden"
@@ -5245,19 +5283,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 +5362,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 +5376,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 +5394,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 +5433,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 +5458,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 +5531,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
@@ -5665,8 +5699,7 @@ msgstr ""
"schicken, um sie in eine Konversation zu verwickeln. Andere Leute können Dir "
"Nachrichten schicken, die nur Du sehen kannst."
-#: lib/mailbox.php:227 lib/noticelist.php:477
-#, fuzzy
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "von"
@@ -5687,39 +5720,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 +5784,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 +5792,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 +5813,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 ""
@@ -5792,53 +5826,50 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
-#, fuzzy
+#: lib/noticelist.php:430
msgid "N"
-msgstr "Nein"
+msgstr "N"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
-msgstr ""
+msgstr "S"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
-msgstr ""
+msgstr "O"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
-msgstr ""
+msgstr "W"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "im Zusammenhang"
-#: lib/noticelist.php:572
-#, fuzzy
+#: lib/noticelist.php:583
msgid "Repeated by"
-msgstr "Erstellt"
+msgstr "Wiederholt von"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Auf diese Nachricht antworten"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Antworten"
-#: lib/noticelist.php:641
-#, fuzzy
+#: lib/noticelist.php:655
msgid "Notice repeated"
-msgstr "Nachricht gelöscht."
+msgstr "Nachricht wiederholt"
#: lib/nudgeform.php:116
msgid "Nudge this user"
@@ -5869,11 +5900,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 +5933,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 +6000,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 +6057,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 +6079,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 +6099,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"
@@ -6141,67 +6129,67 @@ msgstr "Avatar bearbeiten"
msgid "User actions"
msgstr "Benutzeraktionen"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Profil Einstellungen ändern"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
-msgstr ""
+msgstr "Bearbeiten"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Direkte Nachricht an Benutzer verschickt"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Nachricht"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
-msgstr ""
+msgstr "Moderieren"
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "vor wenigen Sekunden"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "vor einer Minute"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "vor %d Minuten"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "vor einer Stunde"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "vor %d Stunden"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "vor einem Tag"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "vor %d Tagen"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "vor einem Monat"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "vor %d Monaten"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "vor einem Jahr"
@@ -6216,6 +6204,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 20365e04a..6ff718d45 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:14:30+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:24+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -63,7 +63,7 @@ msgstr ""
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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 "Κανένας τέτοιος χρήστης."
@@ -164,8 +163,8 @@ msgstr ""
msgid "You and friends"
msgstr "Εσείς και οι φίλοι σας"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -186,12 +185,12 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!"
@@ -497,7 +496,7 @@ msgstr "Μήνυμα"
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -638,7 +637,7 @@ msgstr ""
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr ""
@@ -649,7 +648,7 @@ msgstr ""
msgid "%s timeline"
msgstr "χρονοδιάγραμμα του χρήστη %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -665,12 +664,12 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -680,7 +679,7 @@ msgstr ""
msgid "Repeated to %s"
msgstr ""
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr ""
@@ -690,7 +689,7 @@ msgstr ""
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -751,7 +750,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -966,7 +965,7 @@ msgstr "Περιγράψτε την ομάδα ή το θέμα"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -997,7 +996,7 @@ msgstr "Είσαι σίγουρος ότι θες να διαγράψεις αυ
msgid "Do not delete this notice"
msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr ""
@@ -1247,7 +1246,7 @@ msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστ
msgid "Could not update group."
msgstr "Αδύνατη η αποθήκευση του προφίλ."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "Αδύνατη η αποθήκευση του προφίλ."
@@ -2278,7 +2277,7 @@ msgid "Only "
msgstr ""
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr ""
@@ -2728,25 +2727,25 @@ msgstr ""
msgid "Invalid tag: \"%s\""
msgstr ""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Απέτυχε η ενημέρωση του χρήστη για την αυτόματη συνδρομή."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Αδύνατη η αποθήκευση του προφίλ."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Απέτυχε η αποθήκευση του προφίλ."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
#, fuzzy
msgid "Couldn't save tags."
msgstr "Αδύνατη η αποθήκευση του προφίλ."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr ""
@@ -3123,7 +3122,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr ""
@@ -3162,7 +3161,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "Δημιουργία"
@@ -3843,16 +3842,26 @@ 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 "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
-#: actions/subscribe.php:55
-msgid "Not a local user."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
+
+#: actions/subscribe.php:117
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr ""
@@ -3912,7 +3921,7 @@ msgstr ""
msgid "These are the people whose notices %s listens to."
msgstr ""
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3922,16 +3931,16 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr ""
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
@@ -4336,57 +4345,78 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:237
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:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:788
+#: classes/Notice.php:882
msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Απέτυχε η διαγραφή συνδρομής."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Δεν ήταν δυνατή η δημιουργία ομάδας."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
@@ -4587,26 +4617,38 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr ""
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr ""
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr ""
@@ -4909,82 +4951,92 @@ 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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Απέτυχε η συνδρομή."
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
msgid "You are not a member of any groups."
msgstr "Δεν είστε μέλος καμίας ομάδας."
-#: lib/command.php:714
+#: lib/command.php:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4998,6 +5050,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5025,20 +5078,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "Ο κωδικός επιβεβαίωσης δεν βρέθηκε."
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -5449,7 +5502,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "από"
@@ -5572,48 +5625,48 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr ""
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Επαναλαμβάνεται από"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr ""
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Ρυθμίσεις OpenID"
@@ -5647,10 +5700,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 +5880,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"
@@ -5913,67 +5932,67 @@ msgstr ""
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Επεξεργασία ρυθμίσεων προφίλ"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Επεξεργασία"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Μήνυμα"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr ""
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr ""
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 0e7acedc0..98e7790f2 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-14 20:05+0000\n"
-"PO-Revision-Date: 2010-02-14 20:06:20+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:27+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 (r62476); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -62,7 +62,7 @@ msgstr "Disable new registrations."
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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."
@@ -192,11 +191,11 @@ msgstr "Updates from %1$s and friends on %2$s!"
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:182 actions/apitimelinehome.php:184
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:194 actions/apiusershow.php:101
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API method not found."
@@ -498,7 +497,7 @@ msgstr "Invalid token."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -753,7 +752,7 @@ msgid "Preview"
msgstr "Preview"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Delete"
@@ -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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "There was a problem with your session token."
@@ -963,7 +962,7 @@ msgstr "Delete this application"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -994,7 +993,7 @@ msgstr "Are you sure you want to delete this notice?"
msgid "Do not delete this notice"
msgstr "Do not delete this notice"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Delete this notice"
@@ -1235,7 +1234,7 @@ msgstr "description is too long (max %d chars)."
msgid "Could not update group."
msgstr "Could not update group."
-#: actions/editgroup.php:259 classes/User_group.php:423
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Could not create aliases"
@@ -2324,7 +2323,7 @@ msgid "Only "
msgstr ""
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Not a supported data format."
@@ -2774,24 +2773,24 @@ msgstr "Language is too long (max 50 chars)."
msgid "Invalid tag: \"%s\""
msgstr "Invalid tag: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Couldn't update user for autosubscribe."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Couldn't save tags."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Couldn't save profile."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Couldn't save tags."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Settings saved."
@@ -3182,7 +3181,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL of your profile on another compatible microblogging service"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Subscribe"
@@ -3224,7 +3223,7 @@ msgstr "You can't repeat your own notice."
msgid "You already repeated that notice."
msgstr "You have already blocked this user."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "Created"
@@ -3939,15 +3938,26 @@ 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."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Not a local user."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "No such notice."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "You are not subscribed to that profile."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Subscribed"
@@ -4007,7 +4017,7 @@ msgstr "These are the people whose notices you listen to."
msgid "These are the people whose notices %s listens to."
msgstr "These are the people whose notices %s listens to."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4017,16 +4027,16 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s is not listening to anyone."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4460,22 +4470,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:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Problem saving notice."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Problem saving notice. Unknown user."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
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:237
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4483,39 +4493,60 @@ msgid ""
msgstr ""
"Too many notices too fast; take a breather and post again in a few minutes."
-#: classes/Notice.php:235
+#: classes/Notice.php:243
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:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problem saving notice."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problem saving notice."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "DB error inserting reply: %s"
-
-#: classes/Notice.php:1271
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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!"
-#: classes/User_group.php:413
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Could not create group."
-#: classes/User_group.php:442
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Could not set group membership."
@@ -4718,26 +4749,38 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "All "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "licence."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "After"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Before"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
#, fuzzy
msgid "You cannot make changes to this site."
@@ -5047,83 +5090,92 @@ 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
+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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Unsubscribed from %s"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "You are not subscribed to that profile."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Could not subscribe other to you."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
#, 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:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5137,6 +5189,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5164,19 +5217,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "No configuration file found"
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Go to the installer."
@@ -5606,7 +5659,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr "from"
@@ -5730,50 +5783,50 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "No"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "in context"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Created"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Reply to this notice"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Reply"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Notice deleted."
@@ -5806,10 +5859,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 +6040,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"
@@ -6071,67 +6090,67 @@ msgstr "Edit Avatar"
msgid "User actions"
msgstr "User actions"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Edit profile settings"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Send a direct message to this user"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Message"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:871
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "a few seconds ago"
-#: lib/util.php:873
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "about a minute ago"
-#: lib/util.php:875
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "about %d minutes ago"
-#: lib/util.php:877
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "about an hour ago"
-#: lib/util.php:879
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "about %d hours ago"
-#: lib/util.php:881
+#: lib/util.php:962
msgid "about a day ago"
msgstr "about a day ago"
-#: lib/util.php:883
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "about %d days ago"
-#: lib/util.php:885
+#: lib/util.php:966
msgid "about a month ago"
msgstr "about a month ago"
-#: lib/util.php:887
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "about %d months ago"
-#: lib/util.php:889
+#: lib/util.php:970
msgid "about a year ago"
msgstr "about a year ago"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 0d7c9384a..b5e0469b6 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-14 20:05+0000\n"
-"PO-Revision-Date: 2010-02-14 20:06:23+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:30+0000\n"
"Language-Team: Spanish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62476); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -64,7 +64,7 @@ msgstr "Inhabilitar nuevos registros."
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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."
@@ -195,11 +194,11 @@ msgstr "¡Actualizaciones de %1$s y amigos en %2$s!"
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:182 actions/apitimelinehome.php:184
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:194 actions/apiusershow.php:101
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Método de API no encontrado."
@@ -501,7 +500,7 @@ msgstr "Token inválido."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -761,7 +760,7 @@ msgid "Preview"
msgstr "Vista previa"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Borrar"
@@ -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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Hubo problemas con tu clave de sesión."
@@ -972,7 +971,7 @@ msgstr "Borrar esta aplicación"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1003,7 +1002,7 @@ msgstr "¿Estás seguro de que quieres eliminar este aviso?"
msgid "Do not delete this notice"
msgstr "No eliminar este mensaje"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Borrar este aviso"
@@ -1244,7 +1243,7 @@ msgstr "La descripción es muy larga (máx. %d caracteres)."
msgid "Could not update group."
msgstr "No se pudo actualizar el grupo."
-#: actions/editgroup.php:259 classes/User_group.php:423
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "No fue posible crear alias."
@@ -2335,7 +2334,7 @@ msgid "Only "
msgstr "Sólo "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "No es un formato de dato soportado"
@@ -2624,7 +2623,7 @@ msgstr "Servidor SSL"
#: actions/pathsadminpanel.php:336
msgid "Server to direct SSL requests to"
-msgstr ""
+msgstr "Servidor hacia el cual dirigir las solicitudes SSL"
#: actions/pathsadminpanel.php:352
#, fuzzy
@@ -2724,7 +2723,7 @@ msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
#: actions/profilesettings.php:138
msgid "Share my current location when posting notices"
-msgstr ""
+msgstr "Compartir mi ubicación actual al publicar los mensajes"
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
@@ -2778,23 +2777,23 @@ msgstr "Idioma es muy largo ( max 50 car.)"
msgid "Invalid tag: \"%s\""
msgstr "Etiqueta inválida: \"% s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "No se pudo actualizar el usuario para autosuscribirse."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "No se han podido guardar las preferencias de ubicación."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "No se pudo guardar el perfil."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "No se pudo guardar las etiquetas."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Se guardó configuración."
@@ -2893,6 +2892,8 @@ msgid ""
"Why not [register an account](%%action.register%%) and be the first to post "
"one!"
msgstr ""
+"¿Por qué no [registras una cuenta](%%action.register%%) y te conviertes en "
+"la primera persona en publicar uno?"
#: actions/publictagcloud.php:134
msgid "Tag cloud"
@@ -3031,9 +3032,8 @@ msgid "Sorry, only invited people can register."
msgstr "Disculpa, sólo personas invitadas pueden registrarse."
#: actions/register.php:92
-#, fuzzy
msgid "Sorry, invalid invitation code."
-msgstr "Error con el código de confirmación."
+msgstr "El código de invitación no es válido."
#: actions/register.php:112
msgid "Registration successful"
@@ -3111,7 +3111,7 @@ msgstr ""
"electrónico, dirección de mensajería instantánea y número de teléfono."
#: actions/register.php:538
-#, fuzzy, php-format
+#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
"want to...\n"
@@ -3128,20 +3128,20 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-"¡Felicitaciones, %s! Y bienvenido a %%%%site.name%%%%. Desde aquí, "
-"puedes...\n"
+"¡Felicitaciones, %1$s! Te damos la bienvenida a %%%%site.name%%%%. Desde "
+"este momento, puede que quieras...\n"
"\n"
-"* Ir a [tu perfil](%s) y enviar tu primer mensaje.\n"
-"* Agregar una [cuenta Jabber/Gtalk](%%%%action.imsettings%%%%) para enviar "
-"avisos por mensajes instantáneos.\n"
-"* [Buscar personas](%%%%action.peoplesearch%%%%) que podrías conoces o que "
-"comparte tus intereses.\n"
-"* Actualizar tus [opciones de perfil](%%%%action.profilesettings%%%%) para "
-"contar más sobre tí.\n"
-"* Leer la [documentación en línea](%%%%doc.help%%%%) para encontrar "
-"características pasadas por alto.\n"
+"* Ir a [tu perfil](%2$s) y publicar tu primer mensaje.\n"
+"* Añadir una [dirección Jabber/GTalk](%%%%action.imsettings%%%%) para poder "
+"enviar mensajes a través de mensajería instantanea.\n"
+"* [Buscar personas](%%%%action.peoplesearch%%%%) que conozcas o que "
+"compartan tus intereses. \n"
+"* Actualizar tu [configuración de perfil](%%%%action.profilesettings%%%%) "
+"para contarle a otros más sobre tí. \n"
+"* Leer los [documentos en línea](%%%%doc.help%%%%) para encontrar "
+"características que te hayas podido perder. \n"
"\n"
-"Gracias por suscribirte y esperamos que disfrutes el uso de este servicio."
+"¡Gracias por apuntarte! Esperamos que disfrutes usando este servicio."
#: actions/register.php:562
msgid ""
@@ -3188,7 +3188,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "El URL de tu perfil en otro servicio de microblogueo compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Suscribirse"
@@ -3226,7 +3226,7 @@ msgstr "No puedes repetir tus propios mensajes."
msgid "You already repeated that notice."
msgstr "Ya has repetido este mensaje."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Repetido"
@@ -3327,9 +3327,8 @@ msgstr ""
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
#: actions/useradminpanel.php:293
-#, fuzzy
msgid "Save site settings"
-msgstr "Configuración de Avatar"
+msgstr "Guardar la configuración del sitio"
#: actions/showapplication.php:82
#, fuzzy
@@ -3390,11 +3389,11 @@ msgstr ""
#: actions/showapplication.php:273
msgid "Request token URL"
-msgstr ""
+msgstr "URL del token de solicitud"
#: actions/showapplication.php:278
msgid "Access token URL"
-msgstr ""
+msgstr "URL del token de acceso"
#: actions/showapplication.php:283
msgid "Authorize URL"
@@ -3641,19 +3640,20 @@ msgid ""
msgstr ""
#: actions/showstream.php:248
-#, fuzzy, php-format
+#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
"[StatusNet](http://status.net/) tool. "
msgstr ""
-"**%s** tiene una cuenta en %%%%site.name%%%%, un servicio [micro-blogging]"
-"(http://en.wikipedia.org/wiki/Micro-blogging) "
+"**% s ** tiene una cuenta en %%%%site.name%%%%, un servicio de "
+"[microblogueo] (http://en.wikipedia.org/wiki/Micro-blogging), basado en la "
+"herramienta de software libre [StatusNet] (http://status.net/). "
#: actions/showstream.php:305
-#, fuzzy, php-format
+#, php-format
msgid "Repeat of %s"
-msgstr "Respuestas a %s"
+msgstr "Repetición de %s"
#: actions/silence.php:65 actions/unsilence.php:65
#, fuzzy
@@ -3693,7 +3693,7 @@ msgstr ""
#: actions/siteadminpanel.php:177
msgid "Snapshot frequency must be a number."
-msgstr ""
+msgstr "La frecuencia de captura debe ser un número."
#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
@@ -3750,13 +3750,12 @@ msgid "Default timezone for the site; usually UTC."
msgstr "Zona horaria predeterminada del sitio; generalmente UTC."
#: actions/siteadminpanel.php:281
-#, fuzzy
msgid "Default site language"
-msgstr "Lenguaje de preferencia"
+msgstr "Idioma predeterminado del sitio"
#: actions/siteadminpanel.php:289
msgid "Snapshots"
-msgstr ""
+msgstr "Capturas"
#: actions/siteadminpanel.php:292
msgid "Randomly during Web hit"
@@ -3764,11 +3763,11 @@ msgstr ""
#: actions/siteadminpanel.php:293
msgid "In a scheduled job"
-msgstr ""
+msgstr "En un trabajo programado"
#: actions/siteadminpanel.php:295
msgid "Data snapshots"
-msgstr ""
+msgstr "Capturas de datos"
#: actions/siteadminpanel.php:296
msgid "When to send statistical data to status.net servers"
@@ -3776,7 +3775,7 @@ msgstr ""
#: actions/siteadminpanel.php:301
msgid "Frequency"
-msgstr ""
+msgstr "Frecuencia"
#: actions/siteadminpanel.php:302
msgid "Snapshots will be sent once every N web hits"
@@ -3808,7 +3807,7 @@ msgstr ""
#: actions/siteadminpanel.php:322
msgid "How long users must wait (in seconds) to post the same thing again."
-msgstr ""
+msgstr "Cuántos segundos es necesario esperar para publicar lo mismo de nuevo."
#: actions/smssettings.php:58
msgid "SMS settings"
@@ -3913,28 +3912,36 @@ msgid "No code entered"
msgstr "No ingresó código"
#: actions/subedit.php:70
-#, fuzzy
msgid "You are not subscribed to that profile."
-msgstr "No estás suscrito a ese perfil."
+msgstr "No te has suscrito a ese perfil."
-#: actions/subedit.php:83
-#, fuzzy
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
msgid "Could not save subscription."
-msgstr "No se pudo guardar suscripción."
+msgstr "No se ha podido guardar la suscripción."
+
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
-#: actions/subscribe.php:55
+#: actions/subscribe.php:107
#, fuzzy
-msgid "Not a local user."
-msgstr "No es usuario local."
+msgid "No such profile."
+msgstr "No existe tal archivo."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "No te has suscrito a ese perfil."
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Suscrito"
#: actions/subscribers.php:50
-#, fuzzy, php-format
+#, php-format
msgid "%s subscribers"
-msgstr "Suscriptores %s"
+msgstr "%s suscriptores"
#: actions/subscribers.php:52
#, fuzzy, php-format
@@ -3987,7 +3994,7 @@ msgstr "Estas son las personas que escuchas sus avisos."
msgid "These are the people whose notices %s listens to."
msgstr "Estas son las personas que %s escucha sus avisos."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3997,17 +4004,16 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
-#, fuzzy, php-format
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
+#, php-format
msgid "%s is not listening to anyone."
-msgstr "%1$s ahora está escuchando "
+msgstr "%s no está escuchando a nadie."
-#: actions/subscriptions.php:194
-#, fuzzy
+#: actions/subscriptions.php:199
msgid "Jabber"
-msgstr "Jabber "
+msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4100,9 +4106,8 @@ msgid "User is not silenced."
msgstr "El usuario no tiene un perfil."
#: actions/unsubscribe.php:77
-#, fuzzy
msgid "No profile id in request."
-msgstr "Ningún perfil de Id en solicitud."
+msgstr "No hay id de perfil solicitado."
#: actions/unsubscribe.php:98
msgid "Unsubscribed"
@@ -4121,20 +4126,20 @@ msgstr "Usuario"
#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Configuración de usuarios en este sitio StatusNet."
#: actions/useradminpanel.php:148
msgid "Invalid bio limit. Must be numeric."
-msgstr ""
+msgstr "Límite para la bio inválido: Debe ser numérico."
#: actions/useradminpanel.php:154
msgid "Invalid welcome text. Max length is 255 characters."
-msgstr ""
+msgstr "Texto de bienvenida inválido. La longitud máx. es de 255 caracteres."
#: actions/useradminpanel.php:164
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr ""
+msgstr "Suscripción predeterminada inválida : '%1$s' no es un usuario"
#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
@@ -4143,11 +4148,11 @@ msgstr "Perfil"
#: actions/useradminpanel.php:221
msgid "Bio Limit"
-msgstr ""
+msgstr "Límite de la bio"
#: actions/useradminpanel.php:222
msgid "Maximum length of a profile bio in characters."
-msgstr ""
+msgstr "Longitud máxima de bio de perfil en caracteres."
#: actions/useradminpanel.php:230
msgid "New users"
@@ -4159,27 +4164,23 @@ msgstr "Bienvenida a nuevos usuarios"
#: actions/useradminpanel.php:235
msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "Texto de bienvenida para nuevos usuarios (máx. 255 caracteres)."
#: actions/useradminpanel.php:240
msgid "Default subscription"
msgstr "Suscripción predeterminada"
#: actions/useradminpanel.php:241
-#, fuzzy
msgid "Automatically subscribe new users to this user."
-msgstr ""
-"Suscribirse automáticamente a quien quiera que se suscriba a mí (es mejor "
-"para no-humanos)"
+msgstr "Suscribir automáticamente nuevos usuarios a este usuario."
#: actions/useradminpanel.php:250
msgid "Invitations"
msgstr "Invitaciones"
#: actions/useradminpanel.php:255
-#, fuzzy
msgid "Invitations enabled"
-msgstr "Invitacion(es) enviada(s)"
+msgstr "Invitaciones habilitadas"
#: actions/useradminpanel.php:257
msgid "Whether to allow users to invite new users."
@@ -4209,7 +4210,6 @@ msgstr "Aceptar"
#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
-#, fuzzy
msgid "Subscribe to this user"
msgstr "Suscribirse a este usuario"
@@ -4414,9 +4414,8 @@ msgid "Could not create login token for %s"
msgstr "No se pudo crear favorito."
#: classes/Message.php:45
-#, fuzzy
msgid "You are banned from sending direct messages."
-msgstr "Error al enviar mensaje directo."
+msgstr "Se te ha inhabilitado para enviar mensajes directos."
#: classes/Message.php:61
msgid "Could not insert message."
@@ -4431,22 +4430,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:222
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:226
msgid "Problem saving notice. Unknown user."
msgstr "Ha habido un problema al guardar el mensaje. Usuario desconocido."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
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:237
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4455,39 +4454,60 @@ msgstr ""
"Demasiados avisos demasiado rápido; para y publicar nuevamente en unos "
"minutos."
-#: classes/Notice.php:235
+#: classes/Notice.php:243
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:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Hubo un problema al guardar el aviso."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Hubo un problema al guardar el aviso."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Error de BD al insertar respuesta: %s"
-
-#: classes/Notice.php:1271
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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!"
-#: classes/User_group.php:413
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "No se pudo crear grupo."
-#: classes/User_group.php:442
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "No se pudo configurar miembros de grupo."
@@ -4691,26 +4711,38 @@ msgstr ""
"Derechos de autor de contenido y datos por los colaboradores. Todos los "
"derechos reservados."
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "Todo"
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "Licencia."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginación"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "Después"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Antes"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "No puedes hacer cambios a este sitio."
@@ -4736,19 +4768,16 @@ msgid "Unable to delete design setting."
msgstr "¡No se pudo guardar tu configuración de Twitter!"
#: lib/adminpanelaction.php:312
-#, fuzzy
msgid "Basic site configuration"
-msgstr "Confirmación de correo electrónico"
+msgstr "Configuración básica del sitio"
#: lib/adminpanelaction.php:317
-#, fuzzy
msgid "Design configuration"
-msgstr "SMS confirmación"
+msgstr "Configuración del diseño"
#: lib/adminpanelaction.php:322
-#, fuzzy
msgid "User configuration"
-msgstr "SMS confirmación"
+msgstr "Configuración de usuario"
#: lib/adminpanelaction.php:327
msgid "Access configuration"
@@ -4774,7 +4803,7 @@ msgstr ""
#: lib/applicationeditform.php:136
msgid "Edit application"
-msgstr ""
+msgstr "Editar aplicación"
#: lib/applicationeditform.php:184
msgid "Icon for this application"
@@ -4791,9 +4820,8 @@ msgid "Describe your application"
msgstr "Describir al grupo o tema"
#: lib/applicationeditform.php:216
-#, fuzzy
msgid "Source URL"
-msgstr "Fuente"
+msgstr "La URL de origen"
#: lib/applicationeditform.php:218
#, fuzzy
@@ -4802,7 +4830,7 @@ msgstr "El URL de página de inicio o blog del grupo or tema"
#: lib/applicationeditform.php:224
msgid "Organization responsible for this application"
-msgstr ""
+msgstr "Organización responsable de esta aplicación"
#: lib/applicationeditform.php:230
#, fuzzy
@@ -4815,15 +4843,15 @@ msgstr ""
#: lib/applicationeditform.php:258
msgid "Browser"
-msgstr ""
+msgstr "Navegador"
#: lib/applicationeditform.php:274
msgid "Desktop"
-msgstr ""
+msgstr "Escritorio"
#: lib/applicationeditform.php:275
msgid "Type of application, browser or desktop"
-msgstr ""
+msgstr "Tipo de aplicación, de navegador o de escritorio"
#: lib/applicationeditform.php:297
msgid "Read-only"
@@ -4838,9 +4866,8 @@ msgid "Default access for this application: read-only, or read-write"
msgstr ""
#: lib/applicationlist.php:154
-#, fuzzy
msgid "Revoke"
-msgstr "Eliminar"
+msgstr "Revocar"
#: lib/attachmentlist.php:87
msgid "Attachments"
@@ -4848,7 +4875,7 @@ msgstr ""
#: lib/attachmentlist.php:265
msgid "Author"
-msgstr ""
+msgstr "Autor"
#: lib/attachmentlist.php:278
msgid "Provider"
@@ -4856,16 +4883,15 @@ msgstr "Proveedor"
#: lib/attachmentnoticesection.php:67
msgid "Notices where this attachment appears"
-msgstr ""
+msgstr "Mensajes donde aparece este adjunto"
#: lib/attachmenttagcloudsection.php:48
msgid "Tags for this attachment"
-msgstr ""
+msgstr "Etiquetas de este archivo adjunto"
#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
-#, fuzzy
msgid "Password changing failed"
-msgstr "Cambio de contraseña "
+msgstr "El cambio de contraseña ha fallado"
#: lib/authenticationplugin.php:233
#, fuzzy
@@ -4889,10 +4915,9 @@ msgid "Sorry, this command is not yet implemented."
msgstr "Disculpa, todavía no se implementa este comando."
#: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
msgid "Could not find a user with nickname %s"
-msgstr ""
-"No se pudo actualizar el usuario con la dirección de correo confirmada."
+msgstr "No se pudo encontrar a nadie con el nombre de usuario %s"
#: lib/command.php:92
msgid "It does not make a lot of sense to nudge yourself!"
@@ -4912,9 +4937,8 @@ msgid ""
msgstr ""
#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
msgid "Notice with that id does not exist"
-msgstr "Ningún perfil con ese ID."
+msgstr "No existe ningún mensaje con ese id"
#: lib/command.php:168 lib/command.php:406 lib/command.php:467
#: lib/command.php:523
@@ -5023,80 +5047,89 @@ 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
+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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Desuscrito de %s"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "No estás suscrito a nadie."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
msgid "No one is subscribed to you."
msgstr "Nadie está suscrito a ti."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
msgid "You are not a member of any groups."
msgstr "No eres miembro de ningún grupo"
-#: lib/command.php:714
+#: lib/command.php:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5110,6 +5143,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5137,19 +5171,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Ningún archivo de configuración encontrado. "
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Ir al instalador."
@@ -5207,11 +5241,11 @@ msgstr "Aceptar"
#: 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"
@@ -5577,7 +5611,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "desde"
@@ -5702,49 +5736,49 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "N"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "S"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "E"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "en"
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "en contexto"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Crear"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Responder este aviso."
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Aviso borrado"
@@ -5777,10 +5811,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."
@@ -5967,36 +5997,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"
@@ -6049,67 +6049,67 @@ msgstr "editar avatar"
msgid "User actions"
msgstr "Acciones de usuario"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Editar configuración del perfil"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Editar"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Enviar un mensaje directo a este usuario"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Mensaje"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Moderar"
-#: lib/util.php:871
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "hace unos segundos"
-#: lib/util.php:873
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "hace un minuto"
-#: lib/util.php:875
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "hace %d minutos"
-#: lib/util.php:877
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "hace una hora"
-#: lib/util.php:879
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "hace %d horas"
-#: lib/util.php:881
+#: lib/util.php:962
msgid "about a day ago"
msgstr "hace un día"
-#: lib/util.php:883
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "hace %d días"
-#: lib/util.php:885
+#: lib/util.php:966
msgid "about a month ago"
msgstr "hace un mes"
-#: lib/util.php:887
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "hace %d meses"
-#: lib/util.php:889
+#: lib/util.php:970
msgid "about a year ago"
msgstr "hace un año"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index c749a4161..600323e43 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:14:41+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:38+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 (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
@@ -66,7 +66,7 @@ msgstr "غیر فعال کردن نام نوبسی جدید"
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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 "چنین کاربری وجود ندارد."
@@ -173,8 +172,8 @@ msgstr ""
msgid "You and friends"
msgstr "شما و دوستان"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "به روز رسانی از %1$ و دوستان در %2$"
@@ -195,12 +194,12 @@ msgstr "به روز رسانی از %1$ و دوستان در %2$"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "رابط مورد نظر پیدا نشد."
@@ -501,7 +500,7 @@ msgstr "اندازه‌ی نادرست"
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -641,7 +640,7 @@ msgstr "قالب پشتیبانی نشده."
msgid "%1$s / Favorites from %2$s"
msgstr "%s / دوست داشتنی از %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s به روز رسانی های دوست داشتنی %s / %s"
@@ -652,7 +651,7 @@ msgstr "%s به روز رسانی های دوست داشتنی %s / %s"
msgid "%s timeline"
msgstr "خط زمانی %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -668,12 +667,12 @@ msgstr "%$1s / به روز رسانی های شامل %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s به روز رسانی هایی که در پاسخ به $2$s / %3$s"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s خط‌زمانی عمومی"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s به روز رسانی های عموم"
@@ -683,7 +682,7 @@ msgstr "%s به روز رسانی های عموم"
msgid "Repeated to %s"
msgstr ""
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "تکرار %s"
@@ -693,7 +692,7 @@ msgstr "تکرار %s"
msgid "Notices tagged with %s"
msgstr "پیام‌هایی که با %s نشانه گزاری شده اند."
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "پیام‌های نشانه گزاری شده با %1$s در %2$s"
@@ -755,7 +754,7 @@ msgid "Preview"
msgstr "پیش‌نمایش"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -973,7 +972,7 @@ msgstr "این پیام را پاک کن"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1004,7 +1003,7 @@ msgstr "آیا اطمینان دارید که می‌خواهید این پیا
msgid "Do not delete this notice"
msgstr "این پیام را پاک نکن"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "این پیام را پاک کن"
@@ -1255,7 +1254,7 @@ msgstr "توصیف بسیار زیاد است (حداکثر %d حرف)."
msgid "Could not update group."
msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "نمی‌توان نام‌های مستعار را ساخت."
@@ -2302,7 +2301,7 @@ msgid "Only "
msgstr " فقط"
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست."
@@ -2746,23 +2745,23 @@ msgstr "کلام بسیار طولانی است( حداکثر ۵۰ کاراکت
msgid "Invalid tag: \"%s\""
msgstr "نشان نادرست »%s«"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "نمی‌توان شناسه را ذخیره کرد."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "نمی‌توان نشان را ذخیره کرد."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "تنظیمات ذخیره شد."
@@ -3123,7 +3122,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr ""
@@ -3159,7 +3158,7 @@ msgstr "شما نمی توانید آگهی خودتان را تکرار کنی
msgid "You already repeated that notice."
msgstr "شما قبلا آن آگهی را تکرار کردید."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr ""
@@ -3844,15 +3843,26 @@ 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 ""
-#: actions/subscribe.php:55
-msgid "Not a local user."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "چنین پرونده‌ای وجود ندارد."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "شما به این پروفيل متعهد نشدید"
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr ""
@@ -3912,7 +3922,7 @@ msgstr ""
msgid "These are the people whose notices %s listens to."
msgstr ""
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3922,16 +3932,16 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr ""
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
@@ -4328,22 +4338,22 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "مشکل در ذخیره کردن پیام. بسیار طولانی."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "مشکل در ذخیره کردن پیام. کاربر نا شناخته."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"تعداد خیلی زیاد آگهی و بسیار سریع؛ استراحت کنید و مجددا دقایقی دیگر ارسال "
"کنید."
-#: classes/Notice.php:229
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4351,39 +4361,58 @@ msgstr ""
"تعداد زیاد پیام های دو نسخه ای و بسرعت؛ استراحت کنید و دقایقی دیگر مجددا "
"ارسال کنید."
-#: classes/Notice.php:235
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "شما از فرستادن پست در این سایت مردود شدید ."
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "مشکل در ذخیره کردن آگهی."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "مشکل در ذخیره کردن آگهی."
-#: classes/Notice.php:848
+#: classes/Notice.php:1407
#, php-format
-msgid "DB error inserting reply: %s"
+msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/Notice.php:1235
-#, php-format
-msgid "RT @%1$s %2$s"
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
msgstr ""
-#: classes/User.php:385
+#: 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 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr ""
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "خوش امدید به %1$s , @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "نمیتوان گروه را تشکیل داد"
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr ""
@@ -4579,26 +4608,38 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "همه "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "مجوز."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "صفحه بندى"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "بعد از"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "قبل از"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "شما نمی توانید در این سایت تغیری ایجاد کنید"
@@ -4904,77 +4945,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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "مشترک‌ها"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "شما توسط هیچ کس تصویب نشده اید ."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "هم اکنون شما این کاربران را دنبال می‌کنید: "
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "هیچکس شما را تایید نکرده ."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "هیچکس شما را تایید نکرده ."
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "شما در هیچ گروهی عضو نیستید ."
-#: lib/command.php:714
+#: lib/command.php:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4988,6 +5039,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5015,19 +5067,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "شما ممکن است بخواهید نصاب را اجرا کنید تا این را تعمیر کند."
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "برو به نصاب."
@@ -5441,7 +5493,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "از"
@@ -5565,48 +5617,48 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "در"
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "در زمینه"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "تکرار از"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "به این آگهی جواب دهید"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "جواب دادن"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "آگهی تکرار شد"
@@ -5638,10 +5690,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 +5867,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"
@@ -5897,67 +5917,67 @@ msgstr "ویرایش اواتور"
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "ویرایش تنظیمات پروفيل"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "ویرایش"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "پیام مستقیم به این کاربر بفرستید"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "پیام"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "چند ثانیه پیش"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "حدود یک دقیقه پیش"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "حدود %d دقیقه پیش"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "حدود یک ساعت پیش"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "حدود %d ساعت پیش"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "حدود یک روز پیش"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "حدود %d روز پیش"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "حدود یک ماه پیش"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "حدود %d ماه پیش"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "حدود یک سال پیش"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 80a85e1d1..b92edf111 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:14:39+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:33+0000\n"
"Language-Team: Finnish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -68,7 +68,7 @@ msgstr ""
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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."
@@ -175,8 +174,8 @@ msgstr ""
msgid "You and friends"
msgstr "Sinä ja kaverit"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
@@ -197,12 +196,12 @@ msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "API-metodia ei löytynyt!"
@@ -513,7 +512,7 @@ msgstr "Koko ei kelpaa."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -659,7 +658,7 @@ msgstr "Formaattia ei ole tuettu."
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Käyttäjän %s suosikit"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen."
@@ -670,7 +669,7 @@ msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen."
msgid "%s timeline"
msgstr "%s aikajana"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -687,12 +686,12 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
"%1$s -päivitykset, jotka on vastauksia käyttäjän %2$s / %3$s päivityksiin."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s julkinen aikajana"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s päivitykset kaikilta!"
@@ -702,7 +701,7 @@ msgstr "%s päivitykset kaikilta!"
msgid "Repeated to %s"
msgstr "Vastaukset käyttäjälle %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "Vastaukset käyttäjälle %s"
@@ -712,7 +711,7 @@ msgstr "Vastaukset käyttäjälle %s"
msgid "Notices tagged with %s"
msgstr "Päivitykset joilla on tagi %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
@@ -773,7 +772,7 @@ msgid "Preview"
msgstr "Esikatselu"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Poista"
@@ -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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Istuntoavaimesi kanssa oli ongelma."
@@ -987,7 +986,7 @@ msgstr "Poista tämä päivitys"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1018,7 +1017,7 @@ msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
msgid "Do not delete this notice"
msgstr "Älä poista tätä päivitystä"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Poista tämä päivitys"
@@ -1277,7 +1276,7 @@ msgstr "kuvaus on liian pitkä (max %d merkkiä)."
msgid "Could not update group."
msgstr "Ei voitu päivittää ryhmää."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Ei voitu lisätä aliasta."
@@ -2366,7 +2365,7 @@ msgid "Only "
msgstr "Vain "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Tuo ei ole tuettu tietomuoto."
@@ -2829,24 +2828,24 @@ msgstr "Kieli on liian pitkä (max 50 merkkiä)."
msgid "Invalid tag: \"%s\""
msgstr "Virheellinen tagi: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Ei voitu asettaa käyttäjälle automaattista tilausta."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Tageja ei voitu tallentaa."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Ei voitu tallentaa profiilia."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Tageja ei voitu tallentaa."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Asetukset tallennettu."
@@ -3235,7 +3234,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Profiilisi URL-osoite toisessa yhteensopivassa mikroblogauspalvelussa"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Tilaa"
@@ -3279,7 +3278,7 @@ msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
msgid "You already repeated that notice."
msgstr "Sinä olet jo estänyt tämän käyttäjän."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "Luotu"
@@ -3984,15 +3983,26 @@ 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."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Käyttäjä ei ole rekisteröitynyt tähän palveluun."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Tiedostoa ei ole."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Tilattu"
@@ -4052,7 +4062,7 @@ msgstr "Näiden ihmisten päivityksiä sinä seuraat."
msgid "These are the people whose notices %s listens to."
msgstr "Käyttäjä %s seuraa näiden ihmisten päivityksiä."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4062,16 +4072,16 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s ei seuraa ketään käyttäjää."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4500,23 +4510,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:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
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:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4524,39 +4534,61 @@ 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:243
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:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Ongelma päivityksen tallentamisessa."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Tietokantavirhe tallennettaessa vastausta: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Ryhmän luonti ei onnistunut."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Ryhmän jäsenyystietoja ei voitu asettaa."
@@ -4762,26 +4794,38 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "Kaikki "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "lisenssi."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Sivutus"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "Myöhemmin"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Aiemmin"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
#, fuzzy
msgid "You cannot make changes to this site."
@@ -5096,83 +5140,92 @@ 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
+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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Käyttäjän %s päivitysten tilaus lopetettu"
+
+#: lib/command.php:709
#, 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:711
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:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Toista ei voitu asettaa tilaamaan sinua."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
#, 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:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5186,6 +5239,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5213,20 +5267,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "Varmistuskoodia ei ole annettu."
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
#, fuzzy
msgid "Go to the installer."
msgstr "Kirjaudu sisään palveluun"
@@ -5661,7 +5715,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr " lähteestä "
@@ -5785,51 +5839,51 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "Ei"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "Ei sisältöä!"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Luotu"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Vastaa tähän päivitykseen"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Vastaus"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Päivitys on poistettu."
@@ -5863,11 +5917,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 +6104,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"
@@ -6138,68 +6157,68 @@ msgstr "Kuva"
msgid "User actions"
msgstr "Käyttäjän toiminnot"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "Profiiliasetukset"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Lähetä suora viesti tälle käyttäjälle"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Viesti"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "muutama sekunti sitten"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "noin minuutti sitten"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "noin %d minuuttia sitten"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "noin tunti sitten"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "noin %d tuntia sitten"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "noin päivä sitten"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "noin %d päivää sitten"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "noin kuukausi sitten"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "noin %d kuukautta sitten"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "noin vuosi sitten"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 9fb5e88b2..cf0cc849b 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:14:44+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:48+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -66,7 +66,7 @@ msgstr "Désactiver les nouvelles inscriptions."
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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é."
@@ -175,8 +174,8 @@ msgstr ""
msgid "You and friends"
msgstr "Vous et vos amis"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Statuts de %1$s et ses amis dans %2$s!"
@@ -197,12 +196,12 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Méthode API non trouvée !"
@@ -506,7 +505,7 @@ msgstr "Jeton incorrect."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -657,7 +656,7 @@ msgstr "Format non supporté."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoris de %2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s statuts favoris de %2$s / %2$s."
@@ -668,7 +667,7 @@ msgstr "%1$s statuts favoris de %2$s / %2$s."
msgid "%s timeline"
msgstr "Activité de %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -684,12 +683,12 @@ msgstr "%1$s / Mises à jour mentionnant %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Activité publique %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s statuts de tout le monde !"
@@ -699,7 +698,7 @@ msgstr "%s statuts de tout le monde !"
msgid "Repeated to %s"
msgstr "Repris pour %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Reprises de %s"
@@ -709,7 +708,7 @@ msgstr "Reprises de %s"
msgid "Notices tagged with %s"
msgstr "Avis marqués avec %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Mises à jour marquées avec %1$s dans %2$s !"
@@ -772,7 +771,7 @@ msgid "Preview"
msgstr "Aperçu"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Supprimer"
@@ -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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Un problème est survenu avec votre jeton de session."
@@ -982,7 +981,7 @@ msgstr "Supprimer cette application"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1013,7 +1012,7 @@ msgstr "Voulez-vous vraiment supprimer cet avis ?"
msgid "Do not delete this notice"
msgstr "Ne pas supprimer cet avis"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Supprimer cet avis"
@@ -1254,7 +1253,7 @@ msgstr "la description est trop longue (%d caractères maximum)."
msgid "Could not update group."
msgstr "Impossible de mettre à jour le groupe."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Impossible de créer les alias."
@@ -2357,7 +2356,7 @@ msgid "Only "
msgstr "Seulement "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Format de données non supporté."
@@ -2801,23 +2800,23 @@ msgstr "La langue est trop longue (255 caractères maximum)."
msgid "Invalid tag: \"%s\""
msgstr "Marque invalide : « %s »"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Impossible de mettre à jour l’auto-abonnement."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Impossible d’enregistrer les préférences de localisation."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Impossible d’enregistrer le profil."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Impossible d’enregistrer les marques."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Préférences enregistrées."
@@ -3220,7 +3219,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL de votre profil sur un autre service de micro-blogging compatible"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "S’abonner"
@@ -3257,7 +3256,7 @@ msgstr "Vous ne pouvez pas reprendre votre propre avis."
msgid "You already repeated that notice."
msgstr "Vous avez déjà repris cet avis."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Repris"
@@ -3978,15 +3977,26 @@ 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."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Ceci n’est pas un utilisateur local."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Fichier non trouvé."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Vous n’êtes pas abonné(e) à ce profil."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Abonné"
@@ -4050,7 +4060,7 @@ msgstr "Vous suivez les avis de ces personnes."
msgid "These are the people whose notices %s listens to."
msgstr "Les avis de ces personnes sont suivis par %s."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4066,16 +4076,16 @@ msgstr ""
"êtes un [utilisateur de Twitter](%%action.twittersettings%%), vous pouvez "
"vous abonner automatiquement aux gens auquels vous êtes déjà abonné là-bas."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s ne suit actuellement personne."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4506,22 +4516,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:222
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:226
msgid "Problem saving notice. Unknown user."
msgstr "Erreur lors de l’enregistrement de l’avis. Utilisateur inconnu."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
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:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4529,38 +4539,57 @@ msgstr ""
"Trop de messages en double trop vite ! Prenez une pause et publiez à nouveau "
"dans quelques minutes."
-#: classes/Notice.php:235
+#: classes/Notice.php:243
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:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problème lors de l’enregistrement de l’avis."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
msgid "Problem saving group inbox."
msgstr "Problème lors de l’enregistrement de la boîte de réception du groupe."
-#: classes/Notice.php:848
-#, 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:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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 !"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Impossible de créer le groupe."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Impossible d’établir l’inscription au groupe."
@@ -4765,26 +4794,38 @@ msgstr ""
"Le contenu et les données sont sous le droit d’auteur du contributeur. Tous "
"droits réservés."
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "Tous "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "licence."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "Après"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Avant"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "Vous ne pouvez pas faire de modifications sur ce site."
@@ -5088,82 +5129,92 @@ 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
+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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Désabonné de %s"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Vous n’êtes abonné(e) à personne."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
msgid "No one is subscribed to you."
msgstr "Personne ne s’est abonné à vous."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
msgid "You are not a member of any groups."
msgstr "Vous n’êtes membre d’aucun groupe."
-#: lib/command.php:714
+#: lib/command.php:755
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:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5177,6 +5228,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5242,20 +5294,20 @@ msgstr ""
"tracks - pas encore implémenté.\n"
"tracking - pas encore implémenté.\n"
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Aucun fichier de configuration n’a été trouvé. "
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
"J’ai cherché des fichiers de configuration dans les emplacements suivants : "
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "Vous pouvez essayer de lancer l’installeur pour régler ce problème."
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Aller au programme d’installation"
@@ -5754,7 +5806,7 @@ msgstr ""
"pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent "
"vous envoyer des messages destinés à vous seul(e)."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "de"
@@ -5880,48 +5932,48 @@ msgstr ""
"Désolé, l’obtention de votre localisation prend plus de temps que prévu. "
"Veuillez réessayer plus tard."
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u° %2$u' %3$u\" %4$s %5$u° %6$u' %7$u\" %8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "N"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "S"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "E"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "O"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "chez"
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "dans le contexte"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Repris par"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Répondre à cet avis"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Répondre"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Avis repris"
@@ -5953,10 +6005,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 +6181,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"
@@ -6211,67 +6231,67 @@ msgstr "Modifier l’avatar"
msgid "User actions"
msgstr "Actions de l’utilisateur"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Modifier les paramètres du profil"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Modifier"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Envoyer un message à cet utilisateur"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Message"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Modérer"
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "il y a quelques secondes"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "il y a 1 minute"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "il y a %d minutes"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "il y a 1 heure"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "il y a %d heures"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "il y a 1 jour"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "il y a %d jours"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "il y a 1 mois"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "il y a %d mois"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "il y a environ 1 an"
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 0358b8ecd..b60553d44 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:14:47+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:51+0000\n"
"Language-Team: Irish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -67,7 +67,7 @@ msgstr ""
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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."
@@ -170,8 +169,8 @@ msgstr ""
msgid "You and friends"
msgstr "%s e amigos"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualizacións dende %1$s e amigos en %2$s!"
@@ -192,12 +191,12 @@ msgstr "Actualizacións dende %1$s e amigos en %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Método da API non atopado"
@@ -511,7 +510,7 @@ msgstr "Tamaño inválido."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -658,7 +657,7 @@ msgstr "Formato de ficheiro de imaxe non soportado."
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Favoritos dende %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s updates favorited by %s / %s."
@@ -669,7 +668,7 @@ msgstr "%s updates favorited by %s / %s."
msgid "%s timeline"
msgstr "Liña de tempo de %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -685,12 +684,12 @@ msgstr "%1$s / Chíos que respostan a %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "Hai %1$s chíos en resposta a chíos dende %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Liña de tempo pública de %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s chíos de calquera!"
@@ -700,7 +699,7 @@ msgstr "%s chíos de calquera!"
msgid "Repeated to %s"
msgstr "Replies to %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "Replies to %s"
@@ -710,7 +709,7 @@ msgstr "Replies to %s"
msgid "Notices tagged with %s"
msgstr "Chíos tagueados con %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualizacións dende %1$s en %2$s!"
@@ -773,7 +772,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
#, fuzzy
msgid "Delete"
msgstr "eliminar"
@@ -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:1195
+#: 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..."
@@ -998,7 +997,7 @@ msgstr "Eliminar chío"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1031,7 +1030,7 @@ msgstr "Estas seguro que queres eliminar este chío?"
msgid "Do not delete this notice"
msgstr "Non se pode eliminar este chíos."
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
#, fuzzy
msgid "Delete this notice"
msgstr "Eliminar chío"
@@ -1298,7 +1297,7 @@ msgstr "O teu Bio é demasiado longo (max 140 car.)."
msgid "Could not update group."
msgstr "Non se puido actualizar o usuario."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "Non se puido crear o favorito."
@@ -2397,7 +2396,7 @@ msgid "Only "
msgstr ""
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Non é un formato de datos soportado."
@@ -2861,24 +2860,24 @@ msgstr "A Linguaxe é demasiado longa (max 50 car.)."
msgid "Invalid tag: \"%s\""
msgstr "Etiqueta inválida: '%s'"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Non se puido actualizar o usuario para autosuscrición."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Non se puideron gardar as etiquetas."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Non se puido gardar o perfil."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Non se puideron gardar as etiquetas."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Configuracións gardadas."
@@ -3276,7 +3275,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Enderezo do teu perfil en outro servizo de microblogaxe compatíbel"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Subscribir"
@@ -3319,7 +3318,7 @@ msgstr "Non podes rexistrarte se non estas de acordo coa licenza."
msgid "You already repeated that notice."
msgstr "Xa bloqueaches a este usuario."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "Crear"
@@ -4036,15 +4035,26 @@ 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."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Non é usuario local."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Ningún chío."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Non estás suscrito a ese perfil"
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Suscrito"
@@ -4104,7 +4114,7 @@ msgstr "Esa é a xente á que lle estas a escoitar os seus chíos"
msgid "These are the people whose notices %s listens to."
msgstr "Esta é a xente á que lle estas a escoitar os chíos %s."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4114,16 +4124,16 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1$s está a escoitar os teus chíos %2$s."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber."
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4556,23 +4566,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:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
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:237
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4581,40 +4591,62 @@ 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:243
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:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Aconteceu un erro ó gardar o chío."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Erro ó inserir a contestación na BD: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
#, fuzzy
msgid "Could not create group."
msgstr "Non se puido crear o favorito."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "Non se pode gardar a subscrición."
@@ -4829,29 +4861,41 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
#, fuzzy
msgid "All "
msgstr "Todos"
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1139
+#: lib/action.php:1141
#, fuzzy
msgid "After"
msgstr "« Despois"
-#: lib/action.php:1147
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "Antes »"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
#, fuzzy
msgid "You cannot make changes to this site."
@@ -5170,55 +5214,64 @@ 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
+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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Desuscribir de %s"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Non estás suscrito a ese perfil"
-#: lib/command.php:670
+#: lib/command.php:711
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 +5280,12 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Outro usuario non se puido suscribir a ti."
-#: lib/command.php:692
+#: lib/command.php:733
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 +5294,12 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:712
+#: lib/command.php:753
#, 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:755
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 +5308,7 @@ msgstr[2] ""
msgstr[3] ""
msgstr[4] ""
-#: lib/command.php:728
+#: lib/command.php:769
#, fuzzy
msgid ""
"Commands:\n"
@@ -5270,6 +5323,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5323,20 +5377,20 @@ msgstr ""
"tracks - non implementado por agora.\n"
"tracking - non implementado por agora.\n"
-#: lib/common.php:135
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "Sen código de confirmación."
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -5821,7 +5875,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr " dende "
@@ -5948,53 +6002,53 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "No"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "Sen contido!"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Crear"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
#, fuzzy
msgid "Reply to this notice"
msgstr "Non se pode eliminar este chíos."
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
#, fuzzy
msgid "Reply"
msgstr "contestar"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Chío publicado"
@@ -6031,11 +6085,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 +6276,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"
@@ -6313,70 +6332,70 @@ msgstr "Avatar"
msgid "User actions"
msgstr "Outras opcions"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "Configuración de perfil"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
#, fuzzy
msgid "Send a direct message to this user"
msgstr "Non podes enviar mensaxes a este usurio."
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
#, fuzzy
msgid "Message"
msgstr "Nova mensaxe"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "fai uns segundos"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "fai un minuto"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "fai %d minutos"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "fai unha hora"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "fai %d horas"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "fai un día"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "fai %d días"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "fai un mes"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "fai %d meses"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "fai un ano"
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index fb8f12031..424917efb 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:14:50+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:54+0000\n"
"Language-Team: Hebrew\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -64,7 +64,7 @@ msgstr ""
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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 "אין משתמש כזה."
@@ -167,8 +166,8 @@ msgstr ""
msgid "You and friends"
msgstr "%s וחברים"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -189,12 +188,12 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "קוד האישור לא נמצא."
@@ -504,7 +503,7 @@ msgstr "גודל לא חוקי."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -649,7 +648,7 @@ msgstr "פורמט התמונה אינו נתמך."
msgid "%1$s / Favorites from %2$s"
msgstr "הסטטוס של %1$s ב-%2$s "
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "מיקרובלוג מאת %s"
@@ -660,7 +659,7 @@ msgstr "מיקרובלוג מאת %s"
msgid "%s timeline"
msgstr ""
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -676,12 +675,12 @@ msgstr "הסטטוס של %1$s ב-%2$s "
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -691,7 +690,7 @@ msgstr ""
msgid "Repeated to %s"
msgstr "תגובת עבור %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "תגובת עבור %s"
@@ -701,7 +700,7 @@ msgstr "תגובת עבור %s"
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "מיקרובלוג מאת %s"
@@ -765,7 +764,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
#, fuzzy
msgid "Delete"
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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -986,7 +985,7 @@ msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אות
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1016,7 +1015,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "אין הודעה כזו."
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr ""
@@ -1276,7 +1275,7 @@ msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיו
msgid "Could not update group."
msgstr "עידכון המשתמש נכשל."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "שמירת מידע התמונה נכשל"
@@ -2328,7 +2327,7 @@ msgid "Only "
msgstr ""
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr ""
@@ -2784,25 +2783,25 @@ msgstr ""
msgid "Invalid tag: \"%s\""
msgstr "כתובת אתר הבית '%s' אינה חוקית"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "שמירת הפרופיל נכשלה."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "שמירת הפרופיל נכשלה."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
#, fuzzy
msgid "Couldn't save tags."
msgstr "שמירת הפרופיל נכשלה."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "ההגדרות נשמרו."
@@ -3164,7 +3163,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "כתובת הפרופיל שלך בשרות ביקרובלוג תואם אחר"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "הירשם כמנוי"
@@ -3205,7 +3204,7 @@ msgstr "לא ניתן להירשם ללא הסכמה לרשיון"
msgid "You already repeated that notice."
msgstr "כבר נכנסת למערכת!"
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "צור"
@@ -3891,17 +3890,27 @@ 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 "יצירת המנוי נכשלה."
-#: actions/subscribe.php:55
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
#, fuzzy
-msgid "Not a local user."
-msgstr "אין משתמש כזה."
+msgid "No such profile."
+msgstr "אין הודעה כזו."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
+
+#: actions/subscribe.php:145
#, fuzzy
msgid "Subscribed"
msgstr "הירשם כמנוי"
@@ -3962,7 +3971,7 @@ msgstr "אלה האנשים שלהודעות שלהם אתה מאזין."
msgid "These are the people whose notices %s listens to."
msgstr "אלה האנשים ש%s מאזין להודעות שלהם."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3972,17 +3981,17 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s"
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
#, fuzzy
msgid "Jabber"
msgstr "אין זיהוי Jabber כזה."
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "סמס"
@@ -4405,61 +4414,83 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:237
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:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "בעיה בשמירת ההודעה."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "מחיקת המנוי לא הצליחה."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:380
+#: classes/User_group.php:423
#, fuzzy
msgid "Could not create group."
msgstr "שמירת מידע התמונה נכשל"
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "יצירת המנוי נכשלה."
@@ -4671,28 +4702,40 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1139
+#: lib/action.php:1141
#, fuzzy
msgid "After"
msgstr "<< אחרי"
-#: lib/action.php:1147
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "לפני >>"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr ""
@@ -5003,83 +5046,93 @@ 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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "בטל מנוי"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:670
+#: lib/command.php:711
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:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "הרשמה מרוחקת"
-#: lib/command.php:692
+#: lib/command.php:733
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:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "לא שלחנו אלינו את הפרופיל הזה"
-#: lib/command.php:714
+#: lib/command.php:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5093,6 +5146,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5120,20 +5174,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "אין קוד אישור."
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -5558,7 +5612,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr ""
@@ -5683,52 +5737,52 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "לא"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "אין תוכן!"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "צור"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
#, fuzzy
msgid "Reply"
msgstr "הגב"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "הודעות"
@@ -5762,10 +5816,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 +6003,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"
@@ -6038,69 +6057,69 @@ msgstr "תמונה"
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "הגדרות הפרופיל"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
#, fuzzy
msgid "Message"
msgstr "הודעה חדשה"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "לפני מספר שניות"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "לפני כדקה"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "לפני כ-%d דקות"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "לפני כשעה"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "לפני כ-%d שעות"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "לפני כיום"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "לפני כ-%d ימים"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "לפני כחודש"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "לפני כ-%d חודשים"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "לפני כשנה"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index daecf17e8..7b6870afe 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:14:54+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:50:58+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -64,7 +64,7 @@ msgstr "Nowe registrowanja znjemóžnić."
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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"
@@ -165,8 +164,8 @@ msgstr ""
msgid "You and friends"
msgstr "Ty a přećeljo"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -187,12 +186,12 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API-metoda njenamakana."
@@ -489,7 +488,7 @@ msgstr "Njepłaćiwa wulkosć."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -628,7 +627,7 @@ msgstr "Njepodpěrany format."
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr ""
@@ -639,7 +638,7 @@ msgstr ""
msgid "%s timeline"
msgstr ""
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -655,12 +654,12 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -670,7 +669,7 @@ msgstr ""
msgid "Repeated to %s"
msgstr ""
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr ""
@@ -680,7 +679,7 @@ msgstr ""
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -742,7 +741,7 @@ msgid "Preview"
msgstr "Přehlad"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Zničić"
@@ -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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -951,7 +950,7 @@ msgstr "Tutu zdźělenku wušmórnyć"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -980,7 +979,7 @@ msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?"
msgid "Do not delete this notice"
msgstr "Tutu zdźělenku njewušmórnyć"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Tutu zdźělenku wušmórnyć"
@@ -1220,7 +1219,7 @@ msgstr "wopisanje je předołho (maks. %d znamješkow)."
msgid "Could not update group."
msgstr "Skupina njeje so dała aktualizować."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Aliasy njejsu so dali wutworić."
@@ -2220,7 +2219,7 @@ msgid "Only "
msgstr "Jenož "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Njeje podpěrany datowy format."
@@ -2652,23 +2651,23 @@ msgstr "Mjeno rěče je předołhe (maks. 50 znamješkow)."
msgid "Invalid tag: \"%s\""
msgstr ""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Nastajenja městna njedachu so składować."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr ""
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr ""
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Nastajenja składowane."
@@ -3022,7 +3021,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Abonować"
@@ -3058,7 +3057,7 @@ msgstr "Njemóžeš swójsku zdźělenku wospjetować."
msgid "You already repeated that notice."
msgstr "Sy tutu zdźělenku hižo wospjetował."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Wospjetowany"
@@ -3724,15 +3723,26 @@ 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 ""
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Njeje lokalny wužiwar."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Dataja njeeksistuje."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Njejsy tón profil abonował."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Abonowany"
@@ -3792,7 +3802,7 @@ msgstr ""
msgid "These are the people whose notices %s listens to."
msgstr ""
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3802,16 +3812,16 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4205,57 +4215,76 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:237
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:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:788
+#: classes/Notice.php:882
msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:848
+#: classes/Notice.php:1407
#, php-format
-msgid "DB error inserting reply: %s"
+msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/Notice.php:1235
-#, php-format
-msgid "RT @%1$s %2$s"
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+msgid "You have been banned from subscribing."
msgstr ""
-#: classes/User.php:385
+#: 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 lib/subs.php:69
+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 ""
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr ""
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr ""
@@ -4451,26 +4480,38 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr ""
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr ""
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr ""
@@ -4764,54 +4805,64 @@ 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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Wotskazany"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "Sy tutu wosobu abonował:"
@@ -4819,11 +4870,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:731
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:733
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 +4882,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:753
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:714
+#: lib/command.php:755
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 +4894,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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4857,6 +4908,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4884,19 +4936,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Žana konfiguraciska dataja namakana. "
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -5302,7 +5354,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "wot"
@@ -5422,48 +5474,48 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "S"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "J"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "W"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "Z"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr ""
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Wospjetowany wot"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Na tutu zdźělenku wotmołwić"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Wotmołwić"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Zdźělenka wospjetowana"
@@ -5495,10 +5547,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 +5723,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"
@@ -5753,67 +5773,67 @@ msgstr "Awatar wobdźěłać"
msgid "User actions"
msgstr "Wužiwarske akcije"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Profilowe nastajenja wobdźěłać"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Wobdźěłać"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Tutomu wužiwarja direktnu powěsć pósłać"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Powěsć"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "před něšto sekundami"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "před něhdźe jednej mjeńšinu"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "před %d mjeńšinami"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "před něhdźe jednej hodźinu"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "před něhdźe %d hodźinami"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "před něhdźe jednym dnjom"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "před něhdźe %d dnjemi"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "před něhdźe jednym měsacom"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "před něhdźe %d měsacami"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "před něhdźe jednym lětom"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 698f779dd..fa42bd3fe 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:14:57+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:01+0000\n"
"Language-Team: Interlingua\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -60,7 +60,7 @@ msgstr "Disactivar le creation de nove contos."
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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."
@@ -168,8 +167,8 @@ msgstr ""
msgid "You and friends"
msgstr "Tu e amicos"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualisationes de %1$s e su amicos in %2$s!"
@@ -190,12 +189,12 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Methodo API non trovate."
@@ -495,7 +494,7 @@ msgstr "Indicio invalide."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -643,7 +642,7 @@ msgstr "Formato non supportate."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favorites de %2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s actualisationes favoritisate per %2$s / %2$s."
@@ -654,7 +653,7 @@ msgstr "%1$s actualisationes favoritisate per %2$s / %2$s."
msgid "%s timeline"
msgstr "Chronologia de %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -671,12 +670,12 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
"Actualisationes de %1$s que responde al actualisationes de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Chronologia public de %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "Actualisationes de totes in %s!"
@@ -686,7 +685,7 @@ msgstr "Actualisationes de totes in %s!"
msgid "Repeated to %s"
msgstr "Repetite a %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Repetitiones de %s"
@@ -696,7 +695,7 @@ msgstr "Repetitiones de %s"
msgid "Notices tagged with %s"
msgstr "Notas con etiquetta %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualisationes con etiquetta %1$s in %2$s!"
@@ -758,7 +757,7 @@ msgid "Preview"
msgstr "Previsualisation"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Deler"
@@ -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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Il habeva un problema con tu indicio de session."
@@ -968,7 +967,7 @@ msgstr "Deler iste application"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -999,7 +998,7 @@ msgstr "Es tu secur de voler deler iste nota?"
msgid "Do not delete this notice"
msgstr "Non deler iste nota"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Deler iste nota"
@@ -1240,7 +1239,7 @@ msgstr "description es troppo longe (max %d chars)."
msgid "Could not update group."
msgstr "Non poteva actualisar gruppo."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Non poteva crear aliases."
@@ -2328,7 +2327,7 @@ msgid "Only "
msgstr "Solmente "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Formato de datos non supportate."
@@ -2770,23 +2769,23 @@ msgstr "Lingua es troppo longe (max 50 chars)."
msgid "Invalid tag: \"%s\""
msgstr "Etiquetta invalide: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Non poteva actualisar usator pro autosubscription."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Non poteva salveguardar le preferentias de loco."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Non poteva salveguardar profilo."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Non poteva salveguardar etiquettas."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Preferentias confirmate."
@@ -3181,7 +3180,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL de tu profilo in un altere servicio de microblogging compatibile"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Subscriber"
@@ -3219,7 +3218,7 @@ msgstr "Tu non pote repeter tu proprie nota."
msgid "You already repeated that notice."
msgstr "Tu ha ja repetite iste nota."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Repetite"
@@ -3930,15 +3929,26 @@ 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."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Le usator non es local."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "File non existe."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Tu non es subscribite a iste profilo."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Subscribite"
@@ -4002,7 +4012,7 @@ msgstr "Tu seque le notas de iste personas."
msgid "These are the people whose notices %s listens to."
msgstr "%s seque le notas de iste personas."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4018,16 +4028,16 @@ msgstr ""
"action.twittersettings%%), tu pote automaticamente subscriber te a personas "
"que tu ja seque la."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s non seque alcuno."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4453,22 +4463,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:222
msgid "Problem saving notice. Too long."
msgstr "Problema salveguardar nota. Troppo longe."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Problema salveguardar nota. Usator incognite."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
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:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4476,38 +4486,57 @@ msgstr ""
"Troppo de messages duplicate troppo rapidemente; face un pausa e publica de "
"novo post alcun minutas."
-#: classes/Notice.php:235
+#: classes/Notice.php:243
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:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problema salveguardar nota."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
msgid "Problem saving group inbox."
msgstr "Problema salveguardar le cassa de entrata del gruppo."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Error del base de datos durante le insertion del responsa: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Non poteva crear gruppo."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Non poteva configurar le membrato del gruppo."
@@ -4709,26 +4738,38 @@ 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:826
+#: lib/action.php:827
msgid "All "
msgstr "Totes "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "licentia."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Pagination"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "Post"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Ante"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "Tu non pote facer modificationes in iste sito."
@@ -5028,82 +5069,92 @@ 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
+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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Subscription a %s cancellate"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Tu non es subscribite a alcuno."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
msgid "No one is subscribed to you."
msgstr "Necuno es subscribite a te."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
msgid "You are not a member of any groups."
msgstr "Tu non es membro de alcun gruppo."
-#: lib/command.php:714
+#: lib/command.php:755
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:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5117,6 +5168,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5181,19 +5233,19 @@ msgstr ""
"tracks - non ancora implementate.\n"
"tracking - non ancora implementate.\n"
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Nulle file de configuration trovate. "
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Io cercava files de configuration in le sequente locos: "
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "Considera executar le installator pro reparar isto."
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Ir al installator."
@@ -5689,7 +5741,7 @@ msgstr ""
"altere usatores in conversation. Altere personas pote inviar te messages que "
"solmente tu pote leger."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "de"
@@ -5815,48 +5867,48 @@ msgstr ""
"Pardono, le obtention de tu geolocalisation prende plus tempore que "
"previste. Per favor reproba plus tarde."
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "N"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "S"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "E"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "W"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "a"
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "in contexto"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Repetite per"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Responder a iste nota"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Nota repetite"
@@ -5888,10 +5940,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 +6116,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"
@@ -6146,67 +6166,67 @@ msgstr "Modificar avatar"
msgid "User actions"
msgstr "Actiones de usator"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Modificar configuration de profilo"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Modificar"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Inviar un message directe a iste usator"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Message"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Moderar"
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "alcun secundas retro"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "circa un minuta retro"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minutas retro"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "circa un hora retro"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "circa %d horas retro"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "circa un die retro"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "circa %d dies retro"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "circa un mense retro"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "circa %d menses retro"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "circa un anno retro"
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index e88583025..08e4fec95 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:15:11+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:05+0000\n"
"Language-Team: Icelandic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -67,7 +67,7 @@ msgstr ""
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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."
@@ -169,8 +168,8 @@ msgstr ""
msgid "You and friends"
msgstr ""
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Færslur frá %1$s og vinum á %2$s!"
@@ -191,12 +190,12 @@ msgstr "Færslur frá %1$s og vinum á %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Aðferð í forritsskilum fannst ekki!"
@@ -506,7 +505,7 @@ msgstr "Ótæk stærð."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -650,7 +649,7 @@ msgstr "Skráarsnið myndar ekki stutt."
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Uppáhaldsbabl frá %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s."
@@ -661,7 +660,7 @@ msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s."
msgid "%s timeline"
msgstr "Rás %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -677,12 +676,12 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s færslur sem svara færslum frá %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Almenningsrás %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s færslur frá öllum!"
@@ -692,7 +691,7 @@ msgstr "%s færslur frá öllum!"
msgid "Repeated to %s"
msgstr "Svör við %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "Svör við %s"
@@ -702,7 +701,7 @@ msgstr "Svör við %s"
msgid "Notices tagged with %s"
msgstr "Babl merkt með %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
@@ -763,7 +762,7 @@ msgid "Preview"
msgstr "Forsýn"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Eyða"
@@ -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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Það komu upp vandamál varðandi setutókann þinn."
@@ -979,7 +978,7 @@ msgstr "Eyða þessu babli"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1008,7 +1007,7 @@ msgstr "Ertu viss um að þú viljir eyða þessu babli?"
msgid "Do not delete this notice"
msgstr ""
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Eyða þessu babli"
@@ -1267,7 +1266,7 @@ msgstr "Lýsing er of löng (í mesta lagi 140 tákn)."
msgid "Could not update group."
msgstr "Gat ekki uppfært hóp."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr ""
@@ -2348,7 +2347,7 @@ msgid "Only "
msgstr ""
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Enginn stuðningur við gagnasnið."
@@ -2810,24 +2809,24 @@ msgstr "Tungumál er of langt (í mesta lagi 50 stafir)."
msgid "Invalid tag: \"%s\""
msgstr "Ógilt merki: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Gat ekki uppfært notanda í sjálfvirka áskrift."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Gat ekki vistað merki."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Gat ekki vistað persónulega síðu."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Gat ekki vistað merki."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Stillingar vistaðar."
@@ -3206,7 +3205,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Veffang persónulegrar síðu á samvirkandi örbloggsþjónustu"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Gerast áskrifandi"
@@ -3251,7 +3250,7 @@ msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið."
msgid "You already repeated that notice."
msgstr "Þú hefur nú þegar lokað á þennan notanda."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "Í sviðsljósinu"
@@ -3939,15 +3938,26 @@ 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."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Ekki staðbundinn notandi."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Ekkert svoleiðis babl."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Þú ert ekki áskrifandi."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Þú ert nú í áskrift"
@@ -4007,7 +4017,7 @@ msgstr "Þetta er fólkið sem þú hlustar á bablið í."
msgid "These are the people whose notices %s listens to."
msgstr "Þetta er fólkið sem %s hlustar á bablið í."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4017,16 +4027,16 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber snarskilaboðaþjónusta"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4453,60 +4463,82 @@ 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:222
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Gat ekki vistað babl. Óþekktur notandi."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
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:237
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:243
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:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Vandamál komu upp við að vista babl."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Vandamál komu upp við að vista babl."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Gagnagrunnsvilla við innsetningu svars: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Gat ekki eytt áskrift."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Gat ekki búið til hóp."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Gat ekki skráð hópmeðlimi."
@@ -4712,26 +4744,38 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "Allt "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "leyfi."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Uppröðun"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "Eftir"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Áður"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
#, fuzzy
msgid "You cannot make changes to this site."
@@ -5044,83 +5088,92 @@ 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
+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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Nú ert þú ekki lengur áskrifandi að %s"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Þú ert ekki áskrifandi."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
#, 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:733
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:753
#, 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:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5134,6 +5187,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5161,20 +5215,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "Enginn staðfestingarlykill."
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
#, fuzzy
msgid "Go to the installer."
msgstr "Skrá þig inn á síðuna"
@@ -5596,7 +5650,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr "frá"
@@ -5720,50 +5774,50 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "Nei"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr ""
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Í sviðsljósinu"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Svara þessu babli"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Svara"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Babl sent inn"
@@ -5797,11 +5851,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 +6035,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"
@@ -6068,67 +6087,67 @@ msgstr ""
msgid "User actions"
msgstr "Notandaaðgerðir"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr ""
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Senda bein skilaboð til þessa notanda"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Skilaboð"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "fyrir nokkrum sekúndum"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "fyrir um einni mínútu síðan"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "fyrir um %d mínútum síðan"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "fyrir um einum klukkutíma síðan"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "fyrir um %d klukkutímum síðan"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "fyrir um einum degi síðan"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "fyrir um %d dögum síðan"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "fyrir um einum mánuði síðan"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "fyrir um %d mánuðum síðan"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "fyrir um einu ári síðan"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 37ac228b2..7e3d7998a 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:15:14+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:09+0000\n"
"Language-Team: Italian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -63,7 +63,7 @@ msgstr "Disabilita la creazione di nuovi account"
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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."
@@ -172,8 +171,8 @@ msgstr ""
msgid "You and friends"
msgstr "Tu e i tuoi amici"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Messaggi da %1$s e amici su %2$s!"
@@ -194,12 +193,12 @@ msgstr "Messaggi da %1$s e amici su %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Metodo delle API non trovato."
@@ -501,7 +500,7 @@ msgstr "Token non valido."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -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
@@ -645,7 +644,7 @@ msgstr "Formato non supportato."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Preferiti da %2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s aggiornamenti preferiti da %2$s / %3$s"
@@ -656,7 +655,7 @@ msgstr "%1$s aggiornamenti preferiti da %2$s / %3$s"
msgid "%s timeline"
msgstr "Attività di %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -672,12 +671,12 @@ msgstr "%1$s / Messaggi che citano %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s messaggi in risposta a quelli da %2$s / %3$s"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Attività pubblica di %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "Aggiornamenti di %s da tutti!"
@@ -687,7 +686,7 @@ msgstr "Aggiornamenti di %s da tutti!"
msgid "Repeated to %s"
msgstr "Ripetuto a %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Ripetizioni di %s"
@@ -697,7 +696,7 @@ msgstr "Ripetizioni di %s"
msgid "Notices tagged with %s"
msgstr "Messaggi etichettati con %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Messaggi etichettati con %1$s su %2$s!"
@@ -759,7 +758,7 @@ msgid "Preview"
msgstr "Anteprima"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Elimina"
@@ -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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Si è verificato un problema con il tuo token di sessione."
@@ -968,7 +967,7 @@ msgstr "Elimina l'applicazione"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -999,7 +998,7 @@ msgstr "Vuoi eliminare questo messaggio?"
msgid "Do not delete this notice"
msgstr "Non eliminare il messaggio"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Elimina questo messaggio"
@@ -1240,7 +1239,7 @@ msgstr "La descrizione è troppo lunga (max %d caratteri)."
msgid "Could not update group."
msgstr "Impossibile aggiornare il gruppo."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Impossibile creare gli alias."
@@ -2326,7 +2325,7 @@ msgid "Only "
msgstr "Solo "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Non è un formato di dati supportato."
@@ -2770,23 +2769,23 @@ msgstr "La lingua è troppo lunga (max 50 caratteri)."
msgid "Invalid tag: \"%s\""
msgstr "Etichetta non valida: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Impossibile aggiornare l'utente per auto-abbonarsi."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Impossibile salvare le preferenze della posizione."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Impossibile salvare il profilo."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Impossibile salvare le etichette."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Impostazioni salvate."
@@ -3181,7 +3180,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL del tuo profilo su un altro servizio di microblog compatibile"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Abbonati"
@@ -3219,7 +3218,7 @@ msgstr "Non puoi ripetere i tuoi stessi messaggi."
msgid "You already repeated that notice."
msgstr "Hai già ripetuto quel messaggio."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Ripetuti"
@@ -3928,15 +3927,26 @@ 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."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Non un utente locale."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Nessun file."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Non hai una abbonamento a quel profilo."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Abbonati"
@@ -4000,7 +4010,7 @@ msgstr "Queste sono le persone che stai seguendo."
msgid "These are the people whose notices %s listens to."
msgstr "Queste sono le persone seguite da %s."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4015,16 +4025,16 @@ msgstr ""
"[usi Twitter](%%action.twittersettings%%), puoi abbonarti automaticamente "
"alle persone che già seguivi lì."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s non sta seguendo nessuno."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4453,22 +4463,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:222
msgid "Problem saving notice. Too long."
msgstr "Problema nel salvare il messaggio. Troppo lungo."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Problema nel salvare il messaggio. Utente sconosciuto."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
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:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4476,38 +4486,57 @@ msgstr ""
"Troppi messaggi duplicati troppo velocemente; fai una pausa e scrivi di "
"nuovo tra qualche minuto."
-#: classes/Notice.php:235
+#: classes/Notice.php:243
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:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problema nel salvare il messaggio."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
msgid "Problem saving group inbox."
msgstr "Problema nel salvare la casella della posta del gruppo."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Errore del DB nell'inserire la risposta: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Impossibile creare il gruppo."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Impossibile impostare la membership al gruppo."
@@ -4711,26 +4740,38 @@ msgstr ""
"I contenuti e i dati sono forniti dai collaboratori. Tutti i diritti "
"riservati."
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "Tutti "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "licenza."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginazione"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "Successivi"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Precedenti"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "Non puoi apportare modifiche al sito."
@@ -5029,82 +5070,92 @@ 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
+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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Abbonamento a %s annullato"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Il tuo abbonamento è stato annullato."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
msgid "No one is subscribed to you."
msgstr "Nessuno è abbonato ai tuoi messaggi."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
msgid "You are not a member of any groups."
msgstr "Non fai parte di alcun gruppo."
-#: lib/command.php:714
+#: lib/command.php:755
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:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5118,6 +5169,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5184,21 +5236,21 @@ msgstr ""
"tracks - non ancora implementato\n"
"tracking - non ancora implementato\n"
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Non è stato trovato alcun file di configurazione. "
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "I file di configurazione sono stati cercati in questi posti: "
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
"Potrebbe essere necessario lanciare il programma d'installazione per "
"correggere il problema."
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Vai al programma d'installazione."
@@ -5693,7 +5745,7 @@ msgstr ""
"iniziare una conversazione con altri utenti. Altre persone possono mandare "
"messaggi riservati solamente a te."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "via"
@@ -5818,48 +5870,48 @@ msgstr ""
"Il recupero della tua posizione geografica sta impiegando più tempo del "
"previsto. Riprova più tardi."
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "N"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "S"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "E"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "O"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "presso"
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "in una discussione"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Ripetuto da"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Rispondi a questo messaggio"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Rispondi"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Messaggio ripetuto"
@@ -5891,10 +5943,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 +6119,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"
@@ -6149,67 +6169,67 @@ msgstr "Modifica immagine"
msgid "User actions"
msgstr "Azioni utente"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Modifica impostazioni del profilo"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Modifica"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Invia un messaggio diretto a questo utente"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Messaggio"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Modera"
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "pochi secondi fa"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "circa un minuto fa"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "circa %d minuti fa"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "circa un'ora fa"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "circa %d ore fa"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "circa un giorno fa"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "circa %d giorni fa"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "circa un mese fa"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "circa %d mesi fa"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "circa un anno fa"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 3063f9538..e05ddbd15 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:15:17+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:12+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -63,7 +63,7 @@ msgstr "新規登録を無効。"
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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 "そのようなユーザはいません。"
@@ -169,8 +168,8 @@ msgstr ""
msgid "You and friends"
msgstr "あなたと友人"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "%2$s に %1$s と友人からの更新があります!"
@@ -191,12 +190,12 @@ msgstr "%2$s に %1$s と友人からの更新があります!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API メソッドが見つかりません。"
@@ -499,7 +498,7 @@ msgstr "不正なトークン。"
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -638,7 +637,7 @@ msgstr "サポート外の形式です。"
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / %2$s からのお気に入り"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s は %2$s でお気に入りを更新しました / %2$s。"
@@ -649,7 +648,7 @@ msgstr "%1$s は %2$s でお気に入りを更新しました / %2$s。"
msgid "%s timeline"
msgstr "%s のタイムライン"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -665,12 +664,12 @@ msgstr "%1$s / %2$s について更新"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%2$s からアップデートに答える %1$s アップデート"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s のパブリックタイムライン"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "皆からの %s アップデート!"
@@ -680,7 +679,7 @@ msgstr "皆からの %s アップデート!"
msgid "Repeated to %s"
msgstr "%s への返信"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "%s の返信"
@@ -690,7 +689,7 @@ msgstr "%s の返信"
msgid "Notices tagged with %s"
msgstr "%s とタグ付けされたつぶやき"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$s に %1$s による更新があります!"
@@ -751,7 +750,7 @@ msgid "Preview"
msgstr "プレビュー"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "あなたのセッショントークンに関する問題がありました。"
@@ -962,7 +961,7 @@ msgstr "このアプリケーションを削除"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -993,7 +992,7 @@ msgstr "本当にこのつぶやきを削除しますか?"
msgid "Do not delete this notice"
msgstr "このつぶやきを削除できません。"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "このつぶやきを削除"
@@ -1234,7 +1233,7 @@ msgstr "記述が長すぎます。(最長 %d 字)"
msgid "Could not update group."
msgstr "グループを更新できません。"
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "別名を作成できません。"
@@ -2317,7 +2316,7 @@ msgid "Only "
msgstr "だけ "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "サポートされていないデータ形式。"
@@ -2758,23 +2757,23 @@ msgstr "言語が長すぎます。(最大50字)"
msgid "Invalid tag: \"%s\""
msgstr "不正なタグ: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "自動フォローのためのユーザを更新できませんでした。"
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "場所情報を保存できません。"
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "プロファイルを保存できません"
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "タグを保存できません。"
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "設定が保存されました。"
@@ -3167,7 +3166,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "フォロー"
@@ -3206,7 +3205,7 @@ msgstr "自分のつぶやきは繰り返せません。"
msgid "You already repeated that notice."
msgstr "すでにそのつぶやきを繰り返しています。"
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "繰り返された"
@@ -3921,15 +3920,26 @@ 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 "フォローを保存できません。"
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "ローカルユーザではありません。"
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "そのようなファイルはありません。"
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "あなたはそのプロファイルにフォローされていません。"
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "フォローしている"
@@ -3993,7 +4003,7 @@ msgstr "あなたがつぶやきを聞いている人"
msgid "These are the people whose notices %s listens to."
msgstr "%s がつぶやきを聞いている人"
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4009,16 +4019,16 @@ msgstr ""
"twittersettings%%)であれば、あなたは自動的に既にフォローしている人々をフォ"
"ローできます。"
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s はだれも言うことを聞いていません。"
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4435,21 +4445,21 @@ msgstr "新しいURIでメッセージをアップデートできませんでし
msgid "DB error inserting hashtag: %s"
msgstr "ハッシュタグ追加 DB エラー: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "つぶやきを保存する際に問題が発生しました。長すぎです。"
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "つぶやきを保存する際に問題が発生しました。不明なユーザです。"
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"多すぎるつぶやきが速すぎます; 数分間の休みを取ってから再投稿してください。"
-#: classes/Notice.php:229
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4457,38 +4467,57 @@ msgstr ""
"多すぎる重複メッセージが速すぎます; 数分間休みを取ってから再度投稿してくださ"
"い。"
-#: classes/Notice.php:235
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "あなたはこのサイトでつぶやきを投稿するのが禁止されています。"
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "つぶやきを保存する際に問題が発生しました。"
-#: classes/Notice.php:788
+#: classes/Notice.php:882
msgid "Problem saving group inbox."
msgstr "グループ受信箱を保存する際に問題が発生しました。"
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "返信を追加する際にデータベースエラー : %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "フォローを削除できません"
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "ようこそ %1$s、@%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "グループを作成できません。"
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "グループメンバーシップをセットできません。"
@@ -4689,26 +4718,38 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "全て "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "ライセンス。"
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "ページ化"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "<<後"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "前>>"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "あなたはこのサイトへの変更を行うことができません。"
@@ -5006,77 +5047,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 "%s をフォローしました"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "%s のフォローをやめる"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "あなたはだれにもフォローされていません。"
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "あなたはこの人にフォローされています:"
-#: lib/command.php:690
+#: lib/command.php:731
msgid "No one is subscribed to you."
msgstr "誰もフォローしていません。"
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "この人はあなたにフォローされている:"
-#: lib/command.php:712
+#: lib/command.php:753
msgid "You are not a member of any groups."
msgstr "あなたはどのグループのメンバーでもありません。"
-#: lib/command.php:714
+#: lib/command.php:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5090,6 +5141,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5117,21 +5169,21 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "コンフィギュレーションファイルがありません。 "
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "私は以下の場所でコンフィギュレーションファイルを探しました: "
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
"あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ"
"ん。"
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "インストーラへ。"
@@ -5624,7 +5676,7 @@ msgstr ""
"に引き込むプライベートメッセージを送ることができます。人々はあなただけへの"
"メッセージを送ることができます。"
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "from"
@@ -5752,52 +5804,52 @@ msgstr ""
"すみません、あなたの位置を検索するのが予想より長くかかっています、後でもう一"
"度試みてください"
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "北"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "S"
msgstr "南"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
#, fuzzy
msgid "E"
msgstr "東"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
#, fuzzy
msgid "W"
msgstr "西"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "at"
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr ""
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr ""
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "このつぶやきへ返信"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "返信"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "つぶやきを繰り返しました"
@@ -5829,10 +5881,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 +6057,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"
@@ -6087,68 +6107,68 @@ msgstr "アバターを編集する"
msgid "User actions"
msgstr "利用者アクション"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "プロファイル設定編集"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "編集"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "この利用者にダイレクトメッセージを送る"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "メッセージ"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
#, fuzzy
msgid "Moderate"
msgstr "管理"
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "数秒前"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "約 1 分前"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "約 %d 分前"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "約 1 時間前"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "約 %d 時間前"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "約 1 日前"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "約 %d 日前"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "約 1 ヵ月前"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "約 %d ヵ月前"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "約 1 年前"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 7be2acfca..1653bf31b 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:15:20+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:15+0000\n"
"Language-Team: Korean\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -65,7 +65,7 @@ msgstr ""
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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 "그러한 사용자는 없습니다."
@@ -168,8 +167,8 @@ msgstr ""
msgid "You and friends"
msgstr "%s 및 친구들"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "%1$s 및 %2$s에 있는 친구들의 업데이트!"
@@ -190,12 +189,12 @@ msgstr "%1$s 및 %2$s에 있는 친구들의 업데이트!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "API 메서드를 찾을 수 없습니다."
@@ -509,7 +508,7 @@ msgstr "옳지 않은 크기"
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -654,7 +653,7 @@ msgstr "지원하지 않는 그림 파일 형식입니다."
msgid "%1$s / Favorites from %2$s"
msgstr "%s / %s의 좋아하는 글들"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s 좋아하는 글이 업데이트 됐습니다. %S에 의해 / %s."
@@ -665,7 +664,7 @@ msgstr "%s 좋아하는 글이 업데이트 됐습니다. %S에 의해 / %s."
msgid "%s timeline"
msgstr "%s 타임라인"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -681,12 +680,12 @@ msgstr "%1$s / %2$s에게 답신 업데이트"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s 공개 타임라인"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "모두로부터의 업데이트 %s개!"
@@ -696,7 +695,7 @@ msgstr "모두로부터의 업데이트 %s개!"
msgid "Repeated to %s"
msgstr "%s에 답신"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "%s에 답신"
@@ -706,7 +705,7 @@ msgstr "%s에 답신"
msgid "Notices tagged with %s"
msgstr "%s 태그된 통지"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$s에 있는 %1$s의 업데이트!"
@@ -768,7 +767,7 @@ msgid "Preview"
msgstr "미리보기"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "당신의 세션토큰관련 문제가 있습니다."
@@ -986,7 +985,7 @@ msgstr "이 게시글 삭제하기"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1018,7 +1017,7 @@ msgstr "정말로 통지를 삭제하시겠습니까?"
msgid "Do not delete this notice"
msgstr "이 통지를 지울 수 없습니다."
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "이 게시글 삭제하기"
@@ -1281,7 +1280,7 @@ msgstr "설명이 너무 길어요. (최대 140글자)"
msgid "Could not update group."
msgstr "그룹을 업데이트 할 수 없습니다."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "좋아하는 게시글을 생성할 수 없습니다."
@@ -2366,7 +2365,7 @@ msgid "Only "
msgstr ""
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "지원하는 형식의 데이터가 아닙니다."
@@ -2822,24 +2821,24 @@ msgstr "언어가 너무 깁니다. (최대 50글자)"
msgid "Invalid tag: \"%s\""
msgstr "유효하지 않은태그: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "자동구독에 사용자를 업데이트 할 수 없습니다."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "태그를 저장할 수 없습니다."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "프로필을 저장 할 수 없습니다."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "태그를 저장할 수 없습니다."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "설정 저장"
@@ -3222,7 +3221,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "다른 마이크로블로깅 서비스의 귀하의 프로필 URL"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "구독"
@@ -3265,7 +3264,7 @@ msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다."
msgid "You already repeated that notice."
msgstr "당신은 이미 이 사용자를 차단하고 있습니다."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "생성"
@@ -3963,15 +3962,26 @@ 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 "구독을 저장할 수 없습니다."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "로컬 사용자 아닙니다."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "그러한 통지는 없습니다."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "당신은 이 프로필에 구독되지 않고있습니다."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "구독하였습니다."
@@ -4031,7 +4041,7 @@ msgstr "귀하의 통지를 받고 있는 사람"
msgid "These are the people whose notices %s listens to."
msgstr "%s님이 받고 있는 통지의 사람"
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4041,16 +4051,16 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1$s 는 지금 듣고 있습니다."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4474,23 +4484,23 @@ msgstr "새 URI와 함께 메시지를 업데이트할 수 없습니다."
msgid "DB error inserting hashtag: %s"
msgstr "해쉬테그를 추가 할 때에 데이타베이스 에러 : %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "통지를 저장하는데 문제가 발생했습니다."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "게시글 저장문제. 알려지지않은 회원"
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 "
"해보세요."
-#: classes/Notice.php:229
+#: classes/Notice.php:237
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4499,39 +4509,61 @@ msgstr ""
"너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 "
"해보세요."
-#: classes/Notice.php:235
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "이 사이트에 게시글 포스팅으로부터 당신은 금지되었습니다."
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "통지를 저장하는데 문제가 발생했습니다."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "통지를 저장하는데 문제가 발생했습니다."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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까지 메시지"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "새 그룹을 만들 수 없습니다."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "그룹 맴버십을 세팅할 수 없습니다."
@@ -4737,26 +4769,38 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "모든 것"
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "라이선스"
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "페이지수"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "뒷 페이지"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "앞 페이지"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
#, fuzzy
msgid "You cannot make changes to this site."
@@ -5071,80 +5115,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
+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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "%s에서 구독을 해제했습니다."
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "당신은 이 프로필에 구독되지 않고있습니다."
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다."
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "다른 사람을 구독 하실 수 없습니다."
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "다른 사람을 구독 하실 수 없습니다."
-#: lib/command.php:712
+#: lib/command.php:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "당신은 해당 그룹의 멤버가 아닙니다."
-#: lib/command.php:714
+#: lib/command.php:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5158,6 +5211,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5185,20 +5239,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "확인 코드가 없습니다."
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
#, fuzzy
msgid "Go to the installer."
msgstr "이 사이트 로그인"
@@ -5619,7 +5673,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr "다음에서:"
@@ -5743,51 +5797,51 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "아니오"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "내용이 없습니다!"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "생성"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "이 게시글에 대해 답장하기"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "답장하기"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "게시글이 등록되었습니다."
@@ -5821,11 +5875,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 +6062,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"
@@ -6096,68 +6115,68 @@ msgstr "아바타"
msgid "User actions"
msgstr "사용자 동작"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "프로필 세팅"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "이 회원에게 직접 메시지를 보냅니다."
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "메시지"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "몇 초 전"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "1분 전"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "%d분 전"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "1시간 전"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "%d시간 전"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "하루 전"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "%d일 전"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "1달 전"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "%d달 전"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "1년 전"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 92209e72e..14efaf620 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:15:23+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:18+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -63,7 +63,7 @@ msgstr "Оневозможи нови регистрации."
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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 "Нема таков корисник."
@@ -172,8 +171,8 @@ msgstr ""
msgid "You and friends"
msgstr "Вие и пријателите"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Подновувања од %1$s и пријатели на %2$s!"
@@ -194,12 +193,12 @@ msgstr "Подновувања од %1$s и пријатели на %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API методот не е пронајден."
@@ -502,7 +501,7 @@ msgstr "Погрешен жетон."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -646,7 +645,7 @@ msgstr "Неподдржан формат."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Омилени од %2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "Подновувања на %1$s омилени на %2$s / %2$s."
@@ -657,7 +656,7 @@ msgstr "Подновувања на %1$s омилени на %2$s / %2$s."
msgid "%s timeline"
msgstr "Историја на %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -673,12 +672,12 @@ msgstr "%1$s / Подновувања кои споменуваат %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s подновувања коишто се одговор на подновувањата од %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Јавна историја на %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s подновуввања од сите!"
@@ -688,7 +687,7 @@ msgstr "%s подновуввања од сите!"
msgid "Repeated to %s"
msgstr "Повторено за %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Повторувања на %s"
@@ -698,7 +697,7 @@ msgstr "Повторувања на %s"
msgid "Notices tagged with %s"
msgstr "Забелешки означени со %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Подновувањата се означени со %1$s на %2$s!"
@@ -761,7 +760,7 @@ msgid "Preview"
msgstr "Преглед"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Се појави проблем со Вашиот сесиски жетон."
@@ -972,7 +971,7 @@ msgstr "Избриши го програмов"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1003,7 +1002,7 @@ msgstr "Дали сте сигурни дека сакате да ја избр
msgid "Do not delete this notice"
msgstr "Не ја бриши оваа забелешка"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Бриши ја оваа забелешка"
@@ -1244,7 +1243,7 @@ msgstr "описот е предолг (максимум %d знаци)"
msgid "Could not update group."
msgstr "Не можев да ја подновам групата."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Не можеше да се создадат алијаси."
@@ -2336,7 +2335,7 @@ msgid "Only "
msgstr "Само "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Ова не е поддржан формат на податотека."
@@ -2781,23 +2780,23 @@ msgstr "Јазикот е предлог (највеќе до 50 знаци)."
msgid "Invalid tag: \"%s\""
msgstr "Неважечка ознака: „%s“"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Не можев да го подновам корисникот за автопретплата."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Не можев да ги зачувам нагодувањата за локација"
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Не можам да го зачувам профилот."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Не можев да ги зачувам ознаките."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Нагодувањата се зачувани"
@@ -3196,7 +3195,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL на Вашиот профил на друга компатибилна служба за микроблогирање."
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Претплати се"
@@ -3234,7 +3233,7 @@ msgstr "Не можете да повторувате сопствена заб
msgid "You already repeated that notice."
msgstr "Веќе ја имате повторено таа забелешка."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Повторено"
@@ -3951,15 +3950,26 @@ 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 "Не можев да ја зачувам претплатата."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Не е локален корисник."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Нема таква податотека."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Не сте претплатени на тој профил."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Претплатено"
@@ -4023,7 +4033,7 @@ msgstr "Ова се луѓето чии забелешки ги следите."
msgid "These are the people whose notices %s listens to."
msgstr "Ова се луѓето чии забелешки ги следи %s."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4038,16 +4048,16 @@ msgstr ""
"(%%action.featured%%). Ако сте [корисник на Twitter](%%action.twittersettings"
"%%), тука можете автоматски да се претплатите на луѓе кои таму ги следите."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s не следи никого."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "СМС"
@@ -4475,22 +4485,22 @@ msgstr "Не можев да ја подновам пораката со нов
msgid "DB error inserting hashtag: %s"
msgstr "Грешка во базата на податоци при вметнувањето на хеш-ознака: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "Проблем со зачувувањето на белешката. Премногу долго."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Проблем со зачувувањето на белешката. Непознат корисник."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Премногу забелњшки за прекратко време; здивнете малку и продолжете за "
"неколку минути."
-#: classes/Notice.php:229
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4498,38 +4508,58 @@ msgstr ""
"Премногу дуплирани пораки во прекратко време; здивнете малку и продолжете за "
"неколку минути."
-#: classes/Notice.php:235
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Забрането Ви е да објавувате забелешки на оваа веб-страница."
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Проблем во зачувувањето на белешката."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
msgid "Problem saving group inbox."
msgstr "Проблем при зачувувањето на групното приемно сандаче."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Одговор од внесот во базата: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Претплата не може да се избрише."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добредојдовте на %1$s, @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Не можев да ја создадам групата."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Не можев да назначам членство во групата."
@@ -4734,26 +4764,38 @@ msgstr ""
"Авторските права на содржината и податоците им припаѓаат на учесниците. Сите "
"права задржани."
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "Сите "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "лиценца."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Прелом на страници"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "По"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Пред"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "Не можете да ја менувате оваа веб-страница."
@@ -5053,80 +5095,90 @@ 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 "Претплатено на %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Претплатата на %s е откажана"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Не сте претплатени никому."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
msgid "No one is subscribed to you."
msgstr "Никој не е претплатен на Вас."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
msgid "You are not a member of any groups."
msgstr "Не членувате во ниедна група."
-#: lib/command.php:714
+#: lib/command.php:755
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:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5140,6 +5192,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5204,19 +5257,19 @@ msgstr ""
"tracks - сè уште не е имплементирано.\n"
"tracking - сè уште не е имплементирано.\n"
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Нема пронајдено конфигурациска податотека. "
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Побарав конфигурациони податотеки на следниве места: "
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "Препорачуваме да го пуштите инсталатерот за да го поправите ова."
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Оди на инсталаторот."
@@ -5714,7 +5767,7 @@ msgstr ""
"впуштите во разговор со други корисници. Луѓето можат да ви испраќаат пораки "
"што ќе можете да ги видите само Вие."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "од"
@@ -5842,48 +5895,48 @@ msgstr ""
"Жалиме, но добивањето на Вашата местоположба трае подолго од очекуваното. "
"Обидете се подоцна."
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "С"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "Ј"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "И"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "З"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "во"
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "во контекст"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Повторено од"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Одговори на забелешкава"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Одговор"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Забелешката е повторена"
@@ -5915,10 +5968,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 +6144,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"
@@ -6174,67 +6194,67 @@ msgstr "Уреди аватар"
msgid "User actions"
msgstr "Кориснички дејства"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Уреди нагодувања на профилот"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Уреди"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Испрати му директна порака на корисников"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Порака"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Модерирај"
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "пред неколку секунди"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "пред една минута"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "пред %d минути"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "пред еден час"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "пред %d часа"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "пред еден ден"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "пред %d денови"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "пред еден месец"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "пред %d месеца"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "пред една година"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index ab74ad1dc..cf3daf093 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:15:26+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:22+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 (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -60,7 +60,7 @@ msgstr "Deaktiver nye registreringer."
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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"
@@ -167,8 +166,8 @@ msgstr ""
msgid "You and friends"
msgstr "Du og venner"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Oppdateringer fra %1$s og venner på %2$s!"
@@ -189,12 +188,12 @@ msgstr "Oppdateringer fra %1$s og venner på %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "API-metode ikke funnet!"
@@ -497,7 +496,7 @@ msgstr "Ugyldig størrelse"
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -627,14 +626,14 @@ msgstr ""
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
msgid "Unsupported format."
-msgstr ""
+msgstr "Formatet støttes ikke."
#: actions/apitimelinefavorites.php:108
#, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoritter fra %2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s oppdateringer markert som favoritt av %2$s / %2$s."
@@ -645,7 +644,7 @@ msgstr "%1$s oppdateringer markert som favoritt av %2$s / %2$s."
msgid "%s timeline"
msgstr "%s tidslinje"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -661,12 +660,12 @@ msgstr "%1$s / Oppdateringer som nevner %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s offentlig tidslinje"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s oppdateringer fra alle sammen!"
@@ -676,17 +675,17 @@ msgstr "%s oppdateringer fra alle sammen!"
msgid "Repeated to %s"
msgstr "Gjentatt til %s"
-#: actions/apitimelineretweetsofme.php:112
-#, fuzzy, php-format
+#: actions/apitimelineretweetsofme.php:114
+#, php-format
msgid "Repeats of %s"
-msgstr "Svar til %s"
+msgstr "Repetisjoner av %s"
#: actions/apitimelinetag.php:102 actions/tag.php:66
#, php-format
msgid "Notices tagged with %s"
msgstr "Notiser merket med %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Oppdateringer merket med %1$s på %2$s!"
@@ -733,9 +732,8 @@ msgstr ""
#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
#: actions/grouplogo.php:251
-#, fuzzy
msgid "Avatar settings"
-msgstr "Innstillinger for IM"
+msgstr "Avatarinnstillinger"
#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
#: actions/grouplogo.php:199 actions/grouplogo.php:259
@@ -748,7 +746,7 @@ msgid "Preview"
msgstr "Forhåndsvis"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Slett"
@@ -774,12 +772,11 @@ msgstr "Brukerbildet har blitt oppdatert."
#: actions/avatarsettings.php:369
msgid "Failed updating avatar."
-msgstr ""
+msgstr "Oppdatering av avatar mislyktes."
#: actions/avatarsettings.php:393
-#, fuzzy
msgid "Avatar deleted."
-msgstr "Brukerbildet har blitt oppdatert."
+msgstr "Avatar slettet."
#: actions/block.php:69
msgid "You already blocked that user."
@@ -858,11 +855,11 @@ msgstr ""
#: actions/bookmarklet.php:50
msgid "Post to "
-msgstr ""
+msgstr "Post til "
#: actions/confirmaddress.php:75
msgid "No confirmation code."
-msgstr ""
+msgstr "Ingen bekreftelseskode."
#: actions/confirmaddress.php:80
msgid "Confirmation code not found."
@@ -879,7 +876,7 @@ msgstr ""
#: actions/confirmaddress.php:94
msgid "That address has already been confirmed."
-msgstr ""
+msgstr "Den adressen har allerede blitt bekreftet."
#: actions/confirmaddress.php:114 actions/emailsettings.php:296
#: actions/emailsettings.php:427 actions/imsettings.php:258
@@ -892,7 +889,7 @@ msgstr "Klarte ikke å oppdatere bruker."
#: actions/confirmaddress.php:126 actions/emailsettings.php:391
#: actions/imsettings.php:363 actions/smssettings.php:382
msgid "Couldn't delete email confirmation."
-msgstr ""
+msgstr "Kunne ikke slette e-postbekreftelse."
#: actions/confirmaddress.php:144
msgid "Confirm address"
@@ -901,7 +898,7 @@ msgstr "Bekreft adresse"
#: actions/confirmaddress.php:159
#, php-format
msgid "The address \"%s\" has been confirmed for your account."
-msgstr ""
+msgstr "Adressen «%s» har blitt bekreftet for din konto."
#: actions/conversation.php:99
msgid "Conversation"
@@ -913,31 +910,27 @@ msgid "Notices"
msgstr ""
#: actions/deleteapplication.php:63
-#, fuzzy
msgid "You must be logged in to delete an application."
-msgstr "Gjør brukeren til en administrator for gruppen"
+msgstr "Du må være innlogget for å slette et program."
#: actions/deleteapplication.php:71
-#, fuzzy
msgid "Application not found."
-msgstr "Fant ikke bekreftelseskode."
+msgstr "Program ikke funnet."
#: actions/deleteapplication.php:78 actions/editapplication.php:77
#: actions/showapplication.php:94
-#, fuzzy
msgid "You are not the owner of this application."
-msgstr "Du er allerede logget inn!"
+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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
msgid "Delete application"
-msgstr "Ingen slik side"
+msgstr "Slett program"
#: actions/deleteapplication.php:149
msgid ""
@@ -945,21 +938,22 @@ msgid ""
"about the application from the database, including all existing user "
"connections."
msgstr ""
+"Er du sikker på at du vil slette dette programmet? Dette vil slette alle "
+"data om programmet fra databasen, inkludert alle eksisterende "
+"brukertilkoblinger."
#: actions/deleteapplication.php:156
-#, fuzzy
msgid "Do not delete this application"
-msgstr "Kan ikke slette notisen."
+msgstr "Ikke slett dette programmet"
#: actions/deleteapplication.php:160
-#, fuzzy
msgid "Delete this application"
-msgstr "Beskriv degselv og dine interesser med 140 tegn"
+msgstr "Slett dette programmet"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -975,6 +969,8 @@ msgid ""
"You are about to permanently delete a notice. Once this is done, it cannot "
"be undone."
msgstr ""
+"Du er i ferd med å slette en notis permanent. Når dette er gjort kan det "
+"ikke gjøres om."
#: actions/deletenotice.php:109 actions/deletenotice.php:141
msgid "Delete notice"
@@ -988,7 +984,7 @@ msgstr "Er du sikker på at du vil slette denne notisen?"
msgid "Do not delete this notice"
msgstr "Ikke slett denne notisen"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Slett denne notisen"
@@ -1009,6 +1005,8 @@ msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
msgstr ""
+"Er du sikker på at du vil slette denne brukeren? Dette vil slette alle data "
+"om brukeren fra databasen, uten sikkerhetskopi."
#: actions/deleteuser.php:148 lib/deleteuserform.php:77
msgid "Delete this user"
@@ -1024,9 +1022,8 @@ msgid "Design settings for this StatusNet site."
msgstr ""
#: actions/designadminpanel.php:275
-#, fuzzy
msgid "Invalid logo URL."
-msgstr "Ugyldig størrelse"
+msgstr "Ugyldig logo-URL."
#: actions/designadminpanel.php:279
#, php-format
@@ -1126,7 +1123,7 @@ msgstr ""
#: actions/disfavor.php:81
msgid "This notice is not a favorite!"
-msgstr ""
+msgstr "Denne notisen er ikke en favoritt!"
#: actions/disfavor.php:94
msgid "Add to favorites"
@@ -1135,27 +1132,24 @@ msgstr "Legg til i favoritter"
#: actions/doc.php:158
#, php-format
msgid "No such document \"%s\""
-msgstr ""
+msgstr "Inget slikt dokument «%s»"
#: actions/editapplication.php:54
-#, fuzzy
msgid "Edit Application"
-msgstr "Ingen slik side"
+msgstr "Rediger program"
#: actions/editapplication.php:66
-#, fuzzy
msgid "You must be logged in to edit an application."
-msgstr "Gjør brukeren til en administrator for gruppen"
+msgstr "Du må være innlogget for å redigere et program."
#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
#: actions/showapplication.php:87
-#, fuzzy
msgid "No such application."
-msgstr "Ingen slik side"
+msgstr "Inget slikt program."
#: actions/editapplication.php:161
msgid "Use this form to edit your application."
-msgstr ""
+msgstr "Bruk dette skjemaet for å redigere programmet ditt."
#: actions/editapplication.php:177 actions/newapplication.php:159
msgid "Name is required."
@@ -1234,7 +1228,7 @@ msgstr "beskrivelse er for lang (maks %d tegn)"
msgid "Could not update group."
msgstr "Kunne ikke oppdatere gruppe."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Kunne ikke opprette alias."
@@ -1243,9 +1237,8 @@ msgid "Options saved."
msgstr ""
#: actions/emailsettings.php:60
-#, fuzzy
msgid "Email settings"
-msgstr "Innstillinger for e-post"
+msgstr "E-postinnstillinger"
#: actions/emailsettings.php:71
#, php-format
@@ -1403,7 +1396,7 @@ msgstr "Det er ikke din e-postadresse."
#: actions/emailsettings.php:432 actions/imsettings.php:408
#: actions/smssettings.php:425
msgid "The address was removed."
-msgstr ""
+msgstr "Adressen ble fjernet."
#: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address."
@@ -1433,12 +1426,12 @@ msgstr ""
#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
-msgstr ""
+msgstr "Populære notiser"
#: actions/favorited.php:67
#, php-format
msgid "Popular notices, page %d"
-msgstr ""
+msgstr "Populære notiser, side %d"
#: actions/favorited.php:79
msgid "The most popular notices on the site right now."
@@ -2272,7 +2265,7 @@ msgid "Only "
msgstr "Bare "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr ""
@@ -2715,25 +2708,25 @@ msgstr "Språk er for langt (maks 50 tegn)."
msgid "Invalid tag: \"%s\""
msgstr "Ugyldig hjemmeside '%s'"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Klarte ikke å lagre profil."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Klarte ikke å lagre profil."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
#, fuzzy
msgid "Couldn't save tags."
msgstr "Klarte ikke å lagre profil."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr ""
@@ -3108,7 +3101,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr ""
@@ -3146,7 +3139,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr "Du er allerede logget inn!"
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Gjentatt"
@@ -3830,17 +3823,26 @@ 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"
-#: actions/subscribe.php:55
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
#, fuzzy
-msgid "Not a local user."
-msgstr "Ugyldig OpenID"
+msgid "No such profile."
+msgstr "Ingen slik fil."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr ""
@@ -3900,7 +3902,7 @@ msgstr ""
msgid "These are the people whose notices %s listens to."
msgstr ""
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3910,17 +3912,17 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1$s lytter nå til dine notiser på %2$s."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
#, fuzzy
msgid "Jabber"
msgstr "Ingen Jabber ID."
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
@@ -4329,58 +4331,79 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:237
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:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:788
+#: classes/Notice.php:882
msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:848
+#: classes/Notice.php:1407
#, php-format
-msgid "DB error inserting reply: %s"
+msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/Notice.php:1235
-#, php-format
-msgid "RT @%1$s %2$s"
+#: 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 lib/subs.php:69
+msgid "Couldn't delete subscription."
msgstr ""
-#: classes/User.php:385
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:380
+#: classes/User_group.php:423
#, fuzzy
msgid "Could not create group."
msgstr "Klarte ikke å lagre avatar-informasjonen"
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "Klarte ikke å lagre avatar-informasjonen"
@@ -4582,27 +4605,39 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr ""
-#: lib/action.php:1147
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "Tidligere »"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr ""
@@ -4904,83 +4939,93 @@ 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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Svar til %s"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Ikke autorisert."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Svar til %s"
-#: lib/command.php:692
+#: lib/command.php:733
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:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Du er allerede logget inn!"
-#: lib/command.php:714
+#: lib/command.php:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4994,6 +5039,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5021,20 +5067,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "Fant ikke bekreftelseskode."
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -5458,7 +5504,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr "fra"
@@ -5583,50 +5629,50 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr ""
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Opprett"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
#, fuzzy
msgid "Reply"
msgstr "svar"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Nytt nick"
@@ -5659,10 +5705,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 ""
@@ -5848,36 +5890,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"
@@ -5931,68 +5943,68 @@ msgstr "Brukerbilde"
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "Endre profilinnstillingene dine"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr ""
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "noen få sekunder siden"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "omtrent ett minutt siden"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "omtrent %d minutter siden"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "omtrent én time siden"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "omtrent %d timer siden"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "omtrent én dag siden"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "omtrent %d dager siden"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "omtrent én måned siden"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "omtrent %d måneder siden"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "omtrent ett år siden"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index b1a54d06a..1cd71ad86 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:15:32+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:28+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -62,7 +62,7 @@ msgstr "Nieuwe registraties uitschakelen."
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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."
@@ -171,8 +170,8 @@ msgstr ""
msgid "You and friends"
msgstr "U en vrienden"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Updates van %1$s en vrienden op %2$s."
@@ -193,12 +192,12 @@ msgstr "Updates van %1$s en vrienden op %2$s."
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "De API-functie is niet aangetroffen."
@@ -506,7 +505,7 @@ msgstr "Ongeldig token."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -656,7 +655,7 @@ msgstr "Niet-ondersteund bestandsformaat."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favorieten van %2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s updates op de favorietenlijst geplaatst door %2$s / %3$s"
@@ -667,7 +666,7 @@ msgstr "%1$s updates op de favorietenlijst geplaatst door %2$s / %3$s"
msgid "%s timeline"
msgstr "%s tijdlijn"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -683,12 +682,12 @@ msgstr "%1$s / Updates over %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s publieke tijdlijn"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s updates van iedereen"
@@ -698,7 +697,7 @@ msgstr "%s updates van iedereen"
msgid "Repeated to %s"
msgstr "Herhaald naar %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Herhaald van %s"
@@ -708,7 +707,7 @@ msgstr "Herhaald van %s"
msgid "Notices tagged with %s"
msgstr "Mededelingen met het label %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Updates met het label %1$s op %2$s!"
@@ -770,7 +769,7 @@ msgid "Preview"
msgstr "Voorvertoning"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Verwijderen"
@@ -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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Er is een probleem met uw sessietoken."
@@ -981,7 +980,7 @@ msgstr "Deze applicatie verwijderen"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1012,7 +1011,7 @@ msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?"
msgid "Do not delete this notice"
msgstr "Deze mededeling niet verwijderen"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Deze mededeling verwijderen"
@@ -1254,7 +1253,7 @@ msgstr "de beschrijving is te lang (maximaal %d tekens)"
msgid "Could not update group."
msgstr "Het was niet mogelijk de groep bij te werken."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Het was niet mogelijk de aliassen aan te maken."
@@ -2355,7 +2354,7 @@ msgid "Only "
msgstr "Alleen "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Geen ondersteund gegevensformaat."
@@ -2798,25 +2797,25 @@ msgstr "Taal is te lang (max 50 tekens)."
msgid "Invalid tag: \"%s\""
msgstr "Ongeldig label: '%s'"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
"Het was niet mogelijk de instelling voor automatisch abonneren voor de "
"gebruiker bij te werken."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Het was niet mogelijk de locatievoorkeuren op te slaan."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Het profiel kon niet opgeslagen worden."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Het was niet mogelijk de labels op te slaan."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "De instellingen zijn opgeslagen."
@@ -3217,7 +3216,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "De URL van uw profiel bij een andere, compatibele microblogdienst"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Abonneren"
@@ -3255,7 +3254,7 @@ msgstr "U kunt uw eigen mededeling niet herhalen."
msgid "You already repeated that notice."
msgstr "U hent die mededeling al herhaald."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Herhaald"
@@ -3975,15 +3974,26 @@ 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."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Dit is geen lokale gebruiker."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Het bestand bestaat niet."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "U bent niet geabonneerd op dat profiel."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Geabonneerd"
@@ -4047,7 +4057,7 @@ msgstr "Dit zijn de gebruikers van wie u de mededelingen volgt."
msgid "These are the people whose notices %s listens to."
msgstr "Dit zijn de gebruikers waarvan %s de mededelingen volgt."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4063,16 +4073,16 @@ msgstr ""
"action.twittersettings%%), kunt u automatisch abonneren op de gebruikers die "
"u daar al volgt."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s volgt niemand."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4503,26 +4513,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:222
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:226
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:231
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:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4530,42 +4540,60 @@ 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:243
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:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
msgid "Problem saving group inbox."
msgstr ""
"Er is een probleem opgetreden bij het opslaan van het Postvak IN van de "
"groep."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr ""
-"Er is een databasefout opgetreden bij het invoegen van het antwoord: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Het was niet mogelijk de groep aan te maken."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Het was niet mogelijk het groepslidmaatschap in te stellen."
@@ -4770,26 +4798,38 @@ msgstr ""
"Auteursrechten op inhoud en gegevens rusten bij de respectievelijke "
"gebruikers. Alle rechten voorbehouden."
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "Alle "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "licentie."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginering"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "Later"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Eerder"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "U mag geen wijzigingen maken aan deze website."
@@ -5091,83 +5131,93 @@ 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
+msgid "No such user"
+msgstr "De opgegeven gebruiker bestaat niet"
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "Geabonneerd op %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Uw abonnement op %s is opgezegd"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "U bent op geen enkele gebruiker geabonneerd."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
msgid "No one is subscribed to you."
msgstr "Niemand heeft een abonnenment op u."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
msgid "You are not a member of any groups."
msgstr "U bent lid van geen enkele groep."
-#: lib/command.php:714
+#: lib/command.php:755
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:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5181,6 +5231,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5247,20 +5298,20 @@ msgstr ""
"tracks - nog niet beschikbaar\n"
"tracking - nog niet beschikbaar\n"
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Er is geen instellingenbestand aangetroffen. "
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen: "
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
"U kunt proberen de installer uit te voeren om dit probleem op te lossen."
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Naar het installatieprogramma gaan."
@@ -5757,7 +5808,7 @@ msgstr ""
"U hebt geen privéberichten. U kunt privéberichten verzenden aan andere "
"gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "van"
@@ -5885,48 +5936,48 @@ msgstr ""
"Het ophalen van uw geolocatie duurt langer dan verwacht. Probeer het later "
"nog eens"
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "N"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "Z"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "O"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "W"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "op"
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "in context"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Herhaald door"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Op deze mededeling antwoorden"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Antwoorden"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Mededeling herhaald"
@@ -5959,10 +6010,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 +6186,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"
@@ -6217,67 +6236,67 @@ msgstr "Avatar bewerken"
msgid "User actions"
msgstr "Gebruikershandelingen"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Profielinstellingen bewerken"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Bewerken"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Deze gebruiker een direct bericht zenden"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Bericht"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Modereren"
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "een paar seconden geleden"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "ongeveer een minuut geleden"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "ongeveer %d minuten geleden"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "ongeveer een uur geleden"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "ongeveer %d uur geleden"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "ongeveer een dag geleden"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "ongeveer %d dagen geleden"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "ongeveer een maand geleden"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "ongeveer %d maanden geleden"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "ongeveer een jaar geleden"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index e3e2cf80e..55918d880 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:15:29+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:25+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 (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -65,7 +65,7 @@ msgstr ""
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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."
@@ -168,8 +167,8 @@ msgstr ""
msgid "You and friends"
msgstr "%s med vener"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Oppdateringar frå %1$s og vener på %2$s!"
@@ -190,12 +189,12 @@ msgstr "Oppdateringar frå %1$s og vener på %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Fann ikkje API-metode."
@@ -507,7 +506,7 @@ msgstr "Ugyldig storleik."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -652,7 +651,7 @@ msgstr "Støttar ikkje bileteformatet."
msgid "%1$s / Favorites from %2$s"
msgstr "%s / Favorittar frå %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s oppdateringar favorisert av %s / %s."
@@ -663,7 +662,7 @@ msgstr "%s oppdateringar favorisert av %s / %s."
msgid "%s timeline"
msgstr "%s tidsline"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -679,12 +678,12 @@ msgstr "%1$s / Oppdateringar som svarar til %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s offentleg tidsline"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s oppdateringar frå alle saman!"
@@ -694,7 +693,7 @@ msgstr "%s oppdateringar frå alle saman!"
msgid "Repeated to %s"
msgstr "Svar til %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "Svar til %s"
@@ -704,7 +703,7 @@ msgstr "Svar til %s"
msgid "Notices tagged with %s"
msgstr "Notisar merka med %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Oppdateringar frå %1$s på %2$s!"
@@ -766,7 +765,7 @@ msgid "Preview"
msgstr "Forhandsvis"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Slett"
@@ -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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Det var eit problem med sesjons billetten din."
@@ -984,7 +983,7 @@ msgstr "Slett denne notisen"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1017,7 +1016,7 @@ msgstr "Sikker på at du vil sletta notisen?"
msgid "Do not delete this notice"
msgstr "Kan ikkje sletta notisen."
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Slett denne notisen"
@@ -1280,7 +1279,7 @@ msgstr "skildringa er for lang (maks 140 teikn)."
msgid "Could not update group."
msgstr "Kann ikkje oppdatera gruppa."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "Kunne ikkje lagre favoritt."
@@ -2371,7 +2370,7 @@ msgid "Only "
msgstr ""
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Ikkje eit støtta dataformat."
@@ -2831,24 +2830,24 @@ msgstr "Språk er for langt (maksimalt 50 teikn)."
msgid "Invalid tag: \"%s\""
msgstr "Ugyldig merkelapp: %s"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Kan ikkje oppdatera brukar for automatisk tinging."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Kan ikkje lagra merkelapp."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Kan ikkje lagra profil."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Kan ikkje lagra merkelapp."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Lagra innstillingar."
@@ -3235,7 +3234,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL til profilsida di på ei anna kompatibel mikrobloggingteneste."
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Ting"
@@ -3278,7 +3277,7 @@ msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen."
msgid "You already repeated that notice."
msgstr "Du har allereie blokkert denne brukaren."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "Lag"
@@ -3977,15 +3976,26 @@ 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."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Ikkje ein lokal brukar."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Denne notisen finst ikkje."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Du tingar ikkje oppdateringar til den profilen."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Abonnent"
@@ -4045,7 +4055,7 @@ msgstr "Dette er dei du lyttar til."
msgid "These are the people whose notices %s listens to."
msgstr "Dette er folka som %s tingar oppdateringar frå."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4055,16 +4065,16 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1$s høyrer no på"
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4493,22 +4503,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:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Feil ved lagring av notis. Ukjend brukar."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
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:237
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4516,39 +4526,61 @@ 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:243
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:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Eit problem oppstod ved lagring av notis."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Databasefeil, kan ikkje lagra svar: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Kunne ikkje laga gruppa."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Kunne ikkje bli med i gruppa."
@@ -4754,26 +4786,38 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "Alle"
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "lisens."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginering"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "« Etter"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Før »"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
#, fuzzy
msgid "You cannot make changes to this site."
@@ -5088,83 +5132,92 @@ 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
+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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Tingar ikkje %s lengre"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Du tingar ikkje oppdateringar til den profilen."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Kan ikkje tinga andre til deg."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
#, 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:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5178,6 +5231,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5205,20 +5259,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "Ingen stadfestingskode."
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
#, fuzzy
msgid "Go to the installer."
msgstr "Logg inn or sida"
@@ -5646,7 +5700,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr " frå "
@@ -5770,51 +5824,51 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "Nei"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "Ingen innhald."
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Lag"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Svar på denne notisen"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Svar"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Melding lagra"
@@ -5848,11 +5902,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 +6089,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"
@@ -6123,68 +6142,68 @@ msgstr "Brukarbilete"
msgid "User actions"
msgstr "Brukarverkty"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "Profilinnstillingar"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Send ei direktemelding til denne brukaren"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Melding"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "eit par sekund sidan"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "omtrent eitt minutt sidan"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "~%d minutt sidan"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "omtrent ein time sidan"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "~%d timar sidan"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "omtrent ein dag sidan"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "~%d dagar sidan"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "omtrent ein månad sidan"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "~%d månadar sidan"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "omtrent eitt år sidan"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index a13f6362b..79b37a5e4 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:15:35+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:31+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 (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -65,7 +65,7 @@ msgstr "Wyłączenie nowych rejestracji."
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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."
@@ -174,8 +173,8 @@ msgstr ""
msgid "You and friends"
msgstr "Ty i przyjaciele"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
@@ -196,12 +195,12 @@ msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Nie odnaleziono metody API."
@@ -503,7 +502,7 @@ msgstr "Nieprawidłowy token."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -644,7 +643,7 @@ msgstr "Nieobsługiwany format."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s/ulubione wpisy od %2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "Użytkownik %1$s aktualizuje ulubione według %2$s/%2$s."
@@ -655,7 +654,7 @@ msgstr "Użytkownik %1$s aktualizuje ulubione według %2$s/%2$s."
msgid "%s timeline"
msgstr "Oś czasu użytkownika %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -671,12 +670,12 @@ msgstr "%1$s/aktualizacje wspominające %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Publiczna oś czasu użytkownika %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "Użytkownik %s aktualizuje od każdego."
@@ -686,7 +685,7 @@ msgstr "Użytkownik %s aktualizuje od każdego."
msgid "Repeated to %s"
msgstr "Powtórzone dla %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Powtórzenia %s"
@@ -696,7 +695,7 @@ msgstr "Powtórzenia %s"
msgid "Notices tagged with %s"
msgstr "Wpisy ze znacznikiem %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Aktualizacje ze znacznikiem %1$s na %2$s."
@@ -757,7 +756,7 @@ msgid "Preview"
msgstr "Podgląd"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Usuń"
@@ -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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Wystąpił problem z tokenem sesji."
@@ -966,7 +965,7 @@ msgstr "Usuń tę aplikację"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -997,7 +996,7 @@ msgstr "Jesteś pewien, że chcesz usunąć ten wpis?"
msgid "Do not delete this notice"
msgstr "Nie usuwaj tego wpisu"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Usuń ten wpis"
@@ -1236,7 +1235,7 @@ msgstr "opis jest za długi (maksymalnie %d znaków)."
msgid "Could not update group."
msgstr "Nie można zaktualizować grupy."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Nie można utworzyć aliasów."
@@ -2315,7 +2314,7 @@ msgid "Only "
msgstr "Tylko "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "To nie jest obsługiwany format danych."
@@ -2757,23 +2756,23 @@ msgstr "Język jest za długi (maksymalnie 50 znaków)."
msgid "Invalid tag: \"%s\""
msgstr "Nieprawidłowy znacznik: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Nie można zaktualizować użytkownika do automatycznej subskrypcji."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Nie można zapisać preferencji położenia."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Nie można zapisać profilu."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Nie można zapisać znaczników."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Zapisano ustawienia."
@@ -3169,7 +3168,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Subskrybuj"
@@ -3207,7 +3206,7 @@ msgstr "Nie można powtórzyć własnego wpisu."
msgid "You already repeated that notice."
msgstr "Już powtórzono ten wpis."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Powtórzono"
@@ -3919,15 +3918,26 @@ 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."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Nie jest lokalnym użytkownikiem."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Nie ma takiego pliku."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Nie jesteś subskrybowany do tego profilu."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Subskrybowano"
@@ -3991,7 +4001,7 @@ msgstr "Osoby, których wpisy obserwujesz."
msgid "These are the people whose notices %s listens to."
msgstr "Osoby, których wpisy obserwuje użytkownik %s."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4007,16 +4017,16 @@ msgstr ""
"twittersettings%%), można automatycznie subskrybować osoby, które tam już "
"obserwujesz."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "Użytkownik %s nie obserwuje nikogo."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4444,22 +4454,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:222
msgid "Problem saving notice. Too long."
msgstr "Problem podczas zapisywania wpisu. Za długi."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
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:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4467,38 +4477,57 @@ 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:243
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:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problem podczas zapisywania wpisu."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
msgid "Problem saving group inbox."
msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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."
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Nie można utworzyć grupy."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Nie można ustawić członkostwa w grupie."
@@ -4703,26 +4732,38 @@ msgstr ""
"Prawa autorskie do treści i danych są własnością współtwórców. Wszystkie "
"prawa zastrzeżone."
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "Wszystko "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "licencja."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginacja"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "Później"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Wcześniej"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "Nie można wprowadzić zmian witryny."
@@ -5021,85 +5062,95 @@ 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
+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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Usunięto subskrypcję użytkownika %s"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Nie subskrybujesz nikogo."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
msgid "No one is subscribed to you."
msgstr "Nikt cię nie subskrybuje."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
msgid "You are not a member of any groups."
msgstr "Nie jesteś członkiem żadnej grupy."
-#: lib/command.php:714
+#: lib/command.php:755
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:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5113,6 +5164,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5179,19 +5231,19 @@ msgstr ""
"tracks - jeszcze nie zaimplementowano\n"
"tracking - jeszcze nie zaimplementowano\n"
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Nie odnaleziono pliku konfiguracji."
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Szukano plików konfiguracji w następujących miejscach: "
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "Należy uruchomić instalator, aby to naprawić."
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Przejdź do instalatora."
@@ -5688,7 +5740,7 @@ msgstr ""
"rozmowę z innymi użytkownikami. Inni mogą wysyłać ci wiadomości tylko dla "
"twoich oczu."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "z"
@@ -5811,48 +5863,48 @@ msgstr ""
"Pobieranie danych geolokalizacji trwa dłużej niż powinno, proszę spróbować "
"ponownie później"
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "Północ"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "Południe"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "Wschód"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "Zachód"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "w"
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "w rozmowie"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Powtórzone przez"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Odpowiedz na ten wpis"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Odpowiedz"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Powtórzono wpis"
@@ -5884,10 +5936,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 +6113,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"
@@ -6143,67 +6163,67 @@ msgstr "Zmodyfikuj awatar"
msgid "User actions"
msgstr "Czynności użytkownika"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Zmodyfikuj ustawienia profilu"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Edycja"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Wiadomość"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Moderuj"
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "kilka sekund temu"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "około minutę temu"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "około %d minut temu"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "około godzinę temu"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "około %d godzin temu"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "blisko dzień temu"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "około %d dni temu"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "około miesiąc temu"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "około %d miesięcy temu"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "około rok temu"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index a2c8fd60c..e742dda19 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:15:39+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:34+0000\n"
"Language-Team: Portuguese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -63,7 +63,7 @@ msgstr "Impossibilitar registos novos."
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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."
@@ -171,8 +170,8 @@ msgstr ""
msgid "You and friends"
msgstr "Você e seus amigos"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Actualizações de %1$s e amigos no %2$s!"
@@ -193,12 +192,12 @@ msgstr "Actualizações de %1$s e amigos no %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Método da API não encontrado."
@@ -500,7 +499,7 @@ msgstr "Tamanho inválido."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -642,7 +641,7 @@ msgstr "Formato não suportado."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoritas de %2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s actualizações preferidas por %2$s / %2$s."
@@ -653,7 +652,7 @@ msgstr "%1$s actualizações preferidas por %2$s / %2$s."
msgid "%s timeline"
msgstr "Notas de %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -669,12 +668,12 @@ msgstr "%1$s / Actualizações que mencionam %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "Notas públicas de %s"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s actualizações de todos!"
@@ -684,7 +683,7 @@ msgstr "%s actualizações de todos!"
msgid "Repeated to %s"
msgstr "Repetida para %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Repetências de %s"
@@ -694,7 +693,7 @@ msgstr "Repetências de %s"
msgid "Notices tagged with %s"
msgstr "Notas categorizadas com %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualizações categorizadas com %1$s em %2$s!"
@@ -755,7 +754,7 @@ msgid "Preview"
msgstr "Antevisão"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Apagar"
@@ -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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Ocorreu um problema com a sua sessão."
@@ -972,7 +971,7 @@ msgstr "Apagar esta nota"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1003,7 +1002,7 @@ msgstr "Tem a certeza de que quer apagar esta nota?"
msgid "Do not delete this notice"
msgstr "Não apagar esta nota"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Apagar esta nota"
@@ -1256,7 +1255,7 @@ msgstr "descrição é demasiada extensa (máx. %d caracteres)."
msgid "Could not update group."
msgstr "Não foi possível actualizar o grupo."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Não foi possível criar sinónimos."
@@ -2348,7 +2347,7 @@ msgid "Only "
msgstr "Apenas "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Formato de dados não suportado."
@@ -2795,23 +2794,23 @@ msgstr "Idioma é demasiado extenso (máx. 50 caracteres)."
msgid "Invalid tag: \"%s\""
msgstr "Categoria inválida: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Não foi possível actualizar o utilizador para subscrição automática."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Não foi possível gravar as preferências de localização."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Não foi possível gravar o perfil."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Não foi possível gravar as categorias."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Configurações gravadas."
@@ -3210,7 +3209,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL do seu perfil noutro serviço de microblogues compatível"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Subscrever"
@@ -3248,7 +3247,7 @@ msgstr "Não pode repetir a sua própria nota."
msgid "You already repeated that notice."
msgstr "Já repetiu essa nota."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Repetida"
@@ -3964,15 +3963,26 @@ 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."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "O utilizador não é local."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Ficheiro não foi encontrado."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Não subscreveu esse perfil."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Subscrito"
@@ -4036,7 +4046,7 @@ msgstr "Estas são as pessoas cujas notas está a escutar."
msgid "These are the people whose notices %s listens to."
msgstr "Estas são as pessoas cujas notas %s está a escutar."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4052,16 +4062,16 @@ msgstr ""
"twittersettings%%) pode subscrever automaticamente as pessoas que já segue "
"lá."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s não está a ouvir ninguém."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4489,22 +4499,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:222
msgid "Problem saving notice. Too long."
msgstr "Problema na gravação da nota. Demasiado longa."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Problema na gravação da nota. Utilizador desconhecido."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
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:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4512,39 +4522,58 @@ msgstr ""
"Demasiadas mensagens duplicadas, demasiado rápido; descanse e volte a "
"publicar daqui a alguns minutos."
-#: classes/Notice.php:235
+#: classes/Notice.php:243
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:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problema na gravação da nota."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Problema na gravação da nota."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Não foi possível criar o grupo."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Não foi possível configurar membros do grupo."
@@ -4745,26 +4774,38 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "Tudo "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "licença."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginação"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "Posteriores"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Anteriores"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "Não pode fazer alterações a este site."
@@ -5066,82 +5107,93 @@ 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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Deixou de subscrever %s"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Não subscreveu ninguém."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
msgid "No one is subscribed to you."
msgstr "Ninguém subscreve as suas notas."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
msgid "You are not a member of any groups."
msgstr "Não está em nenhum grupo."
-#: lib/command.php:714
+#: lib/command.php:755
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:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5155,6 +5207,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5219,19 +5272,19 @@ msgstr ""
"tracks - ainda não implementado.\n"
"tracking - ainda não implementado.\n"
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Ficheiro de configuração não encontrado. "
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Procurei ficheiros de configuração nos seguintes sítios: "
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "Talvez queira correr o instalador para resolver esta questão."
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Ir para o instalador."
@@ -5727,7 +5780,7 @@ msgstr ""
"conversa com outros utilizadores. Outros podem enviar-lhe mensagens, a que "
"só você terá acesso."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "de"
@@ -5852,48 +5905,48 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "N"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "S"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "E"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "O"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "coords."
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "no contexto"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Repetida por"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Responder a esta nota"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Nota repetida"
@@ -5925,10 +5978,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 +6154,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"
@@ -6183,67 +6204,67 @@ msgstr "Editar Avatar"
msgid "User actions"
msgstr "Acções do utilizador"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Editar configurações do perfil"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Editar"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Enviar mensagem directa a este utilizador"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Mensagem"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Moderar"
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "há alguns segundos"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "há cerca de um minuto"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "há cerca de %d minutos"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "há cerca de uma hora"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "há cerca de %d horas"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "há cerca de um dia"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "há cerca de %d dias"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "há cerca de um mês"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "há cerca de %d meses"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "há cerca de um ano"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index b9ffc361b..18659cecf 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-14 20:05+0000\n"
-"PO-Revision-Date: 2010-02-14 20:07:20+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:37+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 (r62476); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -63,7 +63,7 @@ msgstr "Desabilita novos registros."
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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."
@@ -195,11 +194,11 @@ msgstr "Atualizações de %1$s e amigos no %2$s!"
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:182 actions/apitimelinehome.php:184
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:194 actions/apiusershow.php:101
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "O método da API não foi encontrado!"
@@ -503,7 +502,7 @@ msgstr "Token inválido."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -763,7 +762,7 @@ msgid "Preview"
msgstr "Visualização"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Excluir"
@@ -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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Ocorreu um problema com o seu token de sessão."
@@ -974,7 +973,7 @@ msgstr "Excluir esta aplicação"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1005,7 +1004,7 @@ msgstr "Tem certeza que deseja excluir esta mensagem?"
msgid "Do not delete this notice"
msgstr "Não excluir esta mensagem."
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Excluir esta mensagem"
@@ -1246,7 +1245,7 @@ msgstr "descrição muito extensa (máximo %d caracteres)."
msgid "Could not update group."
msgstr "Não foi possível atualizar o grupo."
-#: actions/editgroup.php:259 classes/User_group.php:423
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Não foi possível criar os apelidos."
@@ -2343,7 +2342,7 @@ msgid "Only "
msgstr "Apenas "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Não é um formato de dados suportado."
@@ -2786,23 +2785,23 @@ msgstr "O nome do idioma é muito extenso (máx. 50 caracteres)."
msgid "Invalid tag: \"%s\""
msgstr "Etiqueta inválida: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Não foi possível atualizar o usuário para assinar automaticamente."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Não foi possível salvar as preferências de localização."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Não foi possível salvar o perfil."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Não foi possível salvar as etiquetas."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "As configurações foram salvas."
@@ -3202,7 +3201,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL do seu perfil em outro serviço de microblog compatível"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Assinar"
@@ -3239,7 +3238,7 @@ msgstr "Você não pode repetir sua própria mensagem."
msgid "You already repeated that notice."
msgstr "Você já repetiu essa mensagem."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Repetida"
@@ -3254,9 +3253,9 @@ msgid "Replies to %s"
msgstr "Respostas para %s"
#: actions/replies.php:127
-#, fuzzy, php-format
+#, php-format
msgid "Replies to %1$s, page %2$d"
-msgstr "Respostas para %1$s no %2$s"
+msgstr "Respostas para %1$s, pág. %2$d"
#: actions/replies.php:144
#, php-format
@@ -3324,9 +3323,8 @@ msgid "Sessions"
msgstr "Sessões"
#: actions/sessionsadminpanel.php:65
-#, fuzzy
msgid "Session settings for this StatusNet site."
-msgstr "Configurações da aparência deste site StatusNet."
+msgstr "Configurações da sessão deste site StatusNet."
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3381,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"
@@ -3426,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."
@@ -3493,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"
@@ -3618,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
@@ -3954,15 +3951,26 @@ 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."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Não é um usuário local."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Esse arquivo não existe."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Você não está assinando esse perfil."
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Assinado"
@@ -4026,7 +4034,7 @@ msgstr "Estas são as pessoas cujas mensagens você acompanha."
msgid "These are the people whose notices %s listens to."
msgstr "Estas são as pessoas cujas mensagens %s acompanha."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4042,23 +4050,23 @@ msgstr ""
"[usuário do Twitter](%%action.twittersettings%%), você pode assinar "
"automaticamente as pessoas que já segue lá."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s não está acompanhando ninguém."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
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
@@ -4343,9 +4351,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"
@@ -4479,22 +4487,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:222
msgid "Problem saving notice. Too long."
msgstr "Problema no salvamento da mensagem. Ela é muito extensa."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Problema no salvamento da mensagem. Usuário desconhecido."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
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:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4502,39 +4510,57 @@ 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:243
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:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problema no salvamento da mensagem."
-#: classes/Notice.php:788
-#, fuzzy
+#: classes/Notice.php:882
msgid "Problem saving group inbox."
-msgstr "Problema no salvamento da mensagem."
-
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Erro no banco de dados na inserção da reposta: %s"
+msgstr "Problema no salvamento das mensagens recebidas do grupo."
-#: classes/Notice.php:1271
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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!"
-#: classes/User_group.php:413
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Não foi possível criar o grupo."
-#: classes/User_group.php:442
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Não foi possível configurar a associação ao grupo."
@@ -4737,26 +4763,38 @@ msgstr ""
"Conteúdo e dados licenciados pelos colaboradores. Todos os direitos "
"reservados."
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "Todas "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "licença."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Paginação"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "Próximo"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Anterior"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "Você não pode fazer alterações neste site."
@@ -4786,32 +4824,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"
@@ -5056,82 +5095,92 @@ 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
+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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Cancelada a assinatura de %s"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Você não está assinando ninguém."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
msgid "No one is subscribed to you."
msgstr "Ninguém o assinou ainda."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
msgid "You are not a member of any groups."
msgstr "Você não é membro de nenhum grupo."
-#: lib/command.php:714
+#: lib/command.php:755
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:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5145,6 +5194,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5210,19 +5260,19 @@ msgstr ""
"tracks - não implementado ainda\n"
"tracking - não implementado ainda\n"
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Não foi encontrado nenhum arquivo de configuração. "
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Eu procurei pelos arquivos de configuração nos seguintes lugares: "
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "Você pode querer executar o instalador para corrigir isto."
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Ir para o instalador."
@@ -5717,7 +5767,7 @@ msgstr ""
"privadas para envolver outras pessoas em uma conversa. Você também pode "
"receber mensagens privadas."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "de"
@@ -5845,48 +5895,48 @@ msgstr ""
"Desculpe, mas recuperar a sua geolocalização está demorando mais que o "
"esperado. Por favor, tente novamente mais tarde."
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "N"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "S"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "L"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "O"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "em"
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "no contexto"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Repetida por"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Responder a esta mensagem"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Responder"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Mensagem repetida"
@@ -5918,10 +5968,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."
@@ -6029,7 +6075,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"
@@ -6098,34 +6144,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"
@@ -6176,67 +6194,67 @@ msgstr "Editar o avatar"
msgid "User actions"
msgstr "Ações do usuário"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Editar as configurações do perfil"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Editar"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Enviar uma mensagem para este usuário."
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Mensagem"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Moderar"
-#: lib/util.php:871
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "alguns segundos atrás"
-#: lib/util.php:873
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "cerca de 1 minuto atrás"
-#: lib/util.php:875
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "cerca de %d minutos atrás"
-#: lib/util.php:877
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "cerca de 1 hora atrás"
-#: lib/util.php:879
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "cerca de %d horas atrás"
-#: lib/util.php:881
+#: lib/util.php:962
msgid "about a day ago"
msgstr "cerca de 1 dia atrás"
-#: lib/util.php:883
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "cerca de %d dias atrás"
-#: lib/util.php:885
+#: lib/util.php:966
msgid "about a month ago"
msgstr "cerca de 1 mês atrás"
-#: lib/util.php:887
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "cerca de %d meses atrás"
-#: lib/util.php:889
+#: lib/util.php:970
msgid "about a year ago"
msgstr "cerca de 1 ano atrás"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index da1345a0d..d4df1a654 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-14 20:05+0000\n"
-"PO-Revision-Date: 2010-02-14 20:07:23+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:41+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62476); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -66,7 +66,7 @@ msgstr "Отключить новые регистрации."
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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 "Нет такого пользователя."
@@ -196,11 +195,11 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!"
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:182 actions/apitimelinehome.php:184
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:194 actions/apiusershow.php:101
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "Метод API не найден."
@@ -505,7 +504,7 @@ msgstr "Неправильный токен"
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -761,7 +760,7 @@ msgid "Preview"
msgstr "Просмотр"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
@@ -971,7 +970,7 @@ msgstr "Удалить это приложение"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1002,7 +1001,7 @@ msgstr "Вы уверены, что хотите удалить эту запи
msgid "Do not delete this notice"
msgstr "Не удалять эту запись"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Удалить эту запись"
@@ -1243,7 +1242,7 @@ msgstr "Слишком длинное описание (максимум %d си
msgid "Could not update group."
msgstr "Не удаётся обновить информацию о группе."
-#: actions/editgroup.php:259 classes/User_group.php:423
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Не удаётся создать алиасы."
@@ -2335,7 +2334,7 @@ msgid "Only "
msgstr "Только "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Неподдерживаемый формат данных."
@@ -2775,23 +2774,23 @@ msgstr "Слишком длинный язык (более 50 символов).
msgid "Invalid tag: \"%s\""
msgstr "Неверный тег: «%s»"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Не удаётся обновить пользователя для автоподписки."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Не удаётся сохранить настройки местоположения."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Не удаётся сохранить профиль."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Не удаётся сохранить теги."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Настройки сохранены."
@@ -3188,7 +3187,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "Адрес URL твоего профиля на другом подходящем сервисе микроблогинга"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Подписаться"
@@ -3224,7 +3223,7 @@ msgstr "Вы не можете повторить собственную зап
msgid "You already repeated that notice."
msgstr "Вы уже повторили эту запись."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Повторено"
@@ -3942,15 +3941,26 @@ 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 "Не удаётся сохранить подписку."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Не локальный пользователь."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Нет такого файла."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Вы не подписаны на этот профиль."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Подписано"
@@ -4014,7 +4024,7 @@ msgstr "Это пользователи, записи которых вы чит
msgid "These are the people whose notices %s listens to."
msgstr "Это пользователи, записи которых читает %s."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4030,16 +4040,16 @@ msgstr ""
"пользуетесь [Твиттером](%%action.twittersettings%%), то можете автоматически "
"подписаться на тех людей, за которыми уже следите там."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s не просматривает ничьи записи."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "СМС"
@@ -4464,22 +4474,22 @@ msgstr "Не удаётся обновить сообщение с новым UR
msgid "DB error inserting hashtag: %s"
msgstr "Ошибка баз данных при вставке хеш-тегов для %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "Проблемы с сохранением записи. Слишком длинно."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Проблема при сохранении записи. Неизвестный пользователь."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Слишком много записей за столь короткий срок; передохните немного и "
"попробуйте вновь через пару минут."
-#: classes/Notice.php:229
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4487,38 +4497,57 @@ msgstr ""
"Слишком много одинаковых записей за столь короткий срок; передохните немного "
"и попробуйте вновь через пару минут."
-#: classes/Notice.php:235
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Вам запрещено поститься на этом сайте (бан)"
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Проблемы с сохранением записи."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
msgid "Problem saving group inbox."
msgstr "Проблемы с сохранением входящих сообщений группы."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Ошибка баз данных при вставке ответа для %s"
-
-#: classes/Notice.php:1271
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Не удаётся удалить подписку."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Добро пожаловать на %1$s, @%2$s!"
-#: classes/User_group.php:413
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Не удаётся создать группу."
-#: classes/User_group.php:442
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Не удаётся назначить членство в группе."
@@ -4723,26 +4752,38 @@ msgstr ""
"Авторские права на содержание и данные принадлежат разработчикам. Все права "
"защищены."
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "All "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "license."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Разбиение на страницы"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "Сюда"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Туда"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "Вы не можете изменять этот сайт."
@@ -5041,83 +5082,93 @@ 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 "Подписано на %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Отписано от %s"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Вы ни на кого не подписаны."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
msgid "No one is subscribed to you."
msgstr "Никто не подписан на вас."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
msgid "You are not a member of any groups."
msgstr "Вы не состоите ни в одной группе."
-#: lib/command.php:714
+#: lib/command.php:755
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:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5131,6 +5182,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5195,19 +5247,19 @@ msgstr ""
"tracks — пока не реализовано.\n"
"tracking — пока не реализовано.\n"
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Конфигурационный файл не найден. "
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Конфигурационные файлы искались в следующих местах: "
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "Возможно, вы решите запустить установщик для исправления этого."
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Перейти к установщику"
@@ -5703,7 +5755,7 @@ msgstr ""
"вовлечения других пользователей в разговор. Сообщения, получаемые от других "
"людей, видите только вы."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "от "
@@ -5828,48 +5880,48 @@ msgstr ""
"К сожалению, получение информации о вашем местонахождении заняло больше "
"времени, чем ожидалось; повторите попытку позже"
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\" %4$s %5$u°%6$u'%7$u\" %8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "с. ш."
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "ю. ш."
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "в. д."
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "з. д."
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "на"
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "в контексте"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Повторено"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Ответить на эту запись"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Ответить"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Запись повторена"
@@ -5901,10 +5953,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 +6129,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"
@@ -6159,67 +6179,67 @@ msgstr "Изменить аватару"
msgid "User actions"
msgstr "Действия пользователя"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Изменение настроек профиля"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Редактировать"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Послать приватное сообщение этому пользователю."
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Сообщение"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Модерировать"
-#: lib/util.php:871
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "пару секунд назад"
-#: lib/util.php:873
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "около минуты назад"
-#: lib/util.php:875
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "около %d минут(ы) назад"
-#: lib/util.php:877
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "около часа назад"
-#: lib/util.php:879
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "около %d часа(ов) назад"
-#: lib/util.php:881
+#: lib/util.php:962
msgid "about a day ago"
msgstr "около дня назад"
-#: lib/util.php:883
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "около %d дня(ей) назад"
-#: lib/util.php:885
+#: lib/util.php:966
msgid "about a month ago"
msgstr "около месяца назад"
-#: lib/util.php:887
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "около %d месяца(ев) назад"
-#: lib/util.php:889
+#: lib/util.php:970
msgid "about a year ago"
msgstr "около года назад"
diff --git a/locale/statusnet.po b/locale/statusnet.po
index d1ee56f2c..cf44e2d3c 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-14 20:05+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+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"
@@ -58,7 +58,7 @@ msgstr ""
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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 ""
@@ -181,11 +180,11 @@ msgstr ""
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:182 actions/apitimelinehome.php:184
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:194 actions/apiusershow.php:101
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr ""
@@ -481,7 +480,7 @@ msgstr ""
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -731,7 +730,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -935,7 +934,7 @@ msgstr ""
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -964,7 +963,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr ""
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr ""
@@ -1201,7 +1200,7 @@ msgstr ""
msgid "Could not update group."
msgstr ""
-#: actions/editgroup.php:259 classes/User_group.php:423
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr ""
@@ -2196,7 +2195,7 @@ msgid "Only "
msgstr ""
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr ""
@@ -2628,23 +2627,23 @@ msgstr ""
msgid "Invalid tag: \"%s\""
msgstr ""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr ""
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr ""
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr ""
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr ""
@@ -2997,7 +2996,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr ""
@@ -3033,7 +3032,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr ""
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr ""
@@ -3697,15 +3696,24 @@ 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 ""
-#: actions/subscribe.php:55
-msgid "Not a local user."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:107
+msgid "No such profile."
+msgstr ""
+
+#: actions/subscribe.php:117
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr ""
@@ -3765,7 +3773,7 @@ msgstr ""
msgid "These are the people whose notices %s listens to."
msgstr ""
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3775,16 +3783,16 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr ""
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
@@ -4178,57 +4186,76 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr ""
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr ""
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:237
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:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:788
+#: classes/Notice.php:882
msgid "Problem saving group inbox."
msgstr ""
-#: classes/Notice.php:848
+#: classes/Notice.php:1407
#, php-format
-msgid "DB error inserting reply: %s"
+msgid "RT @%1$s %2$s"
msgstr ""
-#: classes/Notice.php:1271
-#, php-format
-msgid "RT @%1$s %2$s"
+#: 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 lib/subs.php:69
+msgid "Couldn't delete subscription."
msgstr ""
-#: classes/User.php:385
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:413
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr ""
-#: classes/User_group.php:442
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr ""
@@ -4424,26 +4451,38 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr ""
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr ""
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr ""
@@ -4734,80 +4773,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
+msgid "No such user"
+msgstr ""
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr ""
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
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:692
+#, php-format
+msgid "Unsubscribed %s"
+msgstr ""
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr ""
-#: lib/command.php:670
+#: lib/command.php:711
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:731
msgid "No one is subscribed to you."
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:733
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:753
msgid "You are not a member of any groups."
msgstr ""
-#: lib/command.php:714
+#: lib/command.php:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4821,6 +4869,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4848,19 +4897,19 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr ""
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -5266,7 +5315,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr ""
@@ -5386,48 +5435,48 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr ""
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr ""
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr ""
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr ""
@@ -5459,10 +5508,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 +5684,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"
@@ -5717,67 +5734,67 @@ msgstr ""
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr ""
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr ""
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:871
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:873
+#: lib/util.php:954
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:875
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:877
+#: lib/util.php:958
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:879
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:881
+#: lib/util.php:962
msgid "about a day ago"
msgstr ""
-#: lib/util.php:883
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:885
+#: lib/util.php:966
msgid "about a month ago"
msgstr ""
-#: lib/util.php:887
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:889
+#: lib/util.php:970
msgid "about a year ago"
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index a0d407c5c..b09823e6b 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:15:57+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:44+0000\n"
"Language-Team: Swedish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -62,7 +62,7 @@ msgstr "Inaktivera nya registreringar."
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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."
@@ -169,8 +168,8 @@ msgstr ""
msgid "You and friends"
msgstr "Du och vänner"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Uppdateringar från %1$s och vänner på %2$s!"
@@ -191,12 +190,12 @@ msgstr "Uppdateringar från %1$s och vänner på %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API-metod hittades inte."
@@ -495,7 +494,7 @@ msgstr "Ogiltig token."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -635,7 +634,7 @@ msgstr "Format som inte stödjs."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Favoriter från %2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s uppdateringar markerade som favorit av %2$s / %2$s."
@@ -646,7 +645,7 @@ msgstr "%1$s uppdateringar markerade som favorit av %2$s / %2$s."
msgid "%s timeline"
msgstr "%s tidslinje"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -662,12 +661,12 @@ msgstr "%1$s / Uppdateringar som nämner %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s uppdateringar med svar på uppdatering från %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s publika tidslinje"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s uppdateringar från alla!"
@@ -677,7 +676,7 @@ msgstr "%s uppdateringar från alla!"
msgid "Repeated to %s"
msgstr "Upprepat till %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Upprepningar av %s"
@@ -687,7 +686,7 @@ msgstr "Upprepningar av %s"
msgid "Notices tagged with %s"
msgstr "Notiser taggade med %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Uppdateringar taggade med %1$s på %2$s!"
@@ -749,7 +748,7 @@ msgid "Preview"
msgstr "Förhandsgranska"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr "Ta bort"
@@ -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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Det var ett problem med din sessions-token."
@@ -960,7 +959,7 @@ msgstr "Ta bort denna applikation"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -991,7 +990,7 @@ msgstr "Är du säker på att du vill ta bort denna notis?"
msgid "Do not delete this notice"
msgstr "Ta inte bort denna notis"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Ta bort denna notis"
@@ -1232,7 +1231,7 @@ msgstr "beskrivning är för lång (max %d tecken)."
msgid "Could not update group."
msgstr "Kunde inte uppdatera grupp."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Kunde inte skapa alias."
@@ -2315,7 +2314,7 @@ msgid "Only "
msgstr "Bara "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Ett dataformat som inte stödjs"
@@ -2756,23 +2755,23 @@ msgstr "Språknamn är för långt (max 50 tecken)."
msgid "Invalid tag: \"%s\""
msgstr "Ogiltig tagg: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Kunde inte uppdatera användaren för automatisk prenumeration."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Kunde inte spara platsinställningar."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Kunde inte spara profil."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Kunde inte spara taggar."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Inställningar sparade."
@@ -3171,7 +3170,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL till din profil på en annan kompatibel mikrobloggtjänst"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Prenumerera"
@@ -3209,7 +3208,7 @@ msgstr "Du kan inte upprepa din egna notis."
msgid "You already repeated that notice."
msgstr "Du har redan upprepat denna notis."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Upprepad"
@@ -3918,15 +3917,26 @@ 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."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Inte en lokal användare."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Ingen sådan fil."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Du är inte prenumerat hos den profilen."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Prenumerant"
@@ -3990,7 +4000,7 @@ msgstr "Det är dessa personer vars meddelanden du lyssnar på."
msgid "These are the people whose notices %s listens to."
msgstr "Det är dessa personer vars notiser %s lyssnar på."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4006,16 +4016,16 @@ msgstr ""
"twittersettings%%) kan du prenumerera automatiskt på personer som du redan "
"följer där."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s lyssnar inte på någon."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4443,22 +4453,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:222
msgid "Problem saving notice. Too long."
msgstr "Problem vid sparande av notis. För långt."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Problem vid sparande av notis. Okänd användare."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
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:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4466,38 +4476,57 @@ 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:243
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:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Problem med att spara notis."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
msgid "Problem saving group inbox."
msgstr "Problem med att spara gruppinkorg."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Databasfel vid infogning av svar: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Kunde inte skapa grupp."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Kunde inte ställa in gruppmedlemskap."
@@ -4699,26 +4728,38 @@ 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:826
+#: lib/action.php:827
msgid "All "
msgstr "Alla "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "licens."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Numrering av sidor"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "Senare"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Tidigare"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "Du kan inte göra förändringar av denna webbplats."
@@ -5016,81 +5057,91 @@ 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
+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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Prenumeration hos %s avslutad"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Du prenumererar inte på någon."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
msgid "No one is subscribed to you."
msgstr "Ingen prenumerar på dig."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
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:755
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:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5104,6 +5155,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5168,19 +5220,19 @@ msgstr ""
"tracks - inte implementerat än.\n"
"tracking - inte implementerat än.\n"
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Ingen konfigurationsfil hittades. "
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Jag letade efter konfigurationsfiler på följande platser: "
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "Du kanske vill köra installeraren för att åtgärda detta."
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Gå till installeraren."
@@ -5673,7 +5725,7 @@ msgstr ""
"engagera andra användare i konversationen. Folk kan skicka meddelanden till "
"dig som bara du ser."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "från"
@@ -5799,48 +5851,48 @@ msgstr ""
"Tyvärr, hämtning av din geografiska plats tar längre tid än förväntat, var "
"god försök igen senare"
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "N"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "S"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "Ö"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "V"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "på"
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "i sammanhang"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Upprepad av"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Svara på denna notis"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Svara"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Notis upprepad"
@@ -5872,10 +5924,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 +6100,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"
@@ -6130,67 +6150,67 @@ msgstr "Redigera avatar"
msgid "User actions"
msgstr "Åtgärder för användare"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Redigera profilinställningar"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Redigera"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Skicka ett direktmeddelande till denna användare"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Meddelande"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Moderera"
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "ett par sekunder sedan"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "för nån minut sedan"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "för %d minuter sedan"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "för en timma sedan"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "för %d timmar sedan"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "för en dag sedan"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "för %d dagar sedan"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "för en månad sedan"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "för %d månader sedan"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "för ett år sedan"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 85719532b..37a2582b3 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:16:03+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:47+0000\n"
"Language-Team: Telugu\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -62,7 +62,7 @@ msgstr "కొత్త నమోదులను అచేతనంచేయి.
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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 "అటువంటి వాడుకరి లేరు."
@@ -163,8 +162,8 @@ msgstr ""
msgid "You and friends"
msgstr "మీరు మరియు మీ స్నేహితులు"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -185,12 +184,12 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
@@ -494,7 +493,7 @@ msgstr "తప్పుడు పరిమాణం."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -633,7 +632,7 @@ msgstr ""
msgid "%1$s / Favorites from %2$s"
msgstr ""
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s యొక్క మైక్రోబ్లాగు"
@@ -644,7 +643,7 @@ msgstr "%s యొక్క మైక్రోబ్లాగు"
msgid "%s timeline"
msgstr "%s కాలరేఖ"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -660,12 +659,12 @@ msgstr ""
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s బహిరంగ కాలరేఖ"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "అందరి నుండి %s తాజాకరణలు!"
@@ -675,7 +674,7 @@ msgstr "అందరి నుండి %s తాజాకరణలు!"
msgid "Repeated to %s"
msgstr "%sకి స్పందనలు"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "%s యొక్క పునరావృతాలు"
@@ -685,7 +684,7 @@ msgstr "%s యొక్క పునరావృతాలు"
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%s యొక్క మైక్రోబ్లాగు"
@@ -747,7 +746,7 @@ msgid "Preview"
msgstr "మునుజూపు"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -955,7 +954,7 @@ msgstr "ఈ ఉపకరణాన్ని తొలగించు"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -984,7 +983,7 @@ msgstr "మీరు నిజంగానే ఈ నోటీసుని త
msgid "Do not delete this notice"
msgstr "ఈ నోటీసుని తొలగించకు"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "ఈ నోటీసుని తొలగించు"
@@ -1227,7 +1226,7 @@ msgstr "వివరణ చాలా పెద్దదిగా ఉంది (1
msgid "Could not update group."
msgstr "గుంపుని తాజాకరించలేకున్నాం."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "మారుపేర్లని సృష్టించలేకపోయాం."
@@ -2247,7 +2246,7 @@ msgid "Only "
msgstr "మాత్రమే "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr ""
@@ -2694,24 +2693,24 @@ msgstr "భాష మరీ పెద్దగా ఉంది (50 అక్ష
msgid "Invalid tag: \"%s\""
msgstr "'%s' అనే హోమ్ పేజీ సరైనదికాదు"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "ట్యాగులని భద్రపరచలేకున్నాం."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "ట్యాగులని భద్రపరచలేకున్నాం."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "అమరికలు భద్రమయ్యాయి."
@@ -3084,7 +3083,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "చందాచేరు"
@@ -3123,7 +3122,7 @@ msgstr "ఈ లైసెన్సుకి అంగీకరించకపో
msgid "You already repeated that notice."
msgstr "మీరు ఇప్పటికే ఆ వాడుకరిని నిరోధించారు."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "సృష్టితం"
@@ -3802,16 +3801,26 @@ 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 "చందాని సృష్టించలేకపోయాం."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "స్థానిక వాడుకరి కాదు."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "అటువంటి ఫైలు లేదు."
+
+#: actions/subscribe.php:117
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
#, fuzzy
msgid "Subscribed"
msgstr "చందాదార్లు"
@@ -3873,7 +3882,7 @@ msgstr ""
msgid "These are the people whose notices %s listens to."
msgstr ""
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3883,16 +3892,16 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr ""
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "జాబర్"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
@@ -4291,60 +4300,81 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:237
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:243
msgid "You are banned from posting notices on this site."
msgstr "ఈ సైటులో నోటీసులు రాయడం నుండి మిమ్మల్ని నిషేధించారు."
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr ""
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "చందాని తొలగించలేకపోయాం."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "@%2$s, %1$sకి స్వాగతం!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "గుంపుని సృష్టించలేకపోయాం."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "గుంపు సభ్యత్వాన్ని అమర్చలేకపోయాం."
@@ -4549,26 +4579,38 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "అన్నీ "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "పేజీకరణ"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "తర్వాత"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "ఇంతక్రితం"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "ఈ సైటుకి మీరు మార్పులు చేయలేరు."
@@ -4875,80 +4917,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
+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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "%s నుండి చందా విరమించారు"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "మీరు ఎవరికీ చందాచేరలేదు."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
msgid "No one is subscribed to you."
msgstr "మీకు చందాదార్లు ఎవరూ లేరు."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
msgid "You are not a member of any groups."
msgstr "మీరు ఏ గుంపులోనూ సభ్యులు కాదు."
-#: lib/command.php:714
+#: lib/command.php:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -4962,6 +5013,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -4989,20 +5041,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "నిర్ధారణ సంకేతం లేదు."
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -5434,7 +5486,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "నుండి"
@@ -5558,49 +5610,49 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "ఉ"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "ద"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "తూ"
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "ప"
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "సందర్భంలో"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "సృష్టితం"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "ఈ నోటీసుపై స్పందించండి"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "స్పందించండి"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "నోటీసుని తొలగించాం."
@@ -5635,10 +5687,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 +5869,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"
@@ -5903,68 +5921,68 @@ msgstr "అవతారాన్ని మార్చు"
msgid "User actions"
msgstr "వాడుకరి చర్యలు"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "ఫ్రొఫైలు అమరికలు"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "మార్చు"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "ఈ వాడుకరికి ఒక నేరు సందేశాన్ని పంపించండి"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "సందేశం"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "కొన్ని క్షణాల క్రితం"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "ఓ నిమిషం క్రితం"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "%d నిమిషాల క్రితం"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "ఒక గంట క్రితం"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "%d గంటల క్రితం"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "ఓ రోజు క్రితం"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "%d రోజుల క్రితం"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "ఓ నెల క్రితం"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "%d నెలల క్రితం"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "ఒక సంవత్సరం క్రితం"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 5368680c6..149b21292 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:16:08+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:50+0000\n"
"Language-Team: Turkish\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -66,7 +66,7 @@ msgstr ""
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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."
@@ -169,8 +168,8 @@ msgstr ""
msgid "You and friends"
msgstr "%s ve arkadaşları"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -191,12 +190,12 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Onay kodu bulunamadı."
@@ -509,7 +508,7 @@ msgstr "Geçersiz büyüklük."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -655,7 +654,7 @@ msgstr "Desteklenmeyen görüntü dosyası biçemi."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s'in %2$s'deki durum mesajları "
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s adli kullanicinin durum mesajlari"
@@ -666,7 +665,7 @@ msgstr "%s adli kullanicinin durum mesajlari"
msgid "%s timeline"
msgstr ""
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -682,12 +681,12 @@ msgstr "%1$s'in %2$s'deki durum mesajları "
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -697,7 +696,7 @@ msgstr ""
msgid "Repeated to %s"
msgstr "%s için cevaplar"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "%s için cevaplar"
@@ -707,7 +706,7 @@ msgstr "%s için cevaplar"
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%s adli kullanicinin durum mesajlari"
@@ -771,7 +770,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
msgstr ""
@@ -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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -991,7 +990,7 @@ msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1021,7 +1020,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "Böyle bir durum mesajı yok."
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr ""
@@ -1280,7 +1279,7 @@ msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
msgid "Could not update group."
msgstr "Kullanıcı güncellenemedi."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "Avatar bilgisi kaydedilemedi"
@@ -2334,7 +2333,7 @@ msgid "Only "
msgstr ""
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr ""
@@ -2794,25 +2793,25 @@ msgstr ""
msgid "Invalid tag: \"%s\""
msgstr "%s Geçersiz başlangıç sayfası"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Profil kaydedilemedi."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Profil kaydedilemedi."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
#, fuzzy
msgid "Couldn't save tags."
msgstr "Profil kaydedilemedi."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Ayarlar kaydedildi."
@@ -3177,7 +3176,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Abone ol"
@@ -3217,7 +3216,7 @@ msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
msgid "You already repeated that notice."
msgstr "Zaten giriş yapmış durumdasıznız!"
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "Yarat"
@@ -3905,17 +3904,27 @@ 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ı."
-#: actions/subscribe.php:55
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
#, fuzzy
-msgid "Not a local user."
-msgstr "Böyle bir kullanıcı yok."
+msgid "No such profile."
+msgstr "Böyle bir durum mesajı yok."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Bize o profili yollamadınız"
+
+#: actions/subscribe.php:145
#, fuzzy
msgid "Subscribed"
msgstr "Abone ol"
@@ -3976,7 +3985,7 @@ msgstr "Sizin durumlarını takip ettiğiniz kullanıcılar"
msgid "These are the people whose notices %s listens to."
msgstr "%s adlı kullanıcının durumlarını takip ettiği kullanıcılar"
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3986,17 +3995,17 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1$s %2$s'da durumunuzu takip ediyor"
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
#, fuzzy
msgid "Jabber"
msgstr "JabberID yok."
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
@@ -4413,61 +4422,83 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:237
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:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Durum mesajını kaydederken hata oluştu."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Cevap eklenirken veritabanı hatası: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Abonelik silinemedi."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:380
+#: classes/User_group.php:423
#, fuzzy
msgid "Could not create group."
msgstr "Avatar bilgisi kaydedilemedi"
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "Abonelik oluşturulamadı."
@@ -4679,28 +4710,40 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1139
+#: lib/action.php:1141
#, fuzzy
msgid "After"
msgstr "« Sonra"
-#: lib/action.php:1147
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "Önce »"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr ""
@@ -5013,80 +5056,90 @@ 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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Aboneliği sonlandır"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "Bize o profili yollamadınız"
-#: lib/command.php:670
+#: lib/command.php:711
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:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Uzaktan abonelik"
-#: lib/command.php:692
+#: lib/command.php:733
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:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "Bize o profili yollamadınız"
-#: lib/command.php:714
+#: lib/command.php:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5100,6 +5153,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5127,20 +5181,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "Onay kodu yok."
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -5569,7 +5623,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr ""
@@ -5694,51 +5748,51 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "İçerik yok!"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Yarat"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
#, fuzzy
msgid "Reply"
msgstr "cevapla"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Durum mesajları"
@@ -5772,10 +5826,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 +6012,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"
@@ -6046,68 +6065,68 @@ msgstr "Avatar"
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "Profil ayarları"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr ""
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "birkaç saniye önce"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "yaklaşık bir dakika önce"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "yaklaşık %d dakika önce"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "yaklaşık bir saat önce"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "yaklaşık %d saat önce"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "yaklaşık bir gün önce"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "yaklaşık %d gün önce"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "yaklaşık bir ay önce"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "yaklaşık %d ay önce"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "yaklaşık bir yıl önce"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 5f5fa846e..c261c310d 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:16:16+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:53+0000\n"
"Language-Team: Ukrainian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -65,7 +65,7 @@ msgstr "Скасувати подальшу регістрацію."
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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 "Такого користувача немає."
@@ -171,8 +170,8 @@ msgstr ""
msgid "You and friends"
msgstr "Ви з друзями"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "Оновлення від %1$s та друзів на %2$s!"
@@ -193,12 +192,12 @@ msgstr "Оновлення від %1$s та друзів на %2$s!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
msgid "API method not found."
msgstr "API метод не знайдено."
@@ -500,7 +499,7 @@ msgstr "Невірний токен."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -646,7 +645,7 @@ msgstr "Формат не підтримується."
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s / Обрані від %2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%1$s оновлення обраних від %2$s / %2$s."
@@ -657,7 +656,7 @@ msgstr "%1$s оновлення обраних від %2$s / %2$s."
msgid "%s timeline"
msgstr "%s стрічка"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -673,12 +672,12 @@ msgstr "%1$s / Оновленні відповіді %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "%1$s оновив цю відповідь на допис від %2$s / %3$s."
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s загальна стрічка"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s оновлення від усіх!"
@@ -688,7 +687,7 @@ msgstr "%s оновлення від усіх!"
msgid "Repeated to %s"
msgstr "Вторування за %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr "Вторування %s"
@@ -698,7 +697,7 @@ msgstr "Вторування %s"
msgid "Notices tagged with %s"
msgstr "Дописи позначені з %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Оновлення позначені з %1$s на %2$s!"
@@ -759,7 +758,7 @@ msgid "Preview"
msgstr "Перегляд"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr "Виникли певні проблеми з токеном поточної сесії."
@@ -969,7 +968,7 @@ msgstr "Видалити додаток"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -998,7 +997,7 @@ msgstr "Ви впевненні, що бажаєте видалити цей д
msgid "Do not delete this notice"
msgstr "Не видаляти цей допис"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr "Видалити допис"
@@ -1239,7 +1238,7 @@ msgstr "опис надто довгий (%d знаків максимум)."
msgid "Could not update group."
msgstr "Не вдалося оновити групу."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
msgid "Could not create aliases."
msgstr "Неможна призначити додаткові імена."
@@ -2324,7 +2323,7 @@ msgid "Only "
msgstr "Лише "
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Такий формат даних не підтримується."
@@ -2766,23 +2765,23 @@ msgstr "Мова задовга (50 знаків максимум)."
msgid "Invalid tag: \"%s\""
msgstr "Недійсний теґ: \"%s\""
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "Не вдалося оновити користувача для автопідписки."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
msgid "Couldn't save location prefs."
msgstr "Не вдалося зберегти налаштування розташування."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Не вдалося зберегти профіль."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
msgid "Couldn't save tags."
msgstr "Не вдалося зберегти теґи."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Налаштування збережено."
@@ -3179,7 +3178,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL-адреса Вашого профілю на іншому сумісному сервісі"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Підписатись"
@@ -3216,7 +3215,7 @@ msgstr "Ви не можете вторувати своїм власним до
msgid "You already repeated that notice."
msgstr "Ви вже вторували цьому допису."
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
msgid "Repeated"
msgstr "Вторування"
@@ -3928,15 +3927,26 @@ 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 "Не вдалося зберегти підписку."
-#: actions/subscribe.php:55
-msgid "Not a local user."
-msgstr "Такого користувача немає."
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Такого файлу немає."
+
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Ви не підписані до цього профілю."
+
+#: actions/subscribe.php:145
msgid "Subscribed"
msgstr "Підписані"
@@ -4000,7 +4010,7 @@ msgstr "Тут представлені ті, за чиїми дописами
msgid "These are the people whose notices %s listens to."
msgstr "Тут представлені ті, за чиїми дописами слідкує %s."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4016,16 +4026,16 @@ msgstr ""
"action.twittersettings%%), то можете автоматично підписатись до людей, за "
"якими слідкуєте там."
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s не відслідковує нічого"
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "СМС"
@@ -4450,22 +4460,22 @@ msgstr "Не можна оновити повідомлення з новим UR
msgid "DB error inserting hashtag: %s"
msgstr "Помилка бази даних при додаванні теґу: %s"
-#: classes/Notice.php:214
+#: classes/Notice.php:222
msgid "Problem saving notice. Too long."
msgstr "Проблема при збереженні допису. Надто довге."
-#: classes/Notice.php:218
+#: classes/Notice.php:226
msgid "Problem saving notice. Unknown user."
msgstr "Проблема при збереженні допису. Невідомий користувач."
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Дуже багато дописів за короткий термін; ходіть подихайте повітрям і "
"повертайтесь за кілька хвилин."
-#: classes/Notice.php:229
+#: classes/Notice.php:237
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -4473,38 +4483,57 @@ msgstr ""
"Дуже багато повідомлень за короткий термін; ходіть подихайте повітрям і "
"повертайтесь за кілька хвилин."
-#: classes/Notice.php:235
+#: classes/Notice.php:243
msgid "You are banned from posting notices on this site."
msgstr "Вам заборонено надсилати дописи до цього сайту."
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Проблема при збереженні допису."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
msgid "Problem saving group inbox."
msgstr "Проблема при збереженні вхідних дописів для групи."
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "Помилка бази даних при додаванні відповіді: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "Не вдалося видалити підписку."
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "Вітаємо на %1$s, @%2$s!"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "Не вдалося створити нову групу."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
msgid "Could not set group membership."
msgstr "Не вдалося встановити членство."
@@ -4706,26 +4735,38 @@ msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
"Авторські права на зміст і дані належать розробникам. Всі права захищено."
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "Всі "
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "ліцензія."
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "Нумерація сторінок"
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr "Вперед"
-#: lib/action.php:1147
+#: lib/action.php:1149
msgid "Before"
msgstr "Назад"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "Ви не можете щось змінювати на цьому сайті."
@@ -5023,84 +5064,94 @@ 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 "Підписано до %s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Відписано від %s"
+
+#: lib/command.php:709
msgid "You are not subscribed to anyone."
msgstr "Ви не маєте жодних підписок."
-#: lib/command.php:670
+#: lib/command.php:711
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:731
msgid "No one is subscribed to you."
msgstr "До Вас ніхто не підписаний."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
msgid "You are not a member of any groups."
msgstr "Ви не є учасником жодної групи."
-#: lib/command.php:714
+#: lib/command.php:755
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:769
+#, fuzzy
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5114,6 +5165,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5176,19 +5228,19 @@ msgstr ""
"tracks — наразі не виконується\n"
"tracking — наразі не виконується\n"
-#: lib/common.php:135
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "Файлу конфігурації не знайдено. "
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr "Шукав файли конфігурації в цих місцях: "
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr "Запустіть файл інсталяції, аби полагодити це."
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr "Іти до файлу інсталяції."
@@ -5683,7 +5735,7 @@ msgstr ""
"повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите "
"лише Ви."
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr "від"
@@ -5808,48 +5860,48 @@ msgstr ""
"На жаль, отримання інформації щодо Вашого місцезнаходження займе більше "
"часу, ніж очікувалось; будь ласка, спробуйте пізніше"
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr "Півн."
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr "Півд."
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr "Сх."
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr "Зах."
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr "в"
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
msgid "in context"
msgstr "в контексті"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
msgid "Repeated by"
msgstr "Вторуванні"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr "Відповісти на цей допис"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Відповісти"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
msgid "Notice repeated"
msgstr "Допис вторували"
@@ -5881,10 +5933,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 +6109,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"
@@ -6139,67 +6159,67 @@ msgstr "Аватара"
msgid "User actions"
msgstr "Діяльність користувача"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
msgid "Edit profile settings"
msgstr "Налаштування профілю"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr "Правка"
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr "Надіслати пряме повідомлення цьому користувачеві"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr "Повідомлення"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr "Модерувати"
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "мить тому"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "хвилину тому"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "близько %d хвилин тому"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "годину тому"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "близько %d годин тому"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "день тому"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "близько %d днів тому"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "місяць тому"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "близько %d місяців тому"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "рік тому"
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index cf152eff5..4dcc58488 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:16:19+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:51:57+0000\n"
"Language-Team: Vietnamese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -65,7 +65,7 @@ msgstr ""
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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."
@@ -168,8 +167,8 @@ msgstr ""
msgid "You and friends"
msgstr "%s và bạn bè"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -190,12 +189,12 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "Phương thức API không tìm thấy!"
@@ -511,7 +510,7 @@ msgstr "Kích thước không hợp lệ."
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -656,7 +655,7 @@ msgstr "Không hỗ trợ kiểu file ảnh này."
msgid "%1$s / Favorites from %2$s"
msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "Tất cả các cập nhật của %s"
@@ -667,7 +666,7 @@ msgstr "Tất cả các cập nhật của %s"
msgid "%s timeline"
msgstr "Dòng tin nhắn của %s"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -683,12 +682,12 @@ msgstr "%1$s / Các cập nhật đang trả lời tới %2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, fuzzy, php-format
msgid "%s public timeline"
msgstr "Dòng tin công cộng"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "%s cập nhật từ tất cả mọi người!"
@@ -698,7 +697,7 @@ msgstr "%s cập nhật từ tất cả mọi người!"
msgid "Repeated to %s"
msgstr "Trả lời cho %s"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "Trả lời cho %s"
@@ -708,7 +707,7 @@ msgstr "Trả lời cho %s"
msgid "Notices tagged with %s"
msgstr "Thông báo được gắn thẻ %s"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Dòng tin nhắn cho %s"
@@ -774,7 +773,7 @@ msgid "Preview"
msgstr "Xem trước"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
#, fuzzy
msgid "Delete"
msgstr "Xóa tin nhắn"
@@ -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:1195
+#: 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."
@@ -996,7 +995,7 @@ msgstr "Xóa tin nhắn"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1027,7 +1026,7 @@ msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
msgid "Do not delete this notice"
msgstr "Không thể xóa tin nhắn này."
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
#, fuzzy
msgid "Delete this notice"
msgstr "Xóa tin nhắn"
@@ -1299,7 +1298,7 @@ msgstr "Lý lịch quá dài (không quá 140 ký tự)"
msgid "Could not update group."
msgstr "Không thể cập nhật thành viên."
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "Không thể tạo favorite."
@@ -2423,7 +2422,7 @@ msgid "Only "
msgstr ""
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "Không hỗ trợ định dạng dữ liệu này."
@@ -2891,26 +2890,26 @@ msgstr "Ngôn ngữ quá dài (tối đa là 50 ký tự)."
msgid "Invalid tag: \"%s\""
msgstr "Trang chủ '%s' không hợp lệ"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
#, fuzzy
msgid "Couldn't update user for autosubscribe."
msgstr "Không thể cập nhật thành viên."
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "Không thể lưu hồ sơ cá nhân."
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "Không thể lưu hồ sơ cá nhân."
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
#, fuzzy
msgid "Couldn't save tags."
msgstr "Không thể lưu hồ sơ cá nhân."
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "Đã lưu các điều chỉnh."
@@ -3295,7 +3294,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "URL trong hồ sơ cá nhân của bạn ở trên các trang microblogging khác"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "Theo bạn này"
@@ -3336,7 +3335,7 @@ msgstr "Bạn không thể đăng ký nếu không đồng ý các điều kho
msgid "You already repeated that notice."
msgstr "Bạn đã theo những người này:"
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "Tạo"
@@ -4044,17 +4043,27 @@ 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."
-#: actions/subscribe.php:55
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
#, fuzzy
-msgid "Not a local user."
-msgstr "Không có user nào."
+msgid "No such profile."
+msgstr "Không có tin nhắn nào."
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
+#: actions/subscribe.php:145
#, fuzzy
msgid "Subscribed"
msgstr "Theo bạn này"
@@ -4115,7 +4124,7 @@ msgstr "Có nhiều người gửi lời nhắn để bạn nghe theo."
msgid "These are the people whose notices %s listens to."
msgstr "Có nhiều người gửi lời nhắn để %s nghe theo."
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4125,17 +4134,17 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1$s dang theo doi tin nhan cua ban tren %2$s."
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
#, fuzzy
msgid "Jabber"
msgstr "Không có Jabber ID."
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS"
@@ -4565,61 +4574,83 @@ 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:222
#, 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:226
#, 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:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:237
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:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-#: classes/Notice.php:848
-#, 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:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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 "
-#: classes/User_group.php:380
+#: classes/User_group.php:423
#, fuzzy
msgid "Could not create group."
msgstr "Không thể tạo favorite."
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "Không thể tạo đăng nhận."
@@ -4836,28 +4867,40 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1139
+#: lib/action.php:1141
#, fuzzy
msgid "After"
msgstr "Sau"
-#: lib/action.php:1147
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "Trước"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
#, fuzzy
msgid "You cannot make changes to this site."
@@ -5176,82 +5219,92 @@ 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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "Hết theo"
+
+#: lib/command.php:709
#, 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:711
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:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "Không thể tạo favorite."
-#: lib/command.php:692
+#: lib/command.php:733
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:753
#, 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:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5265,6 +5318,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5292,20 +5346,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "Không có mã số xác nhận."
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -5791,7 +5845,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr " từ "
@@ -5919,52 +5973,52 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "Không"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "Không có nội dung!"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "Tạo"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
#, fuzzy
msgid "Reply to this notice"
msgstr "Trả lời tin nhắn này"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr "Trả lời"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "Tin đã gửi"
@@ -6001,10 +6055,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 +6247,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"
@@ -6286,70 +6303,70 @@ msgstr "Hình đại diện"
msgid "User actions"
msgstr "Không tìm thấy action"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "Các thiết lập cho Hồ sơ cá nhân"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
#, fuzzy
msgid "Send a direct message to this user"
msgstr "Bạn đã theo những người này:"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
#, fuzzy
msgid "Message"
msgstr "Tin mới nhất"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "vài giây trước"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "1 phút trước"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "%d phút trước"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "1 giờ trước"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "%d giờ trước"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "1 ngày trước"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "%d ngày trước"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "1 tháng trước"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "%d tháng trước"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "1 năm trước"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index a7aeec7ca..60ca89d66 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:16:22+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:52:00+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 (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -68,7 +68,7 @@ msgstr ""
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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 "没有这个用户。"
@@ -170,8 +169,8 @@ msgstr ""
msgid "You and friends"
msgstr "%s 及好友"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "来自%2$s 上 %1$s 和好友的更新!"
@@ -192,12 +191,12 @@ msgstr "来自%2$s 上 %1$s 和好友的更新!"
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "API 方法未实现!"
@@ -509,7 +508,7 @@ msgstr "大小不正确。"
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -654,7 +653,7 @@ msgstr "不支持这种图像格式。"
msgid "%1$s / Favorites from %2$s"
msgstr "%s 的收藏 / %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s 收藏了 %s 的 %s 通告。"
@@ -665,7 +664,7 @@ msgstr "%s 收藏了 %s 的 %s 通告。"
msgid "%s timeline"
msgstr "%s 时间表"
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -681,12 +680,12 @@ msgstr "%1$s / 回复 %2$s 的消息"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "回复 %2$s / %3$s 的 %1$s 更新。"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s 公众时间表"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "来自所有人的 %s 消息!"
@@ -696,7 +695,7 @@ msgstr "来自所有人的 %s 消息!"
msgid "Repeated to %s"
msgstr "%s 的回复"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "%s 的回复"
@@ -706,7 +705,7 @@ msgstr "%s 的回复"
msgid "Notices tagged with %s"
msgstr "带 %s 标签的通告"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$s 上 %1$s 的更新!"
@@ -769,7 +768,7 @@ msgid "Preview"
msgstr "预览"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
#, fuzzy
msgid "Delete"
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:1195
+#: lib/action.php:1197
#, fuzzy
msgid "There was a problem with your session token."
msgstr "会话标识有问题,请重试。"
@@ -992,7 +991,7 @@ msgstr "删除通告"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1023,7 +1022,7 @@ msgstr "确定要删除这条消息吗?"
msgid "Do not delete this notice"
msgstr "无法删除通告。"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
#, fuzzy
msgid "Delete this notice"
msgstr "删除通告"
@@ -1287,7 +1286,7 @@ msgstr "描述过长(不能超过140字符)。"
msgid "Could not update group."
msgstr "无法更新组"
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "无法创建收藏。"
@@ -2373,7 +2372,7 @@ msgid "Only "
msgstr ""
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr "不支持的数据格式。"
@@ -2831,25 +2830,25 @@ msgstr "语言过长(不能超过50个字符)。"
msgid "Invalid tag: \"%s\""
msgstr "主页'%s'不正确"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "无法更新用户的自动订阅选项。"
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "无法保存个人信息。"
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "无法保存个人信息。"
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
#, fuzzy
msgid "Couldn't save tags."
msgstr "无法保存个人信息。"
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr "设置已保存。"
@@ -3227,7 +3226,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "您在其他兼容的微博客服务的个人信息URL"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr "订阅"
@@ -3270,7 +3269,7 @@ msgstr "您必须同意此授权方可注册。"
msgid "You already repeated that notice."
msgstr "您已成功阻止该用户:"
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "创建"
@@ -3973,17 +3972,27 @@ 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 "无法删除订阅。"
-#: actions/subscribe.php:55
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
#, fuzzy
-msgid "Not a local user."
-msgstr "没有这个用户。"
+msgid "No such profile."
+msgstr "没有这份通告。"
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "您未告知此个人信息"
+
+#: actions/subscribe.php:145
#, fuzzy
msgid "Subscribed"
msgstr "订阅"
@@ -4044,7 +4053,7 @@ msgstr "这是您订阅的用户。"
msgid "These are the people whose notices %s listens to."
msgstr "这是 %s 订阅的用户。"
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -4054,17 +4063,17 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1$s 开始关注您的 %2$s 信息。"
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
#, fuzzy
msgid "Jabber"
msgstr "没有 Jabber ID。"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS短信"
@@ -4490,61 +4499,84 @@ msgstr "无法添加新URI的信息。"
msgid "DB error inserting hashtag: %s"
msgstr "添加标签时数据库出错:%s"
-#: classes/Notice.php:214
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "保存通告时出错。"
-#: classes/Notice.php:218
+#: classes/Notice.php:226
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "保存通告时出错。"
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr "你在短时间里发布了过多的消息,请深呼吸,过几分钟再发消息。"
-#: classes/Notice.php:229
+#: classes/Notice.php:237
#, 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:243
msgid "You are banned from posting notices on this site."
msgstr "在这个网站你被禁止发布消息。"
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr "保存通告时出错。"
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "保存通告时出错。"
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "添加回复时数据库出错:%s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+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 消息"
-#: classes/User_group.php:380
+#: classes/User_group.php:423
msgid "Could not create group."
msgstr "无法创建组。"
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "无法删除订阅。"
@@ -4757,28 +4789,40 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr "全部"
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr "注册证"
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr "分页"
-#: lib/action.php:1139
+#: lib/action.php:1141
#, fuzzy
msgid "After"
msgstr "« 之后"
-#: lib/action.php:1147
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "之前 »"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
#, fuzzy
msgid "You cannot make changes to this site."
@@ -5093,80 +5137,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
+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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "取消订阅 %s"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "您未告知此个人信息"
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "您已订阅这些用户:"
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "无法订阅他人更新。"
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "无法订阅他人更新。"
-#: lib/command.php:712
+#: lib/command.php:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "您未告知此个人信息"
-#: lib/command.php:714
+#: lib/command.php:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5180,6 +5233,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5207,20 +5261,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "没有验证码"
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
#, fuzzy
msgid "Go to the installer."
msgstr "登入本站"
@@ -5659,7 +5713,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr " 从 "
@@ -5786,53 +5840,53 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "否"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "没有内容!"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "创建"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
#, fuzzy
msgid "Reply to this notice"
msgstr "无法删除通告。"
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
#, fuzzy
msgid "Reply"
msgstr "回复"
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "消息已发布。"
@@ -5867,11 +5921,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 +6112,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"
@@ -6151,70 +6169,70 @@ msgstr "头像"
msgid "User actions"
msgstr "未知动作"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "个人设置"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
#, fuzzy
msgid "Send a direct message to this user"
msgstr "无法向此用户发送消息。"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
#, fuzzy
msgid "Message"
msgstr "新消息"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr "几秒前"
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr "一分钟前"
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr "%d 分钟前"
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr "一小时前"
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr "%d 小时前"
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr "一天前"
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr "%d 天前"
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr "一个月前"
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr "%d 个月前"
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr "一年前"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 815f95eac..ff517edec 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-11 08:14+0000\n"
-"PO-Revision-Date: 2010-02-11 08:16:25+0000\n"
+"POT-Creation-Date: 2010-02-24 23:49+0000\n"
+"PO-Revision-Date: 2010-02-24 23:52:03+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 (r62295); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r62925); 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"
@@ -63,7 +63,7 @@ msgstr ""
#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/subscriptions.php:208 actions/tagother.php:154
#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
#: lib/applicationeditform.php:334 lib/designsettings.php:256
#: lib/groupeditform.php:202
@@ -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 "無此使用者"
@@ -166,8 +165,8 @@ msgstr ""
msgid "You and friends"
msgstr "%s與好友"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr ""
@@ -188,12 +187,12 @@ msgstr ""
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:155
-#: actions/apitimelinegroup.php:150 actions/apitimelinehome.php:156
-#: actions/apitimelinementions.php:151 actions/apitimelinepublic.php:131
+#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
+#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184
+#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
-#: actions/apitimelineuser.php:166 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
+#: actions/apitimelineuser.php:207 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "確認碼遺失"
@@ -501,7 +500,7 @@ msgstr "尺寸錯誤"
#: actions/profilesettings.php:194 actions/recoverpassword.php:337
#: actions/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
@@ -645,7 +644,7 @@ msgstr ""
msgid "%1$s / Favorites from %2$s"
msgstr "%1$s的狀態是%2$s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "&s的微型部落格"
@@ -656,7 +655,7 @@ msgstr "&s的微型部落格"
msgid "%s timeline"
msgstr ""
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126
#: actions/userrss.php:92
#, php-format
msgid "Updates from %1$s on %2$s!"
@@ -672,12 +671,12 @@ msgstr "%1$s的狀態是%2$s"
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr ""
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr ""
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:115 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr ""
@@ -687,7 +686,7 @@ msgstr ""
msgid "Repeated to %s"
msgstr ""
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, php-format
msgid "Repeats of %s"
msgstr ""
@@ -697,7 +696,7 @@ msgstr ""
msgid "Notices tagged with %s"
msgstr ""
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:64
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "&s的微型部落格"
@@ -761,7 +760,7 @@ msgid "Preview"
msgstr ""
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:624
+#: lib/deleteuserform.php:66 lib/noticelist.php:637
msgid "Delete"
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:1195
+#: lib/action.php:1197
msgid "There was a problem with your session token."
msgstr ""
@@ -981,7 +980,7 @@ msgstr "請在140個字以內描述你自己與你的興趣"
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
#: lib/settingsaction.php:72
@@ -1011,7 +1010,7 @@ msgstr ""
msgid "Do not delete this notice"
msgstr "無此通知"
-#: actions/deletenotice.php:146 lib/noticelist.php:624
+#: actions/deletenotice.php:146 lib/noticelist.php:637
msgid "Delete this notice"
msgstr ""
@@ -1268,7 +1267,7 @@ msgstr "自我介紹過長(共140個字元)"
msgid "Could not update group."
msgstr "無法更新使用者"
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:259 classes/User_group.php:433
#, fuzzy
msgid "Could not create aliases."
msgstr "無法存取個人圖像資料"
@@ -2293,7 +2292,7 @@ msgid "Only "
msgstr ""
#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040
-#: lib/api.php:1068 lib/api.php:1178
+#: lib/api.php:1068 lib/api.php:1177
msgid "Not a supported data format."
msgstr ""
@@ -2740,25 +2739,25 @@ msgstr ""
msgid "Invalid tag: \"%s\""
msgstr "個人首頁連結%s無效"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr ""
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "無法儲存個人資料"
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "無法儲存個人資料"
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
#, fuzzy
msgid "Couldn't save tags."
msgstr "無法儲存個人資料"
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:137
msgid "Settings saved."
msgstr ""
@@ -3114,7 +3113,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr ""
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:368
msgid "Subscribe"
msgstr ""
@@ -3153,7 +3152,7 @@ msgstr ""
msgid "You already repeated that notice."
msgstr "無此使用者"
-#: actions/repeat.php:114 lib/noticelist.php:642
+#: actions/repeat.php:114 lib/noticelist.php:656
#, fuzzy
msgid "Repeated"
msgstr "新增"
@@ -3836,17 +3835,26 @@ 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 "註冊失敗"
-#: actions/subscribe.php:55
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
#, fuzzy
-msgid "Not a local user."
-msgstr "無此使用者"
+msgid "No such profile."
+msgstr "無此通知"
+
+#: actions/subscribe.php:117
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
-#: actions/subscribe.php:69
+#: actions/subscribe.php:145
#, fuzzy
msgid "Subscribed"
msgstr "此帳號已註冊"
@@ -3907,7 +3915,7 @@ msgstr ""
msgid "These are the people whose notices %s listens to."
msgstr ""
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3917,17 +3925,17 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "現在%1$s在%2$s成為你的粉絲囉"
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
#, fuzzy
msgid "Jabber"
msgstr "查無此Jabber ID"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr ""
@@ -4335,61 +4343,82 @@ msgstr ""
msgid "DB error inserting hashtag: %s"
msgstr ""
-#: classes/Notice.php:214
+#: classes/Notice.php:222
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "儲存使用者發生錯誤"
-#: classes/Notice.php:218
+#: classes/Notice.php:226
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "儲存使用者發生錯誤"
-#: classes/Notice.php:223
+#: classes/Notice.php:231
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
-#: classes/Notice.php:229
+#: classes/Notice.php:237
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:243
msgid "You are banned from posting notices on this site."
msgstr ""
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:309 classes/Notice.php:335
msgid "Problem saving notice."
msgstr ""
-#: classes/Notice.php:788
+#: classes/Notice.php:882
#, fuzzy
msgid "Problem saving group inbox."
msgstr "儲存使用者發生錯誤"
-#: classes/Notice.php:848
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "增加回覆時,資料庫發生錯誤: %s"
-
-#: classes/Notice.php:1235
+#: classes/Notice.php:1407
#, 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 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "無法刪除帳號"
+
+#: classes/User.php:372
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr ""
-#: classes/User_group.php:380
+#: classes/User_group.php:423
#, fuzzy
msgid "Could not create group."
msgstr "無法存取個人圖像資料"
-#: classes/User_group.php:409
+#: classes/User_group.php:452
#, fuzzy
msgid "Could not set group membership."
msgstr "註冊失敗"
@@ -4596,27 +4625,39 @@ msgstr ""
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:827
msgid "All "
msgstr ""
-#: lib/action.php:831
+#: lib/action.php:833
msgid "license."
msgstr ""
-#: lib/action.php:1130
+#: lib/action.php:1132
msgid "Pagination"
msgstr ""
-#: lib/action.php:1139
+#: lib/action.php:1141
msgid "After"
msgstr ""
-#: lib/action.php:1147
+#: lib/action.php:1149
#, fuzzy
msgid "Before"
msgstr "之前的內容»"
+#: lib/activity.php:382
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:410
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:414
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr ""
@@ -4919,80 +4960,90 @@ 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 lib/command.php:685
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:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "此帳號已註冊"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "此帳號已註冊"
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "此帳號已註冊"
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "無此訂閱"
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "無此訂閱"
-#: lib/command.php:712
+#: lib/command.php:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "無法連結到伺服器:%s"
-#: lib/command.php:714
+#: lib/command.php:755
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:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5006,6 +5057,7 @@ msgid ""
"d <nickname> <text> - direct message to user\n"
"get <nickname> - get last notice from user\n"
"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
"fav <nickname> - add user's last notice as a 'fave'\n"
"fav #<notice_id> - add notice with the given id as a 'fave'\n"
"repeat #<notice_id> - repeat a notice with a given id\n"
@@ -5033,20 +5085,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:136
#, fuzzy
msgid "No configuration file found. "
msgstr "無確認碼"
-#: lib/common.php:136
+#: lib/common.php:137
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:138
+#: lib/common.php:139
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:139
+#: lib/common.php:140
msgid "Go to the installer."
msgstr ""
@@ -5469,7 +5521,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
msgid "from"
msgstr ""
@@ -5594,50 +5646,50 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "N"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:547
+#: lib/noticelist.php:558
#, fuzzy
msgid "in context"
msgstr "無內容"
-#: lib/noticelist.php:572
+#: lib/noticelist.php:583
#, fuzzy
msgid "Repeated by"
msgstr "新增"
-#: lib/noticelist.php:598
+#: lib/noticelist.php:610
msgid "Reply to this notice"
msgstr ""
-#: lib/noticelist.php:599
+#: lib/noticelist.php:611
msgid "Reply"
msgstr ""
-#: lib/noticelist.php:641
+#: lib/noticelist.php:655
#, fuzzy
msgid "Notice repeated"
msgstr "更新個人圖像"
@@ -5671,10 +5723,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 +5906,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"
@@ -5941,68 +5959,68 @@ msgstr "個人圖像"
msgid "User actions"
msgstr ""
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "線上即時通設定"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
msgid "Send a direct message to this user"
msgstr ""
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
msgid "Message"
msgstr ""
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:870
+#: lib/util.php:952
msgid "a few seconds ago"
msgstr ""
-#: lib/util.php:872
+#: lib/util.php:954
msgid "about a minute ago"
msgstr ""
-#: lib/util.php:874
+#: lib/util.php:956
#, php-format
msgid "about %d minutes ago"
msgstr ""
-#: lib/util.php:876
+#: lib/util.php:958
msgid "about an hour ago"
msgstr ""
-#: lib/util.php:878
+#: lib/util.php:960
#, php-format
msgid "about %d hours ago"
msgstr ""
-#: lib/util.php:880
+#: lib/util.php:962
msgid "about a day ago"
msgstr ""
-#: lib/util.php:882
+#: lib/util.php:964
#, php-format
msgid "about %d days ago"
msgstr ""
-#: lib/util.php:884
+#: lib/util.php:966
msgid "about a month ago"
msgstr ""
-#: lib/util.php:886
+#: lib/util.php:968
#, php-format
msgid "about %d months ago"
msgstr ""
-#: lib/util.php:888
+#: lib/util.php:970
msgid "about a year ago"
msgstr ""