From 86c8e13466252b2ccde553bcf2793d78696eec43 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sat, 13 Mar 2010 00:48:53 +0100 Subject: Localisation updates for !StatusNet from !translatewiki.net !sntrans Signed-off-by: Siebrand Mazeland --- locale/ar/LC_MESSAGES/statusnet.po | 377 ++++++++++-------- locale/arz/LC_MESSAGES/statusnet.po | 338 ++++++++-------- locale/bg/LC_MESSAGES/statusnet.po | 340 ++++++++-------- locale/br/LC_MESSAGES/statusnet.po | 333 ++++++++-------- locale/ca/LC_MESSAGES/statusnet.po | 340 ++++++++-------- locale/cs/LC_MESSAGES/statusnet.po | 341 ++++++++-------- locale/de/LC_MESSAGES/statusnet.po | 443 ++++++++++++--------- locale/el/LC_MESSAGES/statusnet.po | 336 ++++++++-------- locale/en_GB/LC_MESSAGES/statusnet.po | 338 ++++++++-------- locale/es/LC_MESSAGES/statusnet.po | 338 ++++++++-------- locale/fa/LC_MESSAGES/statusnet.po | 337 ++++++++-------- locale/fi/LC_MESSAGES/statusnet.po | 340 ++++++++-------- locale/fr/LC_MESSAGES/statusnet.po | 340 ++++++++-------- locale/ga/LC_MESSAGES/statusnet.po | 340 ++++++++-------- locale/he/LC_MESSAGES/statusnet.po | 341 ++++++++-------- locale/hsb/LC_MESSAGES/statusnet.po | 536 +++++++++++-------------- locale/ia/LC_MESSAGES/statusnet.po | 475 +++++++++++----------- locale/is/LC_MESSAGES/statusnet.po | 340 ++++++++-------- locale/it/LC_MESSAGES/statusnet.po | 338 ++++++++-------- locale/ja/LC_MESSAGES/statusnet.po | 337 ++++++++-------- locale/ko/LC_MESSAGES/statusnet.po | 340 ++++++++-------- locale/mk/LC_MESSAGES/statusnet.po | 338 ++++++++-------- locale/nb/LC_MESSAGES/statusnet.po | 717 +++++++++++++++++----------------- locale/nl/LC_MESSAGES/statusnet.po | 338 ++++++++-------- locale/nn/LC_MESSAGES/statusnet.po | 340 ++++++++-------- locale/pl/LC_MESSAGES/statusnet.po | 338 ++++++++-------- locale/pt/LC_MESSAGES/statusnet.po | 337 ++++++++-------- locale/pt_BR/LC_MESSAGES/statusnet.po | 362 +++++++++-------- locale/ru/LC_MESSAGES/statusnet.po | 338 ++++++++-------- locale/statusnet.po | 329 ++++++++-------- locale/sv/LC_MESSAGES/statusnet.po | 338 ++++++++-------- locale/te/LC_MESSAGES/statusnet.po | 548 +++++++++++++------------- locale/tr/LC_MESSAGES/statusnet.po | 337 ++++++++-------- locale/uk/LC_MESSAGES/statusnet.po | 340 ++++++++-------- locale/vi/LC_MESSAGES/statusnet.po | 341 ++++++++-------- locale/zh_CN/LC_MESSAGES/statusnet.po | 340 ++++++++-------- locale/zh_TW/LC_MESSAGES/statusnet.po | 338 ++++++++-------- 37 files changed, 6948 insertions(+), 6659 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 56029bc82..16e050cee 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:16+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:42:03+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -94,7 +94,7 @@ msgstr "لا صفحة كهذه" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -103,10 +103,8 @@ msgstr "لا صفحة كهذه" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "لا مستخدم كهذا." @@ -199,12 +197,12 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "لم يتم العثور على وسيلة API." @@ -331,7 +329,7 @@ msgstr "" msgid "This status is already a favorite." msgstr "هذه الحالة مفضلة بالفعل." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "تعذّر إنشاء مفضلة." @@ -448,7 +446,7 @@ msgstr "لم توجد المجموعة!" msgid "You are already a member of that group." msgstr "" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "" @@ -499,7 +497,7 @@ msgstr "حجم غير صالح." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -636,12 +634,12 @@ msgstr "" msgid "Unsupported format." msgstr "نسق غير مدعوم." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" @@ -651,7 +649,7 @@ msgstr "" msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" @@ -661,7 +659,7 @@ msgstr "" msgid "%s public timeline" msgstr "مسار %s الزمني العام" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -676,12 +674,12 @@ msgstr "كرر إلى %s" msgid "Repeats of %s" msgstr "تكرارات %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "الإشعارات الموسومة ب%s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -741,7 +739,7 @@ msgid "Preview" msgstr "معاينة" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "احذف" @@ -821,8 +819,8 @@ msgstr "فشل حفظ معلومات المنع." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "لا مجموعة كهذه." @@ -923,7 +921,7 @@ msgstr "أنت لست مالك هذا التطبيق." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "" @@ -979,7 +977,7 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟" msgid "Do not delete this notice" msgstr "لا تحذف هذا الإشعار" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "احذف هذا الإشعار" @@ -1228,7 +1226,7 @@ msgstr "" msgid "Could not update group." msgstr "تعذر تحديث المجموعة." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "تعذّر إنشاء الكنى." @@ -1892,7 +1890,7 @@ msgstr "دعوة مستخدمين جدد" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1993,7 +1991,7 @@ msgstr "%1$s انضم للمجموعة %2$s" msgid "You must be logged in to leave a group." msgstr "يجب أن تلج لتغادر مجموعة." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "لست عضوا في تلك المجموعة." @@ -2103,12 +2101,12 @@ msgstr "استخدم هذا النموذج لإنشاء مجموعة جديدة. msgid "New message" msgstr "رسالة جديدة" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "لا يمكنك إرسال رسائل إلى هذا المستخدم." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "لا محتوى!" @@ -2116,7 +2114,7 @@ msgstr "لا محتوى!" msgid "No recipient specified." msgstr "لا مستلم حُدّد." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2130,7 +2128,7 @@ msgstr "أُرسلت الرسالة" msgid "Direct message to %s sent." msgstr "رسالة مباشرة ل%s تم إرسالها." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "خطأ أجاكس" @@ -2256,8 +2254,8 @@ msgstr "نوع المحتوى " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "ليس نسق بيانات مدعوم." @@ -2388,7 +2386,7 @@ msgstr "كلمة السر القديمة غير صحيحة" msgid "Error saving user; invalid." msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "تعذّر حفظ كلمة السر الجديدة." @@ -2872,7 +2870,7 @@ msgstr "أعد ضبط كلمة السر" msgid "Recover password" msgstr "استعد كلمة السر" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "طُلبت استعادة كلمة السر" @@ -2892,41 +2890,41 @@ msgstr "أعد الضبط" msgid "Enter a nickname or email address." msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكتروني." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "" -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "خطأ أثناء حفظ تأكيد العنوان." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "يجب أن تكون كلمة السر 6 محارف أو أكثر." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "" -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "خطأ أثناء ضبط المستخدم." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" @@ -3101,7 +3099,7 @@ msgstr "لا يمكنك تكرار ملاحظتك الشخصية." msgid "You already repeated that notice." msgstr "أنت كررت هذه الملاحظة بالفعل." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "مكرر" @@ -4288,19 +4286,19 @@ msgstr "النسخة" msgid "Author(s)" msgstr "المؤلف(ون)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4375,7 +4373,7 @@ msgstr "مشكلة أثناء حفظ الإشعار." msgid "Problem saving group inbox." msgstr "مشكلة أثناء حفظ الإشعار." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تي @%1$s %2$s" @@ -4405,29 +4403,29 @@ msgstr "لم يمكن حذف اشتراك ذاتي." msgid "Couldn't delete subscription OMB token." msgstr "تعذّر حذف الاشتراك." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "تعذّر حذف الاشتراك." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "أهلا بكم في %1$s يا @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "تعذّر إنشاء المجموعة." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "تعذّر ضبط عضوية المجموعة." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "تعذّر ضبط عضوية المجموعة." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "تعذّر حفظ الاشتراك." @@ -4633,7 +4631,7 @@ msgstr "الجسر" msgid "StatusNet software license" msgstr "رخصة برنامج StatusNet" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4642,12 +4640,12 @@ msgstr "" "**%%site.name%%** خدمة تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4658,41 +4656,41 @@ msgstr "" "المتوفر تحت [رخصة غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/" "agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "رخصة محتوى الموقع" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "" -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "الرخصة." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "بعد" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "قبل" @@ -4795,7 +4793,7 @@ msgstr "ضبط المسارات" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4823,7 +4821,7 @@ msgstr "مسار المصدر" #: lib/applicationeditform.php:218 msgid "URL of the homepage of this application" -msgstr "" +msgstr "مسار صفحة هذا التطبيق" #: lib/applicationeditform.php:224 msgid "Organization responsible for this application" @@ -4893,37 +4891,50 @@ msgstr "تغيير كلمة السر فشل" msgid "Password changing is not allowed" msgstr "تغيير كلمة السر غير مسموح به" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "نتائج الأمر" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "اكتمل الأمر" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "فشل الأمر" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "" +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "الملاحظة بهذا الرقم غير موجودة" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "ليس للمستخدم إشعار أخير" + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "لم يمكن إيجاد مستخدم بالاسم %s" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "لم يمكن إيجاد مستخدم بالاسم %s" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "التنبيه تم إرساله إلى %s" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -4934,169 +4945,167 @@ msgstr "" "المشتركون: %2$s\n" "الإشعارات: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "الملاحظة بهذا الرقم غير موجودة" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "ليس للمستخدم إشعار أخير" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "أنت بالفعل عضو في هذه المجموعة" -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "لم يمكن ضم المستخدم %s إلى المجموعة %s" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s انضم إلى مجموعة %s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "لم يمكن إزالة المستخدم %s من المجموعة %s" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s ترك المجموعة %s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "الاسم الكامل: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "الموقع: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "الصفحة الرئيسية: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "عن: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "رسالة مباشرة إلى %s تم إرسالها" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "لا يمكنك تكرار ملاحظتك الخاصة" -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "كرر بالفعل هذا الإشعار" -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "الإشعار من %s مكرر" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "خطأ تكرار الإشعار." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "رُد على رسالة %s" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "خطأ أثناء حفظ الإشعار." -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "لا مستخدم كهذا" +#: lib/command.php:602 +msgid "Can't subscribe to OMB profiles by command." +msgstr "" -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "مُشترك ب%s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "الأمر لم يُجهزّ بعد." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "الإشعار مُطفأ." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "تعذّر إطفاء الإشعارات." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "الإشعار يعمل." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "تعذّر تشغيل الإشعار." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "ألغِ الاشتراك" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "لست مُشتركًا بأي أحد." -#: lib/command.php:711 +#: lib/command.php:754 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "لست مشتركًا بأحد." @@ -5106,11 +5115,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "لا أحد مشترك بك." -#: lib/command.php:733 +#: lib/command.php:776 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "لا أحد مشترك بك." @@ -5120,11 +5129,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "لست عضوًا في أي مجموعة." -#: lib/command.php:755 +#: lib/command.php:798 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "لست عضوًا في أي مجموعة." @@ -5134,7 +5143,7 @@ msgstr[3] "أنت عضو في هذه المجموعات:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5175,6 +5184,44 @@ msgid "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" msgstr "" +"الأوامر:\n" +"on - شغّل الإشعار\n" +"off - أطفئ الإشعار\n" +"help - أظهر هذه المساعدة\n" +"follow - اشترك بالمستخدم\n" +"groups - اسرد المجموعات التي أنا عضو فيها\n" +"subscriptions - اسرد الذين أتابعهم\n" +"subscribers - اسرد الذين يتابعونني\n" +"leave - ألغِ الاشتراك بمستخدم\n" +"d - وجّه رسالة مباشرة إلى مستخدم\n" +"get - اجلب آخر رسالة من مستخدم\n" +"whois - اجلب معلومات ملف المستخدم\n" +"lose - أجبر المستخدم على عدم تتبعك\n" +"fav - اجعل آخر إشعار من المستخدم مفضلًا\n" +"fav # - اجعل الإشعار ذا رقم الهوية المعطى مفضلا\n" +"repeat # - كرّر الإشعار ذا رقم الهوية المعطى\n" +"repeat - كرّر آخر إشعار من المستخدم\n" +"reply # - رُد على الإشعار ذي رقم الهوية المعطى\n" +"reply - رُد على آخر إشعار من المستخدم\n" +"join - انضم إلى مجموعة\n" +"login - اجلب وصلة الولوج إلى واجهة الوب\n" +"drop - اترك المجموعة\n" +"stats - اجلب إحصاءاتك\n" +"stop - مثل 'off'\n" +"quit - مثل 'off'\n" +"sub - مثل 'follow'\n" +"unsub - مثل 'leave'\n" +"last - مثل 'get'\n" +"on - لم يطبق بعد.\n" +"off - لم يطبق بعد.\n" +"nudge - ذكّر مستخدمًا بإشعار أرسلته.\n" +"invite - لم يطبق بعد.\n" +"track - لم يطبق بعد.\n" +"untrack - لم يطبق بعد.\n" +"track off - لم يطبق بعد.\n" +"untrack all - لم يطبق بعد.\n" +"tracks - لم يطبق بعد.\n" +"tracking - لم يطبق بعد.\n" #: lib/common.php:148 msgid "No configuration file found. " @@ -5362,49 +5409,49 @@ msgstr "وسوم في إشعارات المجموعة %s" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "" - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "" -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "نوع ملف غير معروف" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "ميجابايت" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "كيلوبايت" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "مصدر صندوق وارد غير معروف %d." @@ -5621,7 +5668,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "من" @@ -5771,23 +5818,23 @@ msgstr "غ" msgid "at" msgstr "في" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "في السياق" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "مكرر بواسطة" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "رُد على هذا الإشعار" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "رُد" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "الإشعار مكرر" @@ -6098,47 +6145,47 @@ msgctxt "role" msgid "Moderator" msgstr "مراقب" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "قبل لحظات قليلة" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "قبل دقيقة تقريبًا" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "قبل ساعة تقريبًا" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "قبل يوم تقريبا" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "قبل شهر تقريبًا" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "قبل سنة تقريبًا" @@ -6152,7 +6199,7 @@ msgstr "%s ليس لونًا صحيحًا!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index aaf1d89bd..7b6735e0e 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:19+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:42:07+0000\n" "Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -100,7 +100,7 @@ msgstr "لا صفحه كهذه" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -109,10 +109,8 @@ msgstr "لا صفحه كهذه" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "لا مستخدم كهذا." @@ -205,12 +203,12 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "الـ API method مش موجوده." @@ -337,7 +335,7 @@ msgstr "" msgid "This status is already a favorite." msgstr "الحاله دى موجوده فعلا فى التفضيلات." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "تعذّر إنشاء مفضله." @@ -454,7 +452,7 @@ msgstr "لم توجد المجموعة!" msgid "You are already a member of that group." msgstr "" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "" @@ -505,7 +503,7 @@ msgstr "حجم غير صالح." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -642,12 +640,12 @@ msgstr "" msgid "Unsupported format." msgstr "نسق غير مدعوم." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" @@ -657,7 +655,7 @@ msgstr "" msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" @@ -667,7 +665,7 @@ msgstr "" msgid "%s public timeline" msgstr "مسار %s الزمنى العام" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -682,12 +680,12 @@ msgstr "كرر إلى %s" msgid "Repeats of %s" msgstr "تكرارات %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "الإشعارات الموسومه ب%s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -747,7 +745,7 @@ msgid "Preview" msgstr "عاين" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "احذف" @@ -827,8 +825,8 @@ msgstr "فشل حفظ معلومات المنع." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "لا مجموعه كهذه." @@ -931,7 +929,7 @@ msgstr "انت مش بتملك الapplication دى." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "" @@ -990,7 +988,7 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟" msgid "Do not delete this notice" msgstr "لا تحذف هذا الإشعار" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "احذف هذا الإشعار" @@ -1240,7 +1238,7 @@ msgstr "" msgid "Could not update group." msgstr "تعذر تحديث المجموعه." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "تعذّر إنشاء الكنى." @@ -1904,7 +1902,7 @@ msgstr "دعوه مستخدمين جدد" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2006,7 +2004,7 @@ msgstr "%1$s دخل جروپ %2$s" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "لست عضوا فى تلك المجموعه." @@ -2116,12 +2114,12 @@ msgstr "استخدم هذا النموذج لإنشاء مجموعه جديده. msgid "New message" msgstr "رساله جديدة" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "لا محتوى!" @@ -2129,7 +2127,7 @@ msgstr "لا محتوى!" msgid "No recipient specified." msgstr "لا مستلم حُدّد." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2143,7 +2141,7 @@ msgstr "أُرسلت الرسالة" msgid "Direct message to %s sent." msgstr "رساله مباشره اتبعتت لـ%s." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "خطأ أجاكس" @@ -2267,8 +2265,8 @@ msgstr "نوع المحتوى " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr " مش نظام بيانات مدعوم." @@ -2399,7 +2397,7 @@ msgstr "كلمه السر القديمه غير صحيحة" msgid "Error saving user; invalid." msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "تعذّر حفظ كلمه السر الجديده." @@ -2882,7 +2880,7 @@ msgstr "أعد ضبط كلمه السر" msgid "Recover password" msgstr "استعد كلمه السر" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "طُلبت استعاده كلمه السر" @@ -2902,41 +2900,41 @@ msgstr "أعد الضبط" msgid "Enter a nickname or email address." msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكترونى." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "" -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "خطأ أثناء حفظ تأكيد العنوان." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "يجب أن تكون كلمه السر 6 محارف أو أكثر." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "" -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "خطأ أثناء ضبط المستخدم." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" @@ -3111,7 +3109,7 @@ msgstr "ما ينفعش تكرر الملاحظه بتاعتك." msgid "You already repeated that notice." msgstr "انت عيدت الملاحظه دى فعلا." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "مكرر" @@ -4291,19 +4289,19 @@ msgstr "النسخه" msgid "Author(s)" msgstr "المؤلف/ين" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4379,7 +4377,7 @@ msgstr "مشكله أثناء حفظ الإشعار." msgid "Problem saving group inbox." msgstr "مشكله أثناء حفظ الإشعار." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تى @%1$s %2$s" @@ -4409,29 +4407,29 @@ msgstr "ما نفعش يمسح الاشتراك الشخصى." msgid "Couldn't delete subscription OMB token." msgstr "تعذّر حذف الاشتراك." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "تعذّر حذف الاشتراك." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "أهلا بكم فى %1$s يا @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "تعذّر إنشاء المجموعه." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "تعذّر ضبط عضويه المجموعه." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "تعذّر ضبط عضويه المجموعه." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "تعذّر حفظ الاشتراك." @@ -4653,7 +4651,7 @@ msgstr "" msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4662,12 +4660,12 @@ msgstr "" "**%%site.name%%** خدمه تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4678,41 +4676,41 @@ msgstr "" "المتوفر تحت [رخصه غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/" "agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "رخصه محتوى الموقع" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "" -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "الرخصه." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "بعد" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "قبل" @@ -4821,7 +4819,7 @@ msgstr "ضبط المسارات" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4919,37 +4917,50 @@ msgstr "تغيير الپاسوورد فشل" msgid "Password changing is not allowed" msgstr "تغيير الپاسوورد مش مسموح" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "نتائج الأمر" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "اكتمل الأمر" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "فشل الأمر" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "" +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "الملاحظه بالـID ده مالهاش وجود" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "ليس للمستخدم إشعار أخير" + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "ما نفعش يلاقى يوزر بإسم %s" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "ما نفعش يلاقى يوزر بإسم %s" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "Nudge اتبعتت لـ %s" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -4960,170 +4971,167 @@ msgstr "" "المشتركون: %2$s\n" "الإشعارات: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "الملاحظه بالـID ده مالهاش وجود" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "ليس للمستخدم إشعار أخير" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "انت اصلا عضو فى الجروپ ده" -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "ما نفعش يدخل اليوزر %s لجروپ %s" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s انضم إلى مجموعه %s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "ما نفعش يشيل اليوزر %s لجروپ %s" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s ساب الجروپ %s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "الاسم الكامل: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "الموقع: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "الصفحه الرئيسية: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "عن: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "رساله مباشره اتبعتت لـ %s" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "الملاحظه بتاعتك مش نافعه تتكرر" -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "كرر بالفعل هذا الإشعار" -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "الإشعار من %s مكرر" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "خطأ تكرار الإشعار." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "رُد على رساله %s" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "خطأ أثناء حفظ الإشعار." -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 -#, fuzzy -msgid "No such user" -msgstr "لا مستخدم كهذا." +#: lib/command.php:602 +msgid "Can't subscribe to OMB profiles by command." +msgstr "" -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "مُشترك ب%s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "ألغِ الاشتراك" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "لست مُشتركًا بأى أحد." -#: lib/command.php:711 +#: lib/command.php:754 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "لست مشتركًا بأحد." @@ -5133,11 +5141,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "لا أحد مشترك بك." -#: lib/command.php:733 +#: lib/command.php:776 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "لا أحد مشترك بك." @@ -5147,11 +5155,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "لست عضوًا فى أى مجموعه." -#: lib/command.php:755 +#: lib/command.php:798 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "لست عضوًا فى أى مجموعه." @@ -5161,7 +5169,7 @@ msgstr[3] "أنت عضو فى هذه المجموعات:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5389,49 +5397,49 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "" - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "" -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "نوع ملف غير معروف" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "ميجابايت" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "كيلوبايت" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "مصدر الـinbox مش معروف %d." @@ -5626,7 +5634,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "من" @@ -5777,23 +5785,23 @@ msgstr "غ" msgid "at" msgstr "في" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "فى السياق" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "متكرر من" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "رُد على هذا الإشعار" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "رُد" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "الإشعار مكرر" @@ -6105,47 +6113,47 @@ msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "قبل لحظات قليلة" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "قبل دقيقه تقريبًا" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "قبل ساعه تقريبًا" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "قبل يوم تقريبا" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "قبل شهر تقريبًا" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "قبل سنه تقريبًا" @@ -6159,7 +6167,7 @@ msgstr "%s ليس لونًا صحيحًا!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 3a6b5b047..57d024979 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:22+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:42:10+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -95,7 +95,7 @@ msgstr "Няма такака страница." #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -104,10 +104,8 @@ msgstr "Няма такака страница." #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Няма такъв потребител" @@ -200,12 +198,12 @@ msgstr "Бележки от %1$s и приятели в %2$s." #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "Не е открит методът в API." @@ -337,7 +335,7 @@ msgstr "Не е открита бележка с такъв идентифика msgid "This status is already a favorite." msgstr "Тази бележка вече е отбелязана като любима!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Грешка при отбелязване като любима." @@ -459,7 +457,7 @@ msgstr "Групата не е открита." msgid "You are already a member of that group." msgstr "Вече членувате в тази група." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "" @@ -510,7 +508,7 @@ msgstr "Неправилен размер." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -649,12 +647,12 @@ msgstr "" msgid "Unsupported format." msgstr "Неподдържан формат." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / Отбелязани като любими от %s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s бележки отбелязани като любими от %s / %s." @@ -664,7 +662,7 @@ msgstr "%s бележки отбелязани като любими от %s / % msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Реплики на %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s реплики на съобщения от %2$s / %3$s." @@ -674,7 +672,7 @@ msgstr "%1$s реплики на съобщения от %2$s / %3$s." msgid "%s public timeline" msgstr "Общ поток на %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -689,12 +687,12 @@ msgstr "Повторено за %s" msgid "Repeats of %s" msgstr "Повторения на %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Бележки с етикет %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Бележки от %1$s в %2$s." @@ -756,7 +754,7 @@ msgid "Preview" msgstr "Преглед" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Изтриване" @@ -836,8 +834,8 @@ msgstr "Грешка при записване данните за блокир #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "Няма такава група" @@ -943,7 +941,7 @@ msgstr "Не членувате в тази група." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "Имаше проблем със сесията ви в сайта." @@ -1002,7 +1000,7 @@ msgstr "Наистина ли искате да изтриете тази бел msgid "Do not delete this notice" msgstr "Да не се изтрива бележката" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Изтриване на бележката" @@ -1268,7 +1266,7 @@ msgstr "Описанието е твърде дълго (до %d символа) msgid "Could not update group." msgstr "Грешка при обновяване на групата." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "Грешка при отбелязване като любима." @@ -1969,7 +1967,7 @@ msgstr "Покани за нови потребители" msgid "You are already subscribed to these users:" msgstr "Вече сте абонирани за следните потребители:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2101,7 +2099,7 @@ msgstr "%s се присъедини към групата %s" msgid "You must be logged in to leave a group." msgstr "За напуснете група, трябва да сте влезли." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "Не членувате в тази група." @@ -2219,12 +2217,12 @@ msgstr "Използвайте тази бланка за създаване н msgid "New message" msgstr "Ново съобщение" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Не може да изпращате съобщения до този потребител." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Няма съдържание!" @@ -2232,7 +2230,7 @@ msgstr "Няма съдържание!" msgid "No recipient specified." msgstr "Не е указан получател." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2248,7 +2246,7 @@ msgstr "Съобщението е изпратено" msgid "Direct message to %s sent." msgstr "Прякото съобщение до %s е изпратено." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Грешка в Ajax" @@ -2377,8 +2375,8 @@ msgstr "вид съдържание " msgid "Only " msgstr "Само " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Неподдържан формат на данните" @@ -2516,7 +2514,7 @@ msgstr "Грешна стара парола" msgid "Error saving user; invalid." msgstr "Грешка при запазване на потребител — невалидност." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Грешка при запазване на новата парола." @@ -2999,7 +2997,7 @@ msgstr "Нова парола" msgid "Recover password" msgstr "Възстановяване на паролата" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Поискано е възстановяване на парола" @@ -3019,19 +3017,19 @@ msgstr "Обновяване" msgid "Enter a nickname or email address." msgstr "Въведете псевдоним или е-поща." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Няма потребител с такава е-поща или потребителско име." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Няма указана е-поща за този потребител." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Грешка при запазване на потвърждение за адрес" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3039,23 +3037,23 @@ msgstr "" "На е-пощата, с която сте регистрирани са изпратени инструкции за " "възстановяване на паролата." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Неочаквано подновяване на паролата." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Паролата трябва да е от поне 6 знака." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Паролата и потвърждението й не съвпадат." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Грешка в настройките на потребителя." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Новата парола е запазена. Влязохте успешно." @@ -3256,7 +3254,7 @@ msgstr "Не можете да повтаряте собствена бележ msgid "You already repeated that notice." msgstr "Вече сте повторили тази бележка." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Повторено" @@ -4471,19 +4469,19 @@ msgstr "Версия" msgid "Author(s)" msgstr "Автор(и)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4569,7 +4567,7 @@ msgstr "Проблем при записване на бележката." msgid "Problem saving group inbox." msgstr "Проблем при записване на бележката." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4602,30 +4600,30 @@ msgstr "Грешка при изтриване на абонамента." msgid "Couldn't delete subscription OMB token." msgstr "Грешка при изтриване на абонамента." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Грешка при изтриване на абонамента." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добре дошли в %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Грешка при създаване на групата." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Грешка при създаване на нов абонамент." -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "Грешка при създаване на нов абонамент." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Грешка при създаване на нов абонамент." @@ -4850,7 +4848,7 @@ msgstr "Табелка" msgid "StatusNet software license" msgstr "Лиценз на програмата StatusNet" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4859,12 +4857,12 @@ msgstr "" "**%%site.name%%** е услуга за микроблогване, предоставена ви от [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** е услуга за микроблогване. " -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4875,41 +4873,41 @@ msgstr "" "достъпна под [GNU Affero General Public License](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "Лиценз на съдържанието" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "Всички " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "лиценз." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Страниране" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "След" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Преди" @@ -5022,7 +5020,7 @@ msgstr "Настройка на пътищата" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5127,37 +5125,51 @@ msgstr "Паролата е записана." msgid "Password changing is not allowed" msgstr "Паролата е записана." -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Резултат от командата" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Командата е изпълнена" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Грешка при изпълнение на командата" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "За съжаление тази команда все още не се поддържа." +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "Не е открита бележка с такъв идентификатор." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "Потребителят няма последна бележка" + +#: lib/command.php:125 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Грешка при обновяване на потребител с потвърден email адрес." -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Грешка при обновяване на потребител с потвърден email адрес." + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "За съжаление тази команда все още не се поддържа." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "Изпратено е побутване на %s" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5168,198 +5180,196 @@ msgstr "" "Абонати: %2$s\n" "Бележки: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "Не е открита бележка с такъв идентификатор." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Потребителят няма последна бележка" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Бележката е отбелязана като любима." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "Вече членувате в тази група." -#: lib/command.php:231 +#: lib/command.php:331 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "Грешка при проследяване — потребителят не е намерен." -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s се присъедини към групата %s" -#: lib/command.php:275 +#: lib/command.php:373 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "Грешка при проследяване — потребителят не е намерен." -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s напусна групата %s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Пълно име: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Местоположение: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Домашна страница: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "Относно: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" "Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d." -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Прякото съобщение до %s е изпратено." -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Грешка при изпращане на прякото съобщение" -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "Не можете да повтаряте собствена бележка" -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "Вече сте повторили тази бележка." -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "Бележката от %s е повторена" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "Грешка при повтаряне на бележката." -#: lib/command.php:482 +#: lib/command.php:536 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d." -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "Отговорът до %s е изпратен" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "Грешка при записване на бележката." -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "Уточнете името на потребителя, за когото се абонирате." -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Няма такъв потребител" +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Не сте абонирани за този профил" -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Абонирани сте за %s." -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "Уточнете името на потребителя, от когото се отписвате." -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Отписани сте от %s." -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Командата все още не се поддържа." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Уведомлението е изключено." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "Грешка при изключване на уведомлението." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Уведомлението е включено." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "Грешка при включване на уведомлението." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Отписани сте от %s." -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "Не сте абонирани за никого." -#: lib/command.php:711 +#: lib/command.php:754 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Вече сте абонирани за следните потребители:" msgstr[1] "Вече сте абонирани за следните потребители:" -#: lib/command.php:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "Никой не е абониран за вас." -#: lib/command.php:733 +#: lib/command.php:776 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Грешка при абониране на друг потребител за вас." msgstr[1] "Грешка при абониране на друг потребител за вас." -#: lib/command.php:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "Не членувате в нито една група." -#: lib/command.php:755 +#: lib/command.php:798 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Не членувате в тази група." msgstr[1] "Не членувате в тази група." -#: lib/command.php:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5593,50 +5603,50 @@ msgstr "Етикети в бележките към групата %s" msgid "This page is not available in a media type you accept" msgstr "Страницата не е достъпна във вида медия, който приемате" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Форматът на файла с изображението не се поддържа." + +#: lib/imagefile.php:90 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Може да качите лого за групата ви." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Частично качване на файла." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Системна грешка при качване на файл." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Файлът не е изображение или е повреден." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Форматът на файла с изображението не се поддържа." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 #, fuzzy msgid "Lost our file." msgstr "Няма такава бележка." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Неподдържан вид файл" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, fuzzy, php-format msgid "Unknown inbox source %d." msgstr "Непознат език \"%s\"" @@ -5841,7 +5851,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "от" @@ -5995,23 +6005,23 @@ msgstr "З" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "в контекст" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "Повторено от" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Отговаряне на тази бележка" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Отговор" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "Бележката е повторена." @@ -6333,47 +6343,47 @@ msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "преди няколко секунди" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "преди около минута" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "преди около %d минути" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "преди около час" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "преди около %d часа" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "преди около ден" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "преди около %d дни" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "преди около месец" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "преди около %d месеца" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "преди около година" @@ -6387,7 +6397,7 @@ msgstr "%s не е допустим цвят!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s не е допустим цвят! Използвайте 3 или 6 шестнадесетични знака." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index 2197b9e74..613ecff7b 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:25+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:42:13+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" @@ -93,7 +93,7 @@ msgstr "N'eus ket eus ar bajenn-se" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -102,10 +102,8 @@ msgstr "N'eus ket eus ar bajenn-se" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "N'eus ket eus an implijer-se." @@ -198,12 +196,12 @@ msgstr "Hizivadennoù %1$s ha mignoned e %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "N'eo ket bet kavet an hentenn API !" @@ -332,7 +330,7 @@ msgstr "N'eo bet kavet statud ebet gant an ID-mañ." msgid "This status is already a favorite." msgstr "Ur pennroll eo dija an ali-mañ." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Diposupl eo krouiñ ar pennroll-mañ." @@ -450,7 +448,7 @@ msgstr "N'eo ket bet kavet ar strollad" msgid "You are already a member of that group." msgstr "Un ezel eus ar strollad-mañ eo dija." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "Stanket oc'h bet eus ar strollad-mañ gant ur merour." @@ -500,7 +498,7 @@ msgstr "Fichenn direizh." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -635,12 +633,12 @@ msgstr "" msgid "Unsupported format." msgstr "Diembreget eo ar furmad-se." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Pennroll %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s statud pennroll da %2$s / %2$s." @@ -650,7 +648,7 @@ msgstr "%1$s statud pennroll da %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Hizivadennoù a veneg %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" @@ -660,7 +658,7 @@ msgstr "" msgid "%s public timeline" msgstr "Oberezhioù publik %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s statud an holl !" @@ -675,12 +673,12 @@ msgstr "Adkemeret evit %s" msgid "Repeats of %s" msgstr "Adkemeret eus %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Alioù merket gant %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -740,7 +738,7 @@ msgid "Preview" msgstr "Rakwelet" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Diverkañ" @@ -820,8 +818,8 @@ msgstr "Diposubl eo enrollañ an titouroù stankañ." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "N'eus ket eus ar strollad-se." @@ -923,7 +921,7 @@ msgstr "N'oc'h ket perc'henn ar poellad-se." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "" @@ -979,7 +977,7 @@ msgstr "Ha sur oc'h ho peus c'hoant dilemel an ali-mañ ?" msgid "Do not delete this notice" msgstr "Arabat dilemel an ali-mañ" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Dilemel an ali-mañ" @@ -1228,7 +1226,7 @@ msgstr "re hir eo an deskrivadur (%d arouezenn d'ar muiañ)." msgid "Could not update group." msgstr "Diposubl eo hizivaat ar strollad." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Diposubl eo krouiñ an aliasoù." @@ -1891,7 +1889,7 @@ msgstr "Pediñ implijerien nevez" msgid "You are already subscribed to these users:" msgstr "Koumanantet oc'h dija d'an implijerien-mañ :" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1993,7 +1991,7 @@ msgstr "%1$s a zo bet er strollad %2$s" msgid "You must be logged in to leave a group." msgstr "Ret eo deoc'h bezañ kevreet evit kuitaat ur strollad" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "N'oc'h ket un ezel eus ar strollad-mañ." @@ -2110,12 +2108,12 @@ msgstr "Implijit ar furmskrid-mañ a-benn krouiñ ur strollad nevez." msgid "New message" msgstr "Kemennadenn nevez" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Ne c'helloc'h ket kas kemennadennoù d'an implijer-mañ." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Goullo eo !" @@ -2123,7 +2121,7 @@ msgstr "Goullo eo !" msgid "No recipient specified." msgstr "N'o peus ket lakaet a resever." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2139,7 +2137,7 @@ msgstr "Kaset eo bet ar gemenadenn" msgid "Direct message to %s sent." msgstr "Kaset eo bet da %s ar gemennadenn war-eeun." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Fazi Ajax" @@ -2263,8 +2261,8 @@ msgstr "seurt an danvez " msgid "Only " msgstr "Hepken " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "" @@ -2395,7 +2393,7 @@ msgstr "ger-termen kozh amreizh" msgid "Error saving user; invalid." msgstr "Ur fazi 'zo bet e-pad enolladenn an implijer ; diwiriek." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Dibosupl eo enrollañ ar ger-tremen nevez." @@ -2872,7 +2870,7 @@ msgstr "Adderaouekaat ar ger-tremen" msgid "Recover password" msgstr "Adtapout ar ger-tremen" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Goulennet eo an adtapout gerioù-tremen" @@ -2892,41 +2890,41 @@ msgstr "Adderaouekaat" msgid "Enter a nickname or email address." msgstr "Lakait ul lesanv pe ur chomlec'h postel." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "" -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "" -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "" -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" @@ -3101,7 +3099,7 @@ msgstr "Ne c'helloc'h ket adkemer ho ali deoc'h." msgid "You already repeated that notice." msgstr "Adkemeret o peus dija an ali-mañ." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Adlavaret" @@ -4271,19 +4269,19 @@ msgstr "Stumm" msgid "Author(s)" msgstr "Aozer(ien)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4357,7 +4355,7 @@ msgstr "" msgid "Problem saving group inbox." msgstr "" -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4387,28 +4385,28 @@ msgstr "" msgid "Couldn't delete subscription OMB token." msgstr "Diposubl eo dilemel ar postel kadarnadur." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "" -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "" -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "" -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "" -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "" @@ -4612,19 +4610,19 @@ msgstr "" msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%). " msgstr "" -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4632,41 +4630,41 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "Pep tra " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "aotre implijout." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Pajennadur" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "War-lerc'h" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Kent" @@ -4769,7 +4767,7 @@ msgstr "" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4867,37 +4865,50 @@ msgstr "" msgid "Password changing is not allowed" msgstr "" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "" + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "" -#: lib/command.php:92 +#: lib/command.php:143 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -4905,198 +4916,196 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "" -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s zo emezelet er strollad %s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s {{Gender:.|en|he}} deus kuitaet ar strollad %s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Anv klok : %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "Diwar-benn : %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "" -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "" -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "" -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" +#: lib/command.php:602 +msgid "Can't subscribe to OMB profiles by command." msgstr "" -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, php-format msgid "Unsubscribed %s" msgstr "" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:711 +#: lib/command.php:754 #, fuzzy msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "You are subscribed to this person:" msgstr[1] "You are subscribed to these people:" -#: lib/command.php:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:733 +#: lib/command.php:776 #, fuzzy msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "This person is subscribed to you:" msgstr[1] "These people are subscribed to you:" -#: lib/command.php:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:755 +#: lib/command.php:798 #, fuzzy msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "You are a member of this group:" msgstr[1] "You are a member of these groups:" -#: lib/command.php:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5324,49 +5333,49 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "" - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "" -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "Mo" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "Ko" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5561,7 +5570,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "eus" @@ -5711,23 +5720,23 @@ msgstr "K" msgid "at" msgstr "e" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Respont" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "" @@ -6040,47 +6049,47 @@ msgctxt "role" msgid "Moderator" msgstr "Habaskaat" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "un nebeud eilennoù zo" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "1 vunutenn zo well-wazh" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "%d munutenn zo well-wazh" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "1 eurvezh zo well-wazh" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "%d eurvezh zo well-wazh" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "1 devezh zo well-wazh" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "%d devezh zo well-wazh" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "miz zo well-wazh" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "%d miz zo well-wazh" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "bloaz zo well-wazh" @@ -6094,7 +6103,7 @@ msgstr "" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index bd7c5cd5a..80c46e2bb 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:29+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:42:16+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -101,7 +101,7 @@ msgstr "No existeix la pàgina." #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -110,10 +110,8 @@ msgstr "No existeix la pàgina." #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "No existeix aquest usuari." @@ -208,12 +206,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:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "No s'ha trobat el mètode API!" @@ -349,7 +347,7 @@ msgstr "No s'ha trobat cap estatus amb aquesta ID." msgid "This status is already a favorite." msgstr "Aquest estat ja és un preferit!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "No es pot crear favorit." @@ -473,7 +471,7 @@ msgstr "No s'ha trobat el grup!" msgid "You are already a member of that group." msgstr "Ja sou membre del grup." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "L'administrador us ha blocat del grup." @@ -524,7 +522,7 @@ msgstr "Mida invàlida." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -668,12 +666,12 @@ msgstr "" msgid "Unsupported format." msgstr "El format no està implementat." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / Preferits de %s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s actualitzacions favorites per %s / %s." @@ -683,7 +681,7 @@ msgstr "%s actualitzacions favorites per %s / %s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Notificacions contestant a %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format 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." @@ -693,7 +691,7 @@ msgstr "%1$s notificacions que responen a notificacions de %2$s / %3$s." msgid "%s public timeline" msgstr "%s línia temporal pública" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s notificacions de tots!" @@ -708,12 +706,12 @@ msgstr "Respostes a %s" msgid "Repeats of %s" msgstr "Repeticions de %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Aviso etiquetats amb %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualitzacions etiquetades amb %1$s el %2$s!" @@ -774,7 +772,7 @@ msgid "Preview" msgstr "Vista prèvia" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Suprimeix" @@ -856,8 +854,8 @@ msgstr "Error al guardar la informació del block." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "No s'ha trobat el grup." @@ -963,7 +961,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:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "Ha ocorregut algun problema amb la teva sessió." @@ -1026,7 +1024,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:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Eliminar aquesta nota" @@ -1288,7 +1286,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:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "No s'han pogut crear els àlies." @@ -1991,7 +1989,7 @@ msgstr "Invitar nous usuaris" msgid "You are already subscribed to these users:" msgstr "Ja estàs subscrit a aquests usuaris:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2124,7 +2122,7 @@ msgstr "%1$s s'ha unit al grup %2$s" msgid "You must be logged in to leave a group." msgstr "Has d'haver entrat per a poder marxar d'un grup." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "No ets membre d'aquest grup." @@ -2245,12 +2243,12 @@ msgstr "Utilitza aquest formulari per crear un nou grup." msgid "New message" msgstr "Nou missatge" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "No podeu enviar un misssatge a aquest usuari." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Cap contingut!" @@ -2258,7 +2256,7 @@ msgstr "Cap contingut!" msgid "No recipient specified." msgstr "No has especificat el destinatari." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "No t'enviïs missatges a tu mateix, simplement dir-te això." @@ -2272,7 +2270,7 @@ msgstr "S'ha enviat el missatge" msgid "Direct message to %s sent." msgstr "S'ha enviat un missatge directe a %s." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax Error" @@ -2402,8 +2400,8 @@ msgstr "tipus de contingut " msgid "Only " msgstr "Només " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Format de data no suportat." @@ -2541,7 +2539,7 @@ msgstr "Contrasenya antiga incorrecta" msgid "Error saving user; invalid." msgstr "Error en guardar usuari; invàlid." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "No es pot guardar la nova contrasenya." @@ -3040,7 +3038,7 @@ msgstr "Restablir contrasenya" msgid "Recover password" msgstr "Recuperar contrasenya" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Recuperació de contrasenya sol·licitada" @@ -3060,19 +3058,19 @@ msgstr "Restablir" msgid "Enter a nickname or email address." msgstr "Escriu un sobrenom o una adreça de correu electrònic." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "No hi ha cap usuari amb aquesta direcció o usuari." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Cap adreça de correu electrònic registrada per aquest usuari." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Error en guardar confirmació de l'adreça." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3080,23 +3078,23 @@ msgstr "" "S'han enviat instruccions per a recuperar la teva contrasenya a l'adreça de " "correu electrònic registrada." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Restabliment de contrasenya inesperat." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "La contrasenya ha de tenir 6 o més caràcters." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "La contrasenya i la confirmació no coincideixen." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Error en configurar l'usuari." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió." @@ -3303,7 +3301,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:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Repetit" @@ -4537,19 +4535,19 @@ msgstr "Sessions" msgid "Author(s)" msgstr "Autoria" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4634,7 +4632,7 @@ msgstr "Problema en guardar l'avís." msgid "Problem saving group inbox." msgstr "Problema en guardar l'avís." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4666,29 +4664,29 @@ msgstr "No s'ha pogut eliminar la subscripció." msgid "Couldn't delete subscription OMB token." msgstr "No s'ha pogut eliminar la subscripció." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "No s'ha pogut eliminar la subscripció." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Us donem la benvinguda a %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "No s'ha pogut crear el grup." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "No s'ha pogut establir la pertinença d'aquest grup." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "No s'ha pogut establir la pertinença d'aquest grup." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "No s'ha pogut guardar la subscripció." @@ -4911,7 +4909,7 @@ msgstr "Insígnia" msgid "StatusNet software license" msgstr "Llicència del programari StatusNet" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4920,12 +4918,12 @@ msgstr "" "**%%site.name%%** és un servei de microblogging de [%%site.broughtby%%**](%%" "site.broughtbyurl%%)." -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** és un servei de microblogging." -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4936,41 +4934,41 @@ msgstr "" "%s, disponible sota la [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "Llicència de contingut del lloc" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "Tot " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "llicència." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Paginació" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "Posteriors" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Anteriors" @@ -5083,7 +5081,7 @@ msgstr "Configuració dels camins" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5187,37 +5185,51 @@ msgstr "El canvi de contrasenya ha fallat" msgid "Password changing is not allowed" msgstr "Contrasenya canviada." -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Resultats de les comandes" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Comanda completada" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Comanda fallida" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Perdona, aquesta comanda no està implementada." +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "No hi ha cap perfil amb aquesta id." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "L'usuari no té última nota" + +#: lib/command.php:125 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "No es pot actualitzar l'usuari amb el correu electrònic confirmat" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Perdona, aquesta comanda no està implementada." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Reclamació enviada" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5225,202 +5237,200 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "No hi ha cap perfil amb aquesta id." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "L'usuari no té última nota" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Nota marcada com a favorita." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "Ja sou membre del grup." -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "No s'ha pogut afegir l'usuari %s al grup %s." -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s s'ha pogut afegir al grup %s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "No s'ha pogut eliminar l'usuari %s del grup %s" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s ha abandonat el grup %s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Nom complet: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Localització: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Pàgina web: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "Sobre tu: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Missatge directe per a %s enviat" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Error al enviar el missatge directe." -#: lib/command.php:413 +#: lib/command.php:490 #, fuzzy msgid "Cannot repeat your own notice" msgstr "No es poden posar en on les notificacions." -#: lib/command.php:418 +#: lib/command.php:495 #, fuzzy msgid "Already repeated that notice" msgstr "Eliminar aquesta nota" -#: lib/command.php:426 +#: lib/command.php:503 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Notificació publicada" -#: lib/command.php:428 +#: lib/command.php:505 #, fuzzy msgid "Error repeating notice." msgstr "Problema en guardar l'avís." -#: lib/command.php:482 +#: lib/command.php:536 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "S'ha enviat la resposta a %s" -#: lib/command.php:493 +#: lib/command.php:547 #, fuzzy msgid "Error saving notice." msgstr "Problema en guardar l'avís." -#: lib/command.php:547 +#: lib/command.php:594 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:589 -msgid "No such user" -msgstr "No existeix aquest usuari." +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "No estàs subscrit a aquest perfil." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Subscrit a %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 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:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Has deixat d'estar subscrit a %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Comanda encara no implementada." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Notificacions off." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "No es poden posar en off les notificacions." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Notificacions on." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "No es poden posar en on les notificacions." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Has deixat d'estar subscrit a %s" -#: lib/command.php:709 +#: lib/command.php:752 #, fuzzy msgid "You are not subscribed to anyone." msgstr "No estàs subscrit a aquest perfil." -#: lib/command.php:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 #, fuzzy msgid "No one is subscribed to you." msgstr "No pots subscriure a un altre a tu mateix." -#: lib/command.php:733 +#: lib/command.php:776 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:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "No sou membre de cap grup." -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5650,49 +5660,49 @@ msgstr "Etiquetes en les notificacions del grup %s" msgid "This page is not available in a media type you accept" msgstr "Aquesta pàgina no està disponible en un tipus de mèdia que acceptis." -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Format d'imatge no suportat." + +#: lib/imagefile.php:90 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Pots pujar una imatge de logo per al grup." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Càrrega parcial." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Error del sistema en pujar el fitxer." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "No és una imatge o és un fitxer corrupte." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Format d'imatge no suportat." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Hem perdut el nostre arxiu." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Tipus de fitxer desconegut" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, fuzzy, php-format msgid "Unknown inbox source %d." msgstr "Llengua desconeguda «%s»" @@ -5903,7 +5913,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "de" @@ -6058,23 +6068,23 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "en context" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "Repetit per" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "respondre a aquesta nota" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Respon" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 #, fuzzy msgid "Notice repeated" msgstr "Notificació publicada" @@ -6395,47 +6405,47 @@ msgctxt "role" msgid "Moderator" msgstr "Modera" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "fa pocs segons" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "fa un minut" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "fa %d minuts" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "fa una hora" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "fa %d hores" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "fa un dia" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "fa %d dies" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "fa un mes" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "fa %d mesos" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "fa un any" @@ -6449,7 +6459,7 @@ msgstr "%s no és un color vàlid!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s no és un color vàlid! Feu servir 3 o 6 caràcters hexadecimals." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index a48ec5885..74a2f9cc9 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:32+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:42:19+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -101,7 +101,7 @@ msgstr "Žádné takové oznámení." #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -110,10 +110,8 @@ msgstr "Žádné takové oznámení." #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Žádný takový uživatel." @@ -207,12 +205,12 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Potvrzující kód nebyl nalezen" @@ -345,7 +343,7 @@ msgstr "" msgid "This status is already a favorite." msgstr "Toto je již vaše Jabber" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "" @@ -468,7 +466,7 @@ msgstr "Žádný požadavek nebyl nalezen!" msgid "You are already a member of that group." msgstr "Již jste přihlášen" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "" @@ -520,7 +518,7 @@ msgstr "Neplatná velikost" #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -664,12 +662,12 @@ msgstr "" msgid "Unsupported format." msgstr "Nepodporovaný formát obrázku." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1 statusů na %2" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "Mikroblog od %s" @@ -679,7 +677,7 @@ msgstr "Mikroblog od %s" msgid "%1$s / Updates mentioning %2$s" msgstr "%1 statusů na %2" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" @@ -689,7 +687,7 @@ msgstr "" msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -704,12 +702,12 @@ msgstr "Odpovědi na %s" msgid "Repeats of %s" msgstr "Odpovědi na %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Mikroblog od %s" @@ -772,7 +770,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Odstranit" @@ -855,8 +853,8 @@ msgstr "" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 #, fuzzy msgid "No such group." msgstr "Žádné takové oznámení." @@ -965,7 +963,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:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "" @@ -1025,7 +1023,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "Žádné takové oznámení." -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Odstranit toto oznámení" @@ -1291,7 +1289,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:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "Nelze uložin informace o obrázku" @@ -1998,7 +1996,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -2100,7 +2098,7 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 #, fuzzy msgid "You are not a member of that group." msgstr "Neodeslal jste nám profil" @@ -2216,12 +2214,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Žádný obsah!" @@ -2229,7 +2227,7 @@ msgstr "Žádný obsah!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2243,7 +2241,7 @@ msgstr "" msgid "Direct message to %s sent." msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "" @@ -2372,8 +2370,8 @@ msgstr "Připojit" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "" @@ -2513,7 +2511,7 @@ msgstr "Neplatné heslo" msgid "Error saving user; invalid." msgstr "Chyba při ukládaní uživatele; neplatný" -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Nelze uložit nové heslo" @@ -3011,7 +3009,7 @@ msgstr "Resetovat heslo" msgid "Recover password" msgstr "Obnovit" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Žádost o obnovu hesla" @@ -3031,19 +3029,19 @@ msgstr "Reset" msgid "Enter a nickname or email address." msgstr "Zadej přezdívku nebo emailovou adresu" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Žádný registrovaný email pro tohoto uživatele." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Chyba při ukládání potvrzení adresy" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3051,23 +3049,23 @@ msgstr "" "Návod jak obnovit heslo byl odeslát na vaší emailovou adresu zaregistrovanou " "u vašeho účtu." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Nečekané resetování hesla." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Heslo musí být alespoň 6 znaků dlouhé" -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Heslo a potvrzení nesouhlasí" -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Chyba nastavení uživatele" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen." @@ -3255,7 +3253,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:674 +#: actions/repeat.php:114 lib/noticelist.php:676 #, fuzzy msgid "Repeated" msgstr "Vytvořit" @@ -4480,19 +4478,19 @@ msgstr "Osobní" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4573,7 +4571,7 @@ msgstr "Problém při ukládání sdělení" msgid "Problem saving group inbox." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4606,31 +4604,31 @@ msgstr "Nelze smazat odebírání" msgid "Couldn't delete subscription OMB token." msgstr "Nelze smazat odebírání" -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Nelze smazat odebírání" -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: classes/User_group.php:477 +#: classes/User_group.php:480 #, fuzzy msgid "Could not create group." msgstr "Nelze uložin informace o obrázku" -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Nelze vytvořit odebírat" -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "Nelze vytvořit odebírat" -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Nelze vytvořit odebírat" @@ -4852,7 +4850,7 @@ msgstr "" msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4861,12 +4859,12 @@ msgstr "" "**%%site.name%%** je služba microblogů, kterou pro vás poskytuje [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** je služba mikroblogů." -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4877,43 +4875,43 @@ msgstr "" "dostupná pod [GNU Affero General Public License](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 #, fuzzy msgid "Site content license" msgstr "Nové sdělení" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "" -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "" -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#: lib/action.php:1164 #, fuzzy msgid "After" msgstr "« Novější" -#: lib/action.php:1169 +#: lib/action.php:1172 #, fuzzy msgid "Before" msgstr "Starší »" @@ -5026,7 +5024,7 @@ msgstr "Potvrzení emailové adresy" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5131,37 +5129,52 @@ msgstr "Heslo uloženo" msgid "Password changing is not allowed" msgstr "Heslo uloženo" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "" +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "Vzdálený profil s nesouhlasícím profilem" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +#, fuzzy +msgid "User has no last notice" +msgstr "Uživatel nemá profil." + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "Nelze aktualizovat uživatele" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Nelze aktualizovat uživatele" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Odpovědi na %s" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5169,209 +5182,205 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "Vzdálený profil s nesouhlasícím profilem" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -#, fuzzy -msgid "User has no last notice" -msgstr "Uživatel nemá profil." - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:317 #, fuzzy msgid "You are already a member of that group" msgstr "Již jste přihlášen" -#: lib/command.php:231 +#: lib/command.php:331 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "Nelze přesměrovat na server: %s" -#: lib/command.php:236 +#: lib/command.php:336 #, fuzzy, php-format msgid "%s joined group %s" msgstr "%1 statusů na %2" -#: lib/command.php:275 +#: lib/command.php:373 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "Nelze vytvořit OpenID z: %s" -#: lib/command.php:280 +#: lib/command.php:378 #, fuzzy, php-format msgid "%s left group %s" msgstr "%1 statusů na %2" -#: lib/command.php:309 +#: lib/command.php:401 #, fuzzy, php-format msgid "Fullname: %s" msgstr "Celé jméno" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:490 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí." -#: lib/command.php:418 +#: lib/command.php:495 #, fuzzy msgid "Already repeated that notice" msgstr "Odstranit toto oznámení" -#: lib/command.php:426 +#: lib/command.php:503 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Sdělení" -#: lib/command.php:428 +#: lib/command.php:505 #, fuzzy msgid "Error repeating notice." msgstr "Problém při ukládání sdělení" -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:545 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Odpovědi na %s" -#: lib/command.php:493 +#: lib/command.php:547 #, fuzzy msgid "Error saving notice." msgstr "Problém při ukládání sdělení" -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 +#: lib/command.php:602 #, fuzzy -msgid "No such user" -msgstr "Žádný takový uživatel." +msgid "Can't subscribe to OMB profiles by command." +msgstr "Neodeslal jste nám profil" -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Odhlásit" -#: lib/command.php:709 +#: lib/command.php:752 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Neodeslal jste nám profil" -#: lib/command.php:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 #, fuzzy msgid "No one is subscribed to you." msgstr "Vzdálený odběr" -#: lib/command.php:733 +#: lib/command.php:776 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:753 +#: lib/command.php:796 #, fuzzy msgid "You are not a member of any groups." msgstr "Neodeslal jste nám profil" -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5608,50 +5617,50 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "Tato stránka není k dispozici v typu média která přijímáte." -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Nepodporovaný formát obrázku." + +#: lib/imagefile.php:90 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků" -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Částečné náhrání." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Chyba systému při nahrávání souboru" -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Není obrázkem, nebo jde o poškozený soubor." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Nepodporovaný formát obrázku." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 #, fuzzy msgid "Lost our file." msgstr "Žádné takové oznámení." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5855,7 +5864,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 #, fuzzy msgid "from" msgstr " od " @@ -6012,26 +6021,26 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 #, fuzzy msgid "in context" msgstr "Žádný obsah!" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 #, fuzzy msgid "Repeated by" msgstr "Vytvořit" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 #, fuzzy msgid "Reply" msgstr "odpověď" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 #, fuzzy msgid "Notice repeated" msgstr "Sdělení" @@ -6356,47 +6365,47 @@ msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "před pár sekundami" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "asi před minutou" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "asi před %d minutami" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "asi před hodinou" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "asi před %d hodinami" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "asi přede dnem" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "před %d dny" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "asi před měsícem" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "asi před %d mesíci" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "asi před rokem" @@ -6410,7 +6419,7 @@ msgstr "Stránka není platnou URL." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 4bad95b9e..5f98f4650 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -15,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-08 21:10:39+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:42:22+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63415); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -100,7 +100,7 @@ msgstr "Seite nicht vorhanden" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -109,10 +109,8 @@ msgstr "Seite nicht vorhanden" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Unbekannter Benutzer." @@ -215,12 +213,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:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "API-Methode nicht gefunden." @@ -352,7 +350,7 @@ msgstr "Keine Nachricht mit dieser ID gefunden." msgid "This status is already a favorite." msgstr "Diese Nachricht ist bereits ein Favorit!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Konnte keinen Favoriten erstellen." @@ -472,7 +470,7 @@ msgstr "Gruppe nicht gefunden!" msgid "You are already a member of that group." msgstr "Du bist bereits Mitglied dieser Gruppe" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "Der Admin dieser Gruppe hat dich gesperrt." @@ -510,9 +508,8 @@ msgid "No oauth_token parameter provided." msgstr "Kein oauth_token Parameter angegeben." #: actions/apioauthauthorize.php:106 -#, fuzzy msgid "Invalid token." -msgstr "Ungültige Größe." +msgstr "Ungültiges Token." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:157 actions/disfavor.php:74 @@ -523,7 +520,7 @@ msgstr "Ungültige Größe." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -583,6 +580,9 @@ msgid "" "the ability to %3$s your %4$s account data. You should only " "give access to your %4$s account to third parties you trust." msgstr "" +"Das Programm %1$s von %2$s würde gerne " +"%3$s bei deinem %4$s Zugang. Du solltest nur " +"vertrauenswürdigen Quellen Erlaubnis zu deinem %4$s Zugang geben." #: actions/apioauthauthorize.php:310 lib/action.php:438 msgid "Account" @@ -664,12 +664,12 @@ msgstr "" msgid "Unsupported format." msgstr "Bildformat wird nicht unterstützt." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoriten von %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s Aktualisierung in den Favoriten von %2$s / %2$s." @@ -679,7 +679,7 @@ msgstr "%1$s Aktualisierung in den Favoriten von %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Aktualisierungen erwähnen %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "Nachrichten von %1$, die auf Nachrichten von %2$ / %3$ antworten." @@ -689,7 +689,7 @@ msgstr "Nachrichten von %1$, die auf Nachrichten von %2$ / %3$ antworten." msgid "%s public timeline" msgstr "%s öffentliche Zeitleiste" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s Nachrichten von allen!" @@ -704,12 +704,12 @@ msgstr "Antworten an %s" msgid "Repeats of %s" msgstr "Antworten von %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Nachrichten, die mit %s getagt sind" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Aktualisierungen mit %1$s getagt auf %2$s!" @@ -770,7 +770,7 @@ msgid "Preview" msgstr "Vorschau" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Löschen" @@ -854,8 +854,8 @@ msgstr "Konnte Blockierungsdaten nicht speichern." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "Keine derartige Gruppe." @@ -956,7 +956,7 @@ msgstr "Du bist Besitzer dieses Programms" #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "Es gab ein Problem mit deinem Sessiontoken." @@ -1016,7 +1016,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:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Nachricht löschen" @@ -1270,7 +1270,7 @@ msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)." msgid "Could not update group." msgstr "Konnte Gruppe nicht aktualisieren." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Konnte keinen Favoriten erstellen." @@ -1598,9 +1598,8 @@ msgid "This role is reserved and cannot be set." msgstr "Diese Aufgabe ist reserviert und kann nicht gesetzt werden" #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "Du kannst diesem Benutzer keine Nachricht schicken." +msgstr "Auf dieser Seite können keine Benutzerrollen gewährt werden." #: actions/grantrole.php:82 msgid "User already has this role." @@ -1981,7 +1980,7 @@ msgstr "Lade neue Leute ein" msgid "You are already subscribed to these users:" msgstr "Du hast diese Benutzer bereits abonniert:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2115,7 +2114,7 @@ msgstr "%1$s ist der Gruppe %2$s beigetreten" msgid "You must be logged in to leave a group." msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "Du bist kein Mitglied dieser Gruppe." @@ -2229,12 +2228,12 @@ msgstr "Benutzer dieses Formular, um eine neue Gruppe zu erstellen." msgid "New message" msgstr "Neue Nachricht" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Du kannst diesem Benutzer keine Nachricht schicken." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Kein Inhalt!" @@ -2242,7 +2241,7 @@ msgstr "Kein Inhalt!" msgid "No recipient specified." msgstr "Kein Empfänger angegeben." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2257,7 +2256,7 @@ msgstr "Nachricht gesendet" msgid "Direct message to %s sent." msgstr "Direkte Nachricht an %s abgeschickt" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax-Fehler" @@ -2395,8 +2394,8 @@ msgstr "Content-Typ " msgid "Only " msgstr "Nur " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Kein unterstütztes Datenformat." @@ -2449,14 +2448,12 @@ msgid "No login token specified." msgstr "Kein Zugangstoken angegeben." #: actions/otp.php:90 -#, fuzzy msgid "No login token requested." -msgstr "Keine Profil-ID in der Anfrage." +msgstr "Kein Login-Token angefordert." #: actions/otp.php:95 -#, fuzzy msgid "Invalid login token specified." -msgstr "Token ungültig oder abgelaufen." +msgstr "Login-Token ungültig oder abgelaufen." #: actions/otp.php:104 msgid "Login token expired." @@ -2530,7 +2527,7 @@ msgstr "Altes Passwort falsch" msgid "Error saving user; invalid." msgstr "Fehler beim Speichern des Nutzers, ungültig." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Konnte neues Passwort nicht speichern" @@ -3037,7 +3034,7 @@ msgstr "Passwort zurücksetzen" msgid "Recover password" msgstr "Stelle Passwort wieder her" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Wiederherstellung des Passworts angefordert" @@ -3057,19 +3054,19 @@ msgstr "Zurücksetzen" msgid "Enter a nickname or email address." msgstr "Gib einen Spitznamen oder eine E-Mail-Adresse ein." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Kein Benutzer mit dieser E-Mail-Adresse oder mit diesem Nutzernamen." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Der Nutzer hat keine registrierte E-Mail-Adresse." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Fehler beim Speichern der Adressbestätigung." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3077,23 +3074,23 @@ msgstr "" "Anweisungen für die Wiederherstellung deines Passworts wurden an deine " "hinterlegte E-Mail-Adresse geschickt." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Unerwarteter Passwortreset." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Passwort muss mehr als 6 Zeichen enthalten" -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Passwort und seine Bestätigung stimmen nicht überein." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Fehler bei den Nutzereinstellungen." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt angemeldet." @@ -3298,7 +3295,7 @@ msgstr "Du kannst deine eigene Nachricht nicht wiederholen." msgid "You already repeated that notice." msgstr "Nachricht bereits wiederholt" -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Wiederholt" @@ -3347,6 +3344,8 @@ msgid "" "You can engage other users in a conversation, subscribe to more people or " "[join groups](%%action.groups%%)." msgstr "" +"Du kannst andere Nutzer ansprechen, mehr Leuten folgen oder [Gruppen " +"beitreten](%%action.groups%%)." #: actions/replies.php:206 #, php-format @@ -3376,9 +3375,8 @@ msgid "StatusNet" msgstr "StatusNet" #: actions/sandbox.php:65 actions/unsandbox.php:65 -#, fuzzy msgid "You cannot sandbox users on this site." -msgstr "Du kannst diesem Benutzer keine Nachricht schicken." +msgstr "Du kannst Benutzer auf dieser Seite nicht auf den Spielplaz schicken." #: actions/sandbox.php:72 msgid "User is already sandboxed." @@ -3420,9 +3418,8 @@ msgid "You must be logged in to view an application." msgstr "Du musst angemeldet sein, um aus dieses Programm zu betrachten." #: actions/showapplication.php:157 -#, fuzzy msgid "Application profile" -msgstr "Nachricht hat kein Profil" +msgstr "Anwendungsprofil" #: actions/showapplication.php:159 lib/applicationeditform.php:180 msgid "Icon" @@ -3525,6 +3522,9 @@ msgid "" "You haven't chosen any favorite notices yet. Click the fave button on " "notices you like to bookmark them for later or shed a spotlight on them." msgstr "" +"Du hast noch keine Lieblingsnachrichten gewählt. Klicke den Favorisieren-" +"Button bei einer Nachricht, die dir gefällt um die Aufmerksamkeit auf sie zu " +"richten und sie in deine Lesezeichen aufzunehmen." #: actions/showfavorites.php:208 #, php-format @@ -3816,9 +3816,8 @@ msgid "Contact email address for your site" msgstr "Kontakt-E-Mail-Adresse für Deine Site." #: actions/siteadminpanel.php:245 -#, fuzzy msgid "Local" -msgstr "Lokale Ansichten" +msgstr "Lokal" #: actions/siteadminpanel.php:256 msgid "Default timezone" @@ -3835,6 +3834,8 @@ msgstr "Bevorzugte Sprache" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" msgstr "" +"Sprache der Seite für den Fall, dass die automatische Erkennung anhand der " +"Browser-Einstellungen nicht verfügbar ist." #: actions/siteadminpanel.php:271 msgid "Limits" @@ -4415,7 +4416,7 @@ msgstr "Profiladresse '%s' ist für einen lokalen Benutzer." #: actions/userauthorization.php:345 #, php-format msgid "Avatar URL ‘%s’ is not valid." -msgstr "" +msgstr "Avatar Adresse '%s' ist nicht gültig." #: actions/userauthorization.php:350 #, php-format @@ -4528,7 +4529,7 @@ msgstr "Version" msgid "Author(s)" msgstr "Autor(en)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4537,12 +4538,12 @@ msgstr "" "Keine Datei darf größer als %d Bytes sein und die Datei die du verschicken " "wolltest ist %d Bytes groß. Bitte eine kleinere Datei hoch laden." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Eine Datei dieser Größe überschreitet deine User Quota von %d Byte." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4566,9 +4567,9 @@ msgid "Could not update local group." msgstr "Konnte Gruppe nicht aktualisieren." #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" -msgstr "Konnte keinen Favoriten erstellen." +msgstr "Konnte keinen Login-Token für %s erstellen" #: classes/Message.php:45 msgid "You are banned from sending direct messages." @@ -4623,7 +4624,7 @@ msgstr "Problem bei Speichern der Nachricht." msgid "Problem saving group inbox." msgstr "Problem bei Speichern der Nachricht." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4653,32 +4654,30 @@ msgstr "Konnte Abonnement nicht löschen." msgid "Couldn't delete subscription OMB token." msgstr "Konnte OMB-Abonnement nicht löschen." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Konnte Abonnement nicht löschen." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Herzlich willkommen bei %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Konnte Gruppe nicht erstellen." -#: classes/User_group.php:486 -#, fuzzy +#: classes/User_group.php:489 msgid "Could not set group URI." -msgstr "Konnte Gruppenmitgliedschaft nicht setzen." +msgstr "Konnte die Gruppen URI nicht setzen." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Konnte Gruppenmitgliedschaft nicht setzen." -#: classes/User_group.php:521 -#, fuzzy +#: classes/User_group.php:524 msgid "Could not save local group info." -msgstr "Konnte Abonnement nicht erstellen." +msgstr "Konnte die lokale Gruppen Information nicht speichern." #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" @@ -4880,7 +4879,7 @@ msgstr "Plakette" msgid "StatusNet software license" msgstr "StatusNet-Software-Lizenz" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4889,12 +4888,12 @@ msgstr "" "**%%site.name%%** ist ein Microbloggingdienst von [%%site.broughtby%%](%%" "site.broughtbyurl%%)." -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** ist ein Microbloggingdienst." -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4905,49 +4904,51 @@ msgstr "" "(Version %s) betrieben, die unter der [GNU Affero General Public License]" "(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist." -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "StatusNet-Software-Lizenz" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" "Inhalt und Daten urheberrechtlich geschützt durch %1$s. Alle Rechte " "vorbehalten." -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" +"Urheberrecht von Inhalt und Daten liegt bei den Beteiligten. Alle Rechte " +"vorbehalten." -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "Alle " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "Lizenz." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Seitenerstellung" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "Später" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Vorher" #: lib/activity.php:453 msgid "Can't handle remote content yet." -msgstr "" +msgstr "Fremdinhalt kann noch nicht eingebunden werden." #: lib/activity.php:481 msgid "Can't handle embedded XML content yet." @@ -4955,7 +4956,7 @@ msgstr "Kann eingebundenen XML Inhalt nicht verarbeiten." #: lib/activity.php:485 msgid "Can't handle embedded Base64 content yet." -msgstr "" +msgstr "Eingebundener Base64 Inhalt kann noch nicht verarbeitet werden." #. TRANS: Client error message #: lib/adminpanelaction.php:98 @@ -5044,7 +5045,7 @@ msgstr "SMS-Konfiguration" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5076,7 +5077,7 @@ msgstr "Adresse der Homepage dieses Programms" #: lib/applicationeditform.php:224 msgid "Organization responsible for this application" -msgstr "" +msgstr "Für diese Anwendung verantwortliche Organisation" #: lib/applicationeditform.php:230 msgid "URL for the homepage of the organization" @@ -5144,37 +5145,50 @@ msgstr "Passwort konnte nicht geändert werden" msgid "Password changing is not allowed" msgstr "Passwort kann nicht geändert werden" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Befehl-Ergebnisse" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Befehl ausgeführt" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Befehl fehlgeschlagen" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Leider ist dieser Befehl noch nicht implementiert." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Nachricht mit dieser ID existiert nicht" + +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "Benutzer hat keine letzte Nachricht" -#: lib/command.php:88 +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden." -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden." + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Leider ist dieser Befehl noch nicht implementiert." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Es macht keinen Sinn dich selbst anzustupsen!" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "Stups an %s geschickt" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5185,195 +5199,194 @@ msgstr "" "Abonnenten: %2$s\n" "Mitteilungen: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Nachricht mit dieser ID existiert nicht" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Benutzer hat keine letzte Nachricht" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Nachricht als Favorit markiert." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "Du bist bereits Mitglied dieser Gruppe" -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s ist der Gruppe %s beigetreten" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s hat die Gruppe %s verlassen" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Vollständiger Name: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Standort: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Homepage: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "Über: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Nachricht zu lang - maximal %d Zeichen erlaubt, du hast %d gesendet" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Direkte Nachricht an %s abgeschickt" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Fehler beim Senden der Nachricht" -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen." -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "Nachricht bereits wiederholt" -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "Nachricht von %s wiederholt" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "Fehler beim Wiederholen der Nachricht" -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Nachricht zu lange - maximal %d Zeichen erlaubt, du hast %d gesendet" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "Antwort an %s gesendet" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "Problem beim Speichern der Nachricht." -#: lib/command.php:547 +#: lib/command.php:594 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:589 -msgid "No such user" -msgstr "Unbekannter Benutzer." +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Du hast dieses Profil nicht abonniert." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "%s abonniert" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 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:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "%s nicht mehr abonniert" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Befehl noch nicht implementiert." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Benachrichtigung deaktiviert." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "Konnte Benachrichtigung nicht deaktivieren." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Benachrichtigung aktiviert." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "Konnte Benachrichtigung nicht aktivieren." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "Anmeldung ist abgeschaltet" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "Der Link ist nur einmal benutzbar und für eine Dauer von 2 Minuten: %s" -#: lib/command.php:692 +#: lib/command.php:735 #, php-format msgid "Unsubscribed %s" msgstr "%s nicht mehr abonniert" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "Du hast niemanden abonniert." -#: lib/command.php:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "Niemand hat Dich abonniert." -#: lib/command.php:733 +#: lib/command.php:776 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:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "Du bist in keiner Gruppe Mitglied." -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5414,6 +5427,44 @@ msgid "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" msgstr "" +"Befehle:\n" +"on - Benachrichtigung einschalten\n" +"off - Benachrichtigung ausschalten\n" +"help - diese Hilfe anzeigen\n" +"follow - einem Nutzer folgen\n" +"groups - Gruppen auflisten in denen du Mitglied bist\n" +"subscriptions - Leute auflisten denen du folgst\n" +"subscribers - Leute auflisten die dir folgen\n" +"leave - einem Nutzer nicht mehr folgen\n" +"d - Direkte Nachricht an einen Nutzer schicken\n" +"get - letzte Nachricht eines Nutzers abrufen\n" +"whois - Profil eines Nutzers abrufen\n" +"lose - Nutzer zwingen dir nicht mehr zu folgen\n" +"fav - letzte Nachricht eines Nutzers als Favorit markieren\n" +"fav # - Nachricht mit bestimmter ID als Favorit markieren\n" +"repeat # - Nachricht mit bestimmter ID wiederholen\n" +"repeat - letzte Nachricht eines Nutzers wiederholen\n" +"reply # - Nachricht mit bestimmter ID beantworten\n" +"reply - letzte Nachricht eines Nutzers beantworten\n" +"join - Gruppe beitreten\n" +"login - Link zum Anmelden auf der Webseite anfordern\n" +"drop - Gruppe verlassen\n" +"stats - deine Statistik abrufen\n" +"stop - Äquivalent zu 'off'\n" +"quit - Äquivalent zu 'off'\n" +"sub - same as 'follow'\n" +"unsub - same as 'leave'\n" +"last - same as 'get'\n" +"on - not yet implemented.\n" +"off - not yet implemented.\n" +"nudge - remind a user to update.\n" +"invite - not yet implemented.\n" +"track - not yet implemented.\n" +"untrack - not yet implemented.\n" +"track off - not yet implemented.\n" +"untrack all - not yet implemented.\n" +"tracks - not yet implemented.\n" +"tracking - not yet implemented.\n" #: lib/common.php:148 msgid "No configuration file found. " @@ -5554,6 +5605,8 @@ msgstr "" #, php-format msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" +"Zusätzliche Spitznamen für die Gruppe, Komma oder Leerzeichen getrennt, max %" +"d" #: lib/groupnav.php:85 msgid "Group" @@ -5604,49 +5657,49 @@ msgstr "Stichworte in den Nachrichten der Gruppe %s" msgid "This page is not available in a media type you accept" msgstr "Dies Seite liegt in keinem von dir akzeptierten Mediatype vor." -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Bildformat wird nicht unterstützt." + +#: lib/imagefile.php:90 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Du kannst ein Logo für Deine Gruppe hochladen." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Unvollständiges Hochladen." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Systemfehler beim hochladen der Datei." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Kein Bild oder defekte Datei." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Bildformat wird nicht unterstützt." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Daten verloren." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Unbekannter Dateityp" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, fuzzy, php-format msgid "Unknown inbox source %d." msgstr "Unbekannte Sprache „%s“" @@ -5867,6 +5920,16 @@ msgid "" "Faithfully yours,\n" "%6$s\n" msgstr "" +"%1$s (@%7$s) hat gerade deine Mitteilung von %2$s als Favorit hinzugefügt.\n" +"Die Adresse der Nachricht ist:\n" +"%3$s\n" +"Der Text der Nachricht ist:\n" +"%4$s\n" +"Die Favoritenliste von %1$s ist hier:\n" +"%5$s\n" +"\n" +"Gruß,\n" +"%6$s\n" #: lib/mail.php:635 #, php-format @@ -5902,7 +5965,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:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "von" @@ -6039,7 +6102,7 @@ msgstr "" #: lib/noticelist.php:429 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" -msgstr "" +msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" #: lib/noticelist.php:430 msgid "N" @@ -6061,23 +6124,23 @@ msgstr "W" msgid "at" msgstr "in" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "im Zusammenhang" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "Wiederholt von" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Auf diese Nachricht antworten" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Antworten" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "Nachricht wiederholt" @@ -6222,7 +6285,7 @@ msgstr "Widerrufe die \"%s\" Rolle von diesem Benutzer" #: lib/router.php:671 msgid "No single user defined for single-user mode." -msgstr "" +msgstr "Kein einzelner Nutzer für den Ein-Benutzer-Modus ausgewählt." #: lib/sandboxform.php:67 msgid "Sandbox" @@ -6388,47 +6451,47 @@ msgctxt "role" msgid "Moderator" msgstr "Moderator" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "vor wenigen Sekunden" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "vor einer Minute" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "vor %d Minuten" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "vor einer Stunde" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "vor %d Stunden" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "vor einem Tag" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "vor %d Tagen" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "vor einem Monat" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "vor %d Monaten" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "vor einem Jahr" @@ -6442,7 +6505,7 @@ msgstr "%s ist keine gültige Farbe!" 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 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 0ebe84fe7..8364d1ebf 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:37+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:42:26+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -97,7 +97,7 @@ msgstr "Δεν υπάρχει τέτοια σελίδα" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -106,10 +106,8 @@ msgstr "Δεν υπάρχει τέτοια σελίδα" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Κανένας τέτοιος χρήστης." @@ -202,12 +200,12 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!" @@ -338,7 +336,7 @@ msgstr "" msgid "This status is already a favorite." msgstr "" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "" @@ -460,7 +458,7 @@ msgstr "Η ομάδα δεν βρέθηκε!" msgid "You are already a member of that group." msgstr "" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "" @@ -511,7 +509,7 @@ msgstr "Μήνυμα" #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -650,12 +648,12 @@ msgstr "" msgid "Unsupported format." msgstr "" -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" @@ -665,7 +663,7 @@ msgstr "" msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" @@ -675,7 +673,7 @@ msgstr "" msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -690,12 +688,12 @@ msgstr "" msgid "Repeats of %s" msgstr "" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -755,7 +753,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Διαγραφή" @@ -838,8 +836,8 @@ msgstr "" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 #, fuzzy msgid "No such group." msgstr "Αδύνατη η αποθήκευση του προφίλ." @@ -945,7 +943,7 @@ msgstr "Ομάδες με τα περισσότερα μέλη" #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "" @@ -1006,7 +1004,7 @@ msgstr "Είσαι σίγουρος ότι θες να διαγράψεις αυ msgid "Do not delete this notice" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "" @@ -1268,7 +1266,7 @@ msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστ msgid "Could not update group." msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "Αδύνατη η αποθήκευση του προφίλ." @@ -1958,7 +1956,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -2059,7 +2057,7 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "" @@ -2175,12 +2173,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "" @@ -2188,7 +2186,7 @@ msgstr "" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2202,7 +2200,7 @@ msgstr "" msgid "Direct message to %s sent." msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "" @@ -2328,8 +2326,8 @@ msgstr "Σύνδεση" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "" @@ -2467,7 +2465,7 @@ msgstr "Λάθος παλιός κωδικός" msgid "Error saving user; invalid." msgstr "" -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Αδύνατη η αποθήκευση του νέου κωδικού" @@ -2958,7 +2956,7 @@ msgstr "" msgid "Recover password" msgstr "" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "" @@ -2978,19 +2976,19 @@ msgstr "" msgid "Enter a nickname or email address." msgstr "Εισάγετε ψευδώνυμο ή διεύθυνση email." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "" -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -2998,23 +2996,23 @@ msgstr "" "Οδηγίες για την ανάκτηση του κωδικού σας έχουν σταλεί στην διεύθυνση email " "που έχετε καταχωρίσει στον λογαριασμό σας." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Ο κωδικός πρέπει να είναι 6 χαρακτήρες ή περισσότεροι." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Ο κωδικός και η επιβεβαίωση του δεν ταυτίζονται." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" @@ -3213,7 +3211,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 #, fuzzy msgid "Repeated" msgstr "Δημιουργία" @@ -4407,19 +4405,19 @@ msgstr "Προσωπικά" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4497,7 +4495,7 @@ msgstr "" msgid "Problem saving group inbox." msgstr "" -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4529,30 +4527,30 @@ msgstr "Απέτυχε η διαγραφή συνδρομής." msgid "Couldn't delete subscription OMB token." msgstr "Απέτυχε η διαγραφή συνδρομής." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Απέτυχε η διαγραφή συνδρομής." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Δεν ήταν δυνατή η δημιουργία ομάδας." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" @@ -4769,7 +4767,7 @@ msgstr "" msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 +#: lib/action.php:804 #, fuzzy, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4778,13 +4776,13 @@ msgstr "" "To **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου) που " "έφερε κοντά σας το [%%site.broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, fuzzy, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" "Το **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου). " -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4792,41 +4790,41 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "" -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "" -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "" @@ -4937,7 +4935,7 @@ msgstr "Επιβεβαίωση διεύθυνσης email" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5038,37 +5036,50 @@ msgstr "Ο κωδικός αποθηκεύτηκε." msgid "Password changing is not allowed" msgstr "Ο κωδικός αποθηκεύτηκε." -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "" + +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" msgstr "" -#: lib/command.php:88 +#: lib/command.php:125 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Απέτυχε η ενημέρωση χρήστη μέσω επιβεβαιωμένης email διεύθυνσης." -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Απέτυχε η ενημέρωση χρήστη μέσω επιβεβαιωμένης email διεύθυνσης." + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5076,201 +5087,198 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:317 #, fuzzy msgid "You are already a member of that group" msgstr "Ομάδες με τα περισσότερα μέλη" -#: lib/command.php:231 +#: lib/command.php:331 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" -#: lib/command.php:236 +#: lib/command.php:336 #, fuzzy, php-format msgid "%s joined group %s" msgstr "ομάδες των χρηστών %s" -#: lib/command.php:275 +#: lib/command.php:373 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: lib/command.php:280 +#: lib/command.php:378 #, fuzzy, php-format msgid "%s left group %s" msgstr "ομάδες των χρηστών %s" -#: lib/command.php:309 +#: lib/command.php:401 #, fuzzy, php-format msgid "Fullname: %s" msgstr "Ονοματεπώνυμο" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:490 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: lib/command.php:418 +#: lib/command.php:495 #, fuzzy msgid "Already repeated that notice" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: lib/command.php:426 +#: lib/command.php:503 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Ρυθμίσεις OpenID" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "" -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "" -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 -#, fuzzy -msgid "No such user" -msgstr "Κανένας τέτοιος χρήστης." +#: lib/command.php:602 +msgid "Can't subscribe to OMB profiles by command." +msgstr "" -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Απέτυχε η συνδρομή." -#: lib/command.php:709 +#: lib/command.php:752 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:711 +#: lib/command.php:754 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:731 +#: lib/command.php:774 #, fuzzy msgid "No one is subscribed to you." msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:733 +#: lib/command.php:776 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "Δεν είστε μέλος καμίας ομάδας." -#: lib/command.php:755 +#: lib/command.php:798 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Ομάδες με τα περισσότερα μέλη" msgstr[1] "Ομάδες με τα περισσότερα μέλη" -#: lib/command.php:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5501,50 +5509,50 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "" - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 #, fuzzy msgid "Lost our file." msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5741,7 +5749,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "από" @@ -5894,23 +5902,23 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "Επαναλαμβάνεται από" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 #, fuzzy msgid "Notice repeated" msgstr "Ρυθμίσεις OpenID" @@ -6230,47 +6238,47 @@ msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "" @@ -6284,7 +6292,7 @@ msgstr "Το %s δεν είναι ένα έγκυρο χρώμα!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 8d846c4e2..4a50e8a19 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:40+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:42:29+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -96,7 +96,7 @@ msgstr "No such page" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -105,10 +105,8 @@ msgstr "No such page" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "No such user." @@ -208,12 +206,12 @@ msgstr "Updates from %1$s and friends on %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "API method not found." @@ -346,7 +344,7 @@ msgstr "No status found with that ID." msgid "This status is already a favorite." msgstr "This status is already a favourite." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Could not create favourite." @@ -463,7 +461,7 @@ msgstr "Group not found!" msgid "You are already a member of that group." msgstr "You are already a member of that group." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "You have been blocked from that group by the admin." @@ -513,7 +511,7 @@ msgstr "Invalid token." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -653,12 +651,12 @@ msgstr "Max notice size is %d chars, including attachment URL." msgid "Unsupported format." msgstr "Unsupported format." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favourites from %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s updates favourited by %2$s / %2$s." @@ -668,7 +666,7 @@ msgstr "%1$s updates favourited by %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Updates mentioning %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s updates that reply to updates from %2$s / %3$s." @@ -678,7 +676,7 @@ msgstr "%1$s updates that reply to updates from %2$s / %3$s." msgid "%s public timeline" msgstr "%s public timeline" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s updates from everyone!" @@ -693,12 +691,12 @@ msgstr "Repeated to %s" msgid "Repeats of %s" msgstr "Repeats of %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notices tagged with %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Updates tagged with %1$s on %2$s!" @@ -758,7 +756,7 @@ msgid "Preview" msgstr "Preview" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Delete" @@ -841,8 +839,8 @@ msgstr "Failed to save block information." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "No such group." @@ -943,7 +941,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:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "There was a problem with your session token." @@ -1004,7 +1002,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:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Delete this notice" @@ -1257,7 +1255,7 @@ msgstr "description is too long (max %d chars)." msgid "Could not update group." msgstr "Could not update group." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Could not create aliases" @@ -1952,7 +1950,7 @@ msgstr "Invite new users" msgid "You are already subscribed to these users:" msgstr "You are already subscribed to these users:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2083,7 +2081,7 @@ msgstr "%1$s joined group %2$s" msgid "You must be logged in to leave a group." msgstr "You must be logged in to leave a group." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "You are not a member of that group." @@ -2196,12 +2194,12 @@ msgstr "Use this form to create a new group." msgid "New message" msgstr "New message" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "You can't send a message to this user." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "No content!" @@ -2209,7 +2207,7 @@ msgstr "No content!" msgid "No recipient specified." msgstr "No recipient specified." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2224,7 +2222,7 @@ msgstr "Message sent" msgid "Direct message to %s sent." msgstr "Could not create application." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax Error" @@ -2355,8 +2353,8 @@ msgstr "content type " msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Not a supported data format." @@ -2487,7 +2485,7 @@ msgstr "Incorrect old password" msgid "Error saving user; invalid." msgstr "Error saving user; invalid." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Can't save new password." @@ -2978,7 +2976,7 @@ msgstr "Reset password" msgid "Recover password" msgstr "Recover password" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Password recovery requested" @@ -2998,19 +2996,19 @@ msgstr "Reset" msgid "Enter a nickname or email address." msgstr "Enter a nickname or e-mail address." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "No user with that e-mail address or username." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "No registered e-mail address for that user." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Error saving address confirmation." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3018,23 +3016,23 @@ msgstr "" "Instructions for recovering your password have been sent to the e-mail " "address registered to your account." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Unexpected password reset." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Password must be 6 chars or more." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Password and confirmation do not match." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Error setting user." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "New password successfully saved. You are now logged in." @@ -3230,7 +3228,7 @@ msgstr "You can't repeat your own notice." msgid "You already repeated that notice." msgstr "You already repeated that notice." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Repeated" @@ -4460,19 +4458,19 @@ msgstr "Version" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4549,7 +4547,7 @@ msgstr "Problem saving notice." msgid "Problem saving group inbox." msgstr "Problem saving group inbox." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4580,28 +4578,28 @@ msgstr "Couldn't delete self-subscription." msgid "Couldn't delete subscription OMB token." msgstr "Couldn't delete subscription." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Couldn't delete subscription." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Welcome to %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Could not create group." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "Could not set group URI." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Could not set group membership." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "Could not save local group info." @@ -4822,7 +4820,7 @@ msgstr "Badge" msgid "StatusNet software license" msgstr "StatusNet software licence" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4831,12 +4829,12 @@ msgstr "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%)." -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** is a microblogging service." -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4847,41 +4845,41 @@ msgstr "" "s, available under the [GNU Affero General Public Licence](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "Site content license" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "All " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "licence." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Pagination" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "After" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Before" @@ -4987,7 +4985,7 @@ msgstr "Paths configuration" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5085,37 +5083,50 @@ msgstr "Password changing failed" msgid "Password changing is not allowed" msgstr "Password changing is not allowed" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Command results" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Command complete" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Command failed" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Sorry, this command is not yet implemented." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Notice with that id does not exist" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "User has no last notice" + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "Could not find a user with nickname %s" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Could not find a user with nickname %s" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Sorry, this command is not yet implemented." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "Nudge sent to %s" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5123,195 +5134,194 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Notice with that id does not exist" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "User has no last notice" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Notice marked as fave." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "You are already a member of that group." -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "Could not join user %s to group %s." -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s joined group %s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "Could not remove user %s to group %s" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s left group %s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Fullname: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Location: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Homepage: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "About: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Message too long - maximum is %d characters, you sent %d" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Direct message to %s sent" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Error sending direct message." -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "Cannot repeat your own notice." -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "Already repeated that notice." -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "Notice from %s repeated" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "Error repeating notice." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Notice too long - maximum is %d characters, you sent %d" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "Reply to %s sent" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "Error saving notice." -#: lib/command.php:547 +#: lib/command.php:594 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:589 -msgid "No such user" -msgstr "No such user." +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "You are not subscribed to that profile." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Subscribed to %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "Specify the name of the user to unsubscribe from" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Unsubscribed from %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Command not yet implemented." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Notification off." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "Can't turn off notification." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Notification on." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "Can't turn on notification." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, php-format msgid "Unsubscribed %s" msgstr "Unsubscribed %s" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "You are not subscribed to anyone." -#: lib/command.php:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "No one is subscribed to you." -#: lib/command.php:733 +#: lib/command.php:776 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:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "You are not a member of any groups." -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5541,49 +5551,49 @@ msgstr "Tags in %s group's notices" msgid "This page is not available in a media type you accept" msgstr "This page is not available in a media type you accept" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Unsupported image file format." + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "That file is too big. The maximum file size is %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Partial upload." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "System error uploading file." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Not an image or corrupt file." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Unsupported image file format." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Lost our file." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Unknown file type" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5796,7 +5806,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "from" @@ -5946,23 +5956,23 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "in context" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "Repeated by" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Reply to this notice" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Reply" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "Notice repeated" @@ -6274,47 +6284,47 @@ msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "a few seconds ago" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "about a minute ago" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "about %d minutes ago" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "about an hour ago" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "about %d hours ago" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "about a day ago" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "about %d days ago" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "about a month ago" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "about %d months ago" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "about a year ago" @@ -6328,7 +6338,7 @@ msgstr "%s is not a valid colour!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s is not a valid colour! Use 3 or 6 hex chars." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Message too long - maximum is %1$d characters, you sent %2$d." diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index cdc0184e4..1f18b6066 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -13,12 +13,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:43+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:42:32+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -99,7 +99,7 @@ msgstr "No existe tal página" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -108,10 +108,8 @@ msgstr "No existe tal página" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "No existe ese usuario." @@ -212,12 +210,12 @@ msgstr "¡Actualizaciones de %1$s y amigos en %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "Método de API no encontrado." @@ -348,7 +346,7 @@ msgstr "No se encontró estado para ese ID" msgid "This status is already a favorite." msgstr "Este status ya está en favoritos." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "No se pudo crear favorito." @@ -467,7 +465,7 @@ msgstr "¡No se ha encontrado el grupo!" msgid "You are already a member of that group." msgstr "Ya eres miembro de ese grupo" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "Has sido bloqueado de ese grupo por el administrador." @@ -517,7 +515,7 @@ msgstr "Token inválido." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -662,12 +660,12 @@ msgstr "" msgid "Unsupported format." msgstr "Formato no soportado." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoritos de %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s actualizaciones favoritas de %2$s / %2$s." @@ -677,7 +675,7 @@ msgstr "%1$s actualizaciones favoritas de %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Actualizaciones que mencionan %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s" @@ -687,7 +685,7 @@ msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s" msgid "%s public timeline" msgstr "línea temporal pública de %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "¡Actualizaciones de todos en %s!" @@ -702,12 +700,12 @@ msgstr "Repetido a %s" msgid "Repeats of %s" msgstr "Repeticiones de %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Avisos marcados con %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualizaciones etiquetadas con %1$s en %2$s!" @@ -767,7 +765,7 @@ msgid "Preview" msgstr "Vista previa" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Borrar" @@ -850,8 +848,8 @@ msgstr "No se guardó información de bloqueo." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "No existe ese grupo." @@ -953,7 +951,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:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "Hubo problemas con tu clave de sesión." @@ -1014,7 +1012,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:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Borrar este aviso" @@ -1267,7 +1265,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:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "No fue posible crear alias." @@ -1978,7 +1976,7 @@ msgstr "Invitar nuevos usuarios:" msgid "You are already subscribed to these users:" msgstr "Ya estás suscrito a estos usuarios:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2110,7 +2108,7 @@ msgstr "%1$s se ha unido al grupo %2$" msgid "You must be logged in to leave a group." msgstr "Debes estar conectado para dejar un grupo." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "No eres miembro de este grupo." @@ -2226,12 +2224,12 @@ msgstr "Usa este formulario para crear un grupo nuevo." msgid "New message" msgstr "Nuevo Mensaje " -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "No puedes enviar mensaje a este usuario." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "¡Ningún contenido!" @@ -2239,7 +2237,7 @@ msgstr "¡Ningún contenido!" msgid "No recipient specified." msgstr "No se especificó receptor." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "No te auto envíes un mensaje; dícetelo a ti mismo." @@ -2253,7 +2251,7 @@ msgstr "Mensaje enviado" msgid "Direct message to %s sent." msgstr "Se ha enviado un mensaje directo a %s." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Error de Ajax" @@ -2389,8 +2387,8 @@ msgstr "tipo de contenido " msgid "Only " msgstr "Sólo " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "No es un formato de dato soportado" @@ -2522,7 +2520,7 @@ msgstr "Contraseña antigua incorrecta." msgid "Error saving user; invalid." msgstr "Error al guardar el usuario; inválido." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "No se puede guardar la nueva contraseña." @@ -3024,7 +3022,7 @@ msgstr "Restablecer contraseña" msgid "Recover password" msgstr "Recuperar contraseña" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Recuperación de contraseña solicitada" @@ -3044,19 +3042,19 @@ msgstr "Restablecer" msgid "Enter a nickname or email address." msgstr "Ingresa un apodo o correo electronico" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "No hay ningún usuario con esa dirección de correo o nombre de usuario." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Ninguna dirección de correo electrónico registrada por este usuario." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Error al guardar confirmación de la dirección." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3064,23 +3062,23 @@ msgstr "" "Se enviaron instrucciones para recuperar tu contraseña a la dirección de " "correo registrada." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Restablecimiento de contraseña inesperado." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "La contraseña debe tener 6 o más caracteres." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "La contraseña y la confirmación no coinciden." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Error al configurar el usuario." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión." @@ -3282,7 +3280,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:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Repetido" @@ -4503,19 +4501,19 @@ msgstr "Sesiones" msgid "Author(s)" msgstr "Autor(es)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4598,7 +4596,7 @@ msgstr "Hubo un problema al guardar el aviso." msgid "Problem saving group inbox." msgstr "Hubo un problema al guardar el aviso." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4630,30 +4628,30 @@ msgstr "No se pudo eliminar la suscripción." msgid "Couldn't delete subscription OMB token." msgstr "No se pudo eliminar la suscripción." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "No se pudo eliminar la suscripción." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Bienvenido a %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "No se pudo crear grupo." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "No se pudo configurar miembros de grupo." -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "No se pudo configurar miembros de grupo." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "No se ha podido guardar la suscripción." @@ -4875,7 +4873,7 @@ msgstr "Insignia" msgid "StatusNet software license" msgstr "Licencia de software de StatusNet" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4884,12 +4882,12 @@ msgstr "" "**%%site.name%%** es un servicio de microblogueo de [%%site.broughtby%%**](%%" "site.broughtbyurl%%)." -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** es un servicio de microblogueo." -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4900,43 +4898,43 @@ msgstr "" "disponible bajo la [GNU Affero General Public License](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "Licencia de contenido del sitio" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "Derechos de autor de contenido y datos por los colaboradores. Todos los " "derechos reservados." -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "Todo" -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "Licencia." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Paginación" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "Después" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Antes" @@ -5047,7 +5045,7 @@ msgstr "SMS confirmación" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5149,37 +5147,50 @@ msgstr "El cambio de contraseña ha fallado" msgid "Password changing is not allowed" msgstr "Cambio de contraseña " -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Resultados de comando" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Comando completo" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Comando falló" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Disculpa, todavía no se implementa este comando." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "No existe ningún mensaje con ese id" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "Usuario no tiene último aviso" + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "No se pudo encontrar a nadie con el nombre de usuario %s" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "No se pudo encontrar a nadie con el nombre de usuario %s" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Disculpa, todavía no se implementa este comando." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "zumbido enviado a %s" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5187,200 +5198,199 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -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 -msgid "User has no last notice" -msgstr "Usuario no tiene último aviso" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Aviso marcado como favorito." -#: lib/command.php:217 +#: lib/command.php:317 #, fuzzy msgid "You are already a member of that group" msgstr "Ya eres miembro de ese grupo" -#: lib/command.php:231 +#: lib/command.php:331 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "No se puede unir usuario %s a grupo %s" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s se unió a grupo %s" -#: lib/command.php:275 +#: lib/command.php:373 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "No se pudo eliminar a usuario %s de grupo %s" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s dejó grupo %s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Nombre completo: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Lugar: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Página de inicio: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Se envió mensaje directo a %s" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Error al enviar mensaje directo." -#: lib/command.php:413 +#: lib/command.php:490 #, fuzzy msgid "Cannot repeat your own notice" msgstr "No se puede activar notificación." -#: lib/command.php:418 +#: lib/command.php:495 #, fuzzy msgid "Already repeated that notice" msgstr "Borrar este aviso" -#: lib/command.php:426 +#: lib/command.php:503 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Aviso publicado" -#: lib/command.php:428 +#: lib/command.php:505 #, fuzzy msgid "Error repeating notice." msgstr "Hubo un problema al guardar el aviso." -#: lib/command.php:482 +#: lib/command.php:536 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" -#: lib/command.php:491 +#: lib/command.php:545 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Responder este aviso." -#: lib/command.php:493 +#: lib/command.php:547 #, fuzzy msgid "Error saving notice." msgstr "Hubo un problema al guardar el aviso." -#: lib/command.php:547 +#: lib/command.php:594 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:589 -msgid "No such user" -msgstr "No existe ese usuario." +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "No te has suscrito a ese perfil." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Suscrito a %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "Especificar el nombre del usuario para desuscribirse de" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Desuscrito de %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Todavía no se implementa comando." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Notificación no activa." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "No se puede desactivar notificación." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Notificación activada." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "No se puede activar notificación." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Desuscrito de %s" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "No estás suscrito a nadie." -#: lib/command.php:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "Nadie está suscrito a ti." -#: lib/command.php:733 +#: lib/command.php:776 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:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "No eres miembro de ningún grupo" -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5614,49 +5624,49 @@ msgstr "Tags en avisos del grupo %s" msgid "This page is not available in a media type you accept" msgstr "Esta página no está disponible en el tipo de medio que aceptas." -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Formato de imagen no soportado." + +#: lib/imagefile.php:90 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Puedes cargar una imagen de logo para tu grupo." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Carga parcial." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Error del sistema al cargar el archivo." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "No es una imagen o es un fichero corrupto." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Formato de imagen no soportado." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Se perdió nuestro archivo." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Tipo de archivo desconocido" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5867,7 +5877,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "desde" @@ -6023,24 +6033,24 @@ msgstr "" msgid "at" msgstr "en" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "en contexto" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 #, fuzzy msgid "Repeated by" msgstr "Crear" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Responder este aviso." -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 #, fuzzy msgid "Notice repeated" msgstr "Aviso borrado" @@ -6366,47 +6376,47 @@ msgctxt "role" msgid "Moderator" msgstr "Moderar" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "hace unos segundos" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "hace un minuto" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "hace %d minutos" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "hace una hora" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "hace %d horas" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "hace un día" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "hace %d días" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "hace un mes" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "hace %d meses" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "hace un año" @@ -6420,7 +6430,7 @@ msgstr "" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 955efd243..c781194ad 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:48+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:42: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.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #. TRANS: Page title @@ -101,7 +101,7 @@ msgstr "چنین صفحه‌ای وجود ندارد" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -110,10 +110,8 @@ msgstr "چنین صفحه‌ای وجود ندارد" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "چنین کاربری وجود ندارد." @@ -212,12 +210,12 @@ msgstr "به روز رسانی از %1$ و دوستان در %2$" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "رابط مورد نظر پیدا نشد." @@ -346,7 +344,7 @@ msgstr "هیچ وضعیتی با آن شناسه پیدا نشد." msgid "This status is already a favorite." msgstr "این وضعیت درحال حاضر یک وضعیت مورد علاقه است!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "نمی‌توان وضعیت را موردعلاقه کرد." @@ -465,7 +463,7 @@ msgstr "گروه یافت نشد!" msgid "You are already a member of that group." msgstr "شما از پیش یک عضو این گروه هستید." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "دسترسی شما به گروه توسط مدیر آن محدود شده است." @@ -516,7 +514,7 @@ msgstr "اندازه‌ی نادرست" #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -654,12 +652,12 @@ msgstr "حداکثر طول پیام %d حرف است که شامل ضمیمه msgid "Unsupported format." msgstr "قالب پشتیبانی نشده." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / دوست داشتنی از %s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s به روز رسانی های دوست داشتنی %s / %s" @@ -669,7 +667,7 @@ msgstr "%s به روز رسانی های دوست داشتنی %s / %s" msgid "%1$s / Updates mentioning %2$s" msgstr "%$1s / به روز رسانی های شامل %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s به روز رسانی هایی که در پاسخ به $2$s / %3$s" @@ -679,7 +677,7 @@ msgstr "%1$s به روز رسانی هایی که در پاسخ به $2$s / %3$s msgid "%s public timeline" msgstr "%s خط‌زمانی عمومی" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s به روز رسانی های عموم" @@ -694,12 +692,12 @@ msgstr "" msgid "Repeats of %s" msgstr "تکرار %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "پیام‌هایی که با %s نشانه گزاری شده اند." -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "پیام‌های نشانه گزاری شده با %1$s در %2$s" @@ -760,7 +758,7 @@ msgid "Preview" msgstr "پیش‌نمایش" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "حذف" @@ -844,8 +842,8 @@ msgstr "" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "چنین گروهی وجود ندارد." @@ -950,7 +948,7 @@ msgstr "شما یک عضو این گروه نیستید." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "" @@ -1014,7 +1012,7 @@ msgstr "آیا اطمینان دارید که می‌خواهید این پیا msgid "Do not delete this notice" msgstr "این پیام را پاک نکن" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "این پیام را پاک کن" @@ -1277,7 +1275,7 @@ msgstr "توصیف بسیار زیاد است (حداکثر %d حرف)." msgid "Could not update group." msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "نمی‌توان نام‌های مستعار را ساخت." @@ -1971,7 +1969,7 @@ msgstr "دعوت کردن کاربران تازه" msgid "You are already subscribed to these users:" msgstr "هم اکنون شما این کاربران را دنبال می‌کنید: " -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -2076,7 +2074,7 @@ msgstr "ملحق شدن به گروه" msgid "You must be logged in to leave a group." msgstr "برای ترک یک گروه، شما باید وارد شده باشید." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "شما یک کاربر این گروه نیستید." @@ -2193,12 +2191,12 @@ msgstr "از این فرم برای ساختن یک گروه جدید استفا msgid "New message" msgstr "پیام جدید" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "شما نمی توانید به این کاربر پیام بفرستید." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "بدون محتوا!" @@ -2206,7 +2204,7 @@ msgstr "بدون محتوا!" msgid "No recipient specified." msgstr "هیچ گیرنده ای مشخص نشده" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "یک پیام را به خودتان نفرستید؛ در عوض آن را آهسته برای خود بگویید." @@ -2220,7 +2218,7 @@ msgstr "پیام فرستاده‌شد" msgid "Direct message to %s sent." msgstr "پیام مستقیم به %s فرستاده شد." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "اشکال آژاکسی" @@ -2355,8 +2353,8 @@ msgstr "نوع محتوا " msgid "Only " msgstr " فقط" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست." @@ -2494,7 +2492,7 @@ msgstr "گذرواژه قدیمی اشتباه است" msgid "Error saving user; invalid." msgstr "خطا هنگام ذخیره ی کاربر؛ نا معتبر." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "نمی‌توان گذرواژه جدید را ذخیره کرد." @@ -2978,7 +2976,7 @@ msgstr "ریست کردن کلمه ی عبور" msgid "Recover password" msgstr "بازیابی کلمه ی عبور" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "بازیابی کلمه ی عبور درخواست شد" @@ -2998,19 +2996,19 @@ msgstr "ریست( راه انداری مجدد )" msgid "Enter a nickname or email address." msgstr "یک نام کاربری یا آدرس ایمیل وارد کنید." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "هیچ کاربری با آن آدرس ایمیل یا نام کاربری وجود ندارد." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "برای آن کاربر آدرس ایمیل ثبت شده وجود ندارد." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "خطا هنگام ذخیره ی تاییدیه ی آدرس." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3018,23 +3016,23 @@ msgstr "" "دستورالعمل چگونگی بازیابی کلمه ی عبور به آدرس ایمیل ثبت شده در حساب شما " "ارسال شده است." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "کلمه ی عبور به طور غیر منتظره ریست شد." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "کلمه ی عبور باید ۶ کاراکتر یا بیشتر باشد." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "کلمه ی عبور و تاییدیه ی آن با هم تطابق ندارند." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "کلمه ی عبور جدید با موفقیت ذخیره شد. شما الان وارد شده اید." @@ -3213,7 +3211,7 @@ msgstr "شما نمی توانید آگهی خودتان را تکرار کنی msgid "You already repeated that notice." msgstr "شما قبلا آن آگهی را تکرار کردید." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "" @@ -4411,19 +4409,19 @@ msgstr "شخصی" msgid "Author(s)" msgstr "مؤلف" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4504,7 +4502,7 @@ msgstr "مشکل در ذخیره کردن آگهی." msgid "Problem saving group inbox." msgstr "مشکل در ذخیره کردن آگهی." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4534,29 +4532,29 @@ msgstr "" msgid "Couldn't delete subscription OMB token." msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "" -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "خوش امدید به %1$s , @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "نمیتوان گروه را تشکیل داد" -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "نمیتوان گروه را تشکیل داد" -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "" -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "نمی‌توان شناس‌نامه را ذخیره کرد." @@ -4777,19 +4775,19 @@ msgstr "" msgid "StatusNet software license" msgstr "StatusNet مجوز نرم افزار" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%). " msgstr "" -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4797,41 +4795,41 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "مجوز محتویات سایت" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "همه " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "مجوز." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "صفحه بندى" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "بعد از" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "قبل از" @@ -4941,7 +4939,7 @@ msgstr "پیکره بندی اصلی سایت" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5043,37 +5041,50 @@ msgstr "تغییر گذرواژه" msgid "Password changing is not allowed" msgstr "تغییر گذرواژه" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "نتیجه دستور" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "دستور انجام شد" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "فرمان شکست خورد" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "متاسفانه این دستور هنوز اجرا نشده." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "خبری با این مشخصه ایجاد نشد" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "کاربر آگهی آخر ندارد" + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "پیدا نشد %s کاریری یا نام مستعار" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "پیدا نشد %s کاریری یا نام مستعار" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "متاسفانه این دستور هنوز اجرا نشده." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "فرتادن اژیر" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5084,197 +5095,195 @@ msgstr "" "مشترک : %2$s\n" "خبر : %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "خبری با این مشخصه ایجاد نشد" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "کاربر آگهی آخر ندارد" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "شما از پیش یک عضو این گروه هستید." -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "عضویت %s در گروه %s نا موفق بود." -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "ملحق شدن به گروه" -#: lib/command.php:275 +#: lib/command.php:373 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "خارج شدن %s از گروه %s نا موفق بود" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s گروه %s را ترک کرد." -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "نام کامل : %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "موقعیت : %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "صفحه خانگی : %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "درباره ی : %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" "پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d " "تا فرستادید" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "پیام مستقیم به %s فرستاده شد." -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "خطا در فرستادن پیام مستقیم." -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "نمی توان آگهی خودتان را تکرار کرد" -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "آن آگهی قبلا تکرار شده است." -#: lib/command.php:426 +#: lib/command.php:503 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "آگهی تکرار شد" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "خطا هنگام تکرار آگهی." -#: lib/command.php:482 +#: lib/command.php:536 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d " "تا فرستادید" -#: lib/command.php:491 +#: lib/command.php:545 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "به این آگهی جواب دهید" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "خطا هنگام ذخیره ی آگهی" -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 +#: lib/command.php:602 #, fuzzy -msgid "No such user" -msgstr "چنین کاربری وجود ندارد." +msgid "Can't subscribe to OMB profiles by command." +msgstr "شما به این پروفيل متعهد نشدید" -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "دستور هنوز اجرا نشده" -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "ناتوان در خاموش کردن آگاه سازی." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "آگاه سازی فعال است." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "ناتوان در روشن کردن آگاه سازی." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "فرمان ورود از کار افتاده است" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "مشترک‌ها" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "شما توسط هیچ کس تصویب نشده اید ." -#: lib/command.php:711 +#: lib/command.php:754 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "هم اکنون شما این کاربران را دنبال می‌کنید: " -#: lib/command.php:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "هیچکس شما را تایید نکرده ." -#: lib/command.php:733 +#: lib/command.php:776 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "هیچکس شما را تایید نکرده ." -#: lib/command.php:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "شما در هیچ گروهی عضو نیستید ." -#: lib/command.php:755 +#: lib/command.php:798 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "شما یک عضو این گروه نیستید." -#: lib/command.php:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5503,50 +5512,50 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "فرمت(فایل) عکس پشتیبانی نشده." + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" "است . این فایل بسیار یزرگ است %s بیشترین مقدار قابل قبول برای اندازه ی فایل." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "خطای سیستم ارسال فایل." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "تصویر یا فایل خرابی نیست" -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "فرمت(فایل) عکس پشتیبانی نشده." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "فایلمان گم شده" -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "نوع فایل پشتیبانی نشده" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "مگابایت" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "کیلوبایت" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5747,7 +5756,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "از" @@ -5902,23 +5911,23 @@ msgstr "" msgid "at" msgstr "در" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "در زمینه" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "تکرار از" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "به این آگهی جواب دهید" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "جواب دادن" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "آگهی تکرار شد" @@ -6230,47 +6239,47 @@ msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "چند ثانیه پیش" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "حدود یک دقیقه پیش" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "حدود %d دقیقه پیش" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "حدود یک ساعت پیش" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "حدود %d ساعت پیش" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "حدود یک روز پیش" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "حدود %d روز پیش" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "حدود یک ماه پیش" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "حدود %d ماه پیش" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "حدود یک سال پیش" @@ -6284,7 +6293,7 @@ msgstr "%s یک رنگ صحیح نیست!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s یک رنگ صحیح نیست! از ۳ یا ۶ حرف مبنای شانزده استفاده کنید" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 68a63537b..aa53f56f2 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:46+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:42:35+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -102,7 +102,7 @@ msgstr "Sivua ei ole." #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -111,10 +111,8 @@ msgstr "Sivua ei ole." #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Käyttäjää ei ole." @@ -213,12 +211,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:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "API-metodia ei löytynyt!" @@ -353,7 +351,7 @@ msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä." msgid "This status is already a favorite." msgstr "Tämä päivitys on jo suosikki!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Ei voitu lisätä suosikiksi." @@ -476,7 +474,7 @@ msgstr "Ryhmää ei löytynyt!" msgid "You are already a member of that group." msgstr "Sinä kuulut jo tähän ryhmään." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "Sinut on estetty osallistumasta tähän ryhmään ylläpitäjän toimesta." @@ -527,7 +525,7 @@ msgstr "Koko ei kelpaa." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -671,12 +669,12 @@ msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite." msgid "Unsupported format." msgstr "Formaattia ei ole tuettu." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / Käyttäjän %s suosikit" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen." @@ -686,7 +684,7 @@ msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Vastaukset päivitykseen %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" @@ -697,7 +695,7 @@ msgstr "" msgid "%s public timeline" msgstr "%s julkinen aikajana" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s päivitykset kaikilta!" @@ -712,12 +710,12 @@ msgstr "Vastaukset käyttäjälle %s" msgid "Repeats of %s" msgstr "Vastaukset käyttäjälle %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Päivitykset joilla on tagi %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!" @@ -777,7 +775,7 @@ msgid "Preview" msgstr "Esikatselu" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Poista" @@ -858,8 +856,8 @@ msgstr "Käyttäjän estotiedon tallennus epäonnistui." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "Tuota ryhmää ei ole." @@ -966,7 +964,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:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "Istuntoavaimesi kanssa oli ongelma." @@ -1027,7 +1025,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:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Poista tämä päivitys" @@ -1298,7 +1296,7 @@ msgstr "kuvaus on liian pitkä (max %d merkkiä)." msgid "Could not update group." msgstr "Ei voitu päivittää ryhmää." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Ei voitu lisätä aliasta." @@ -2002,7 +2000,7 @@ msgstr "Kutsu uusia käyttäjiä" msgid "You are already subscribed to these users:" msgstr "Olet jos tilannut seuraavien käyttäjien päivitykset:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2135,7 +2133,7 @@ msgstr "%s liittyi ryhmään %s" msgid "You must be logged in to leave a group." msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "Sinä et kuulu tähän ryhmään." @@ -2256,12 +2254,12 @@ msgstr "Käytä tätä lomaketta luodaksesi ryhmän." msgid "New message" msgstr "Uusi viesti" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Et voi lähettää viestiä tälle käyttäjälle." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Ei sisältöä!" @@ -2269,7 +2267,7 @@ msgstr "Ei sisältöä!" msgid "No recipient specified." msgstr "Vastaanottajaa ei ole määritelty." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi." @@ -2283,7 +2281,7 @@ msgstr "Viesti lähetetty" msgid "Direct message to %s sent." msgstr "Suora viesti käyttäjälle %s lähetetty" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax-virhe" @@ -2418,8 +2416,8 @@ msgstr "Yhdistä" msgid "Only " msgstr "Vain " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Tuo ei ole tuettu tietomuoto." @@ -2557,7 +2555,7 @@ msgstr "Väärä vanha salasana" msgid "Error saving user; invalid." msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Uutta salasanaa ei voida tallentaa." @@ -3064,7 +3062,7 @@ msgstr "Vaihda salasana" msgid "Recover password" msgstr "Salasanan palautus" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Salasanan palautuspyyntö lähetetty." @@ -3084,19 +3082,19 @@ msgstr "Vaihda" msgid "Enter a nickname or email address." msgstr "Syötä käyttäjätunnus tai sähköpostiosoite" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Käyttäjää tuolla sähköpostilla tai käyttäjätunnuksella ei ole." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Rekisteröityä sähköpostiosoitetta ei ole tälle käyttäjälle." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Virhe tapahtui osoitevahvistuksen tallentamisessa" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3104,23 +3102,23 @@ msgstr "" "Ohjeet salasanan palauttamiseksi on lähetetty sähköpostiisiosoitteeseen, " "joka on rekisteröity käyttäjätunnuksellesi." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Odottamaton salasanan uudelleenasetus." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Salasanassa pitää olla 6 tai useampia merkkejä." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Salasana ja salasanan vahvistus eivät täsmää." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Virhe tapahtui käyttäjän asettamisessa." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" "Uusi salasana tallennettiin onnistuneesti. Olet nyt kirjautunut sisään." @@ -3332,7 +3330,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:674 +#: actions/repeat.php:114 lib/noticelist.php:676 #, fuzzy msgid "Repeated" msgstr "Luotu" @@ -4578,19 +4576,19 @@ msgstr "Omat" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4675,7 +4673,7 @@ msgstr "Ongelma päivityksen tallentamisessa." msgid "Problem saving group inbox." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4708,29 +4706,29 @@ msgstr "Ei voitu poistaa tilausta." msgid "Couldn't delete subscription OMB token." msgstr "Ei voitu poistaa tilausta." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Ei voitu poistaa tilausta." -#: classes/User.php:373 +#: classes/User.php:378 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Viesti käyttäjälle %1$s, %2$s" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Ryhmän luonti ei onnistunut." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Ryhmän jäsenyystietoja ei voitu asettaa." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Ryhmän jäsenyystietoja ei voitu asettaa." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Tilausta ei onnistuttu tallentamaan." @@ -4954,7 +4952,7 @@ msgstr "Tönäise" msgid "StatusNet software license" msgstr "StatusNet-ohjelmiston lisenssi" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4963,12 +4961,12 @@ msgstr "" "**%%site.name%%** on mikroblogipalvelu, jonka tarjoaa [%%site.broughtby%%](%%" "site.broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** on mikroblogipalvelu. " -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4979,42 +4977,42 @@ msgstr "" "versio %s, saatavilla lisenssillä [GNU Affero General Public License](http://" "www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 #, fuzzy msgid "Site content license" msgstr "StatusNet-ohjelmiston lisenssi" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "Kaikki " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "lisenssi." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Sivutus" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "Myöhemmin" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Aiemmin" @@ -5131,7 +5129,7 @@ msgstr "SMS vahvistus" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5237,37 +5235,51 @@ msgstr "Salasanan vaihto" msgid "Password changing is not allowed" msgstr "Salasanan vaihto" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Komennon tulos" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Komento suoritettu" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Komento epäonnistui" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Valitettavasti tätä komentoa ei ole vielä toteutettu." +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "Ei profiilia tuolla id:llä." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "Käyttäjällä ei ole viimeistä päivitystä" + +#: lib/command.php:125 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta." -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta." + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Valitettavasti tätä komentoa ei ole vielä toteutettu." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Tönäisy lähetetty" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5275,203 +5287,201 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "Ei profiilia tuolla id:llä." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Käyttäjällä ei ole viimeistä päivitystä" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Päivitys on merkitty suosikiksi." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "Sinä kuulut jo tähän ryhmään." -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s." -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s liittyi ryhmään %s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s erosi ryhmästä %s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Koko nimi: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Kotipaikka: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Kotisivu: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "Tietoa: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Suora viesti käyttäjälle %s lähetetty" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Tapahtui virhe suoran viestin lähetyksessä." -#: lib/command.php:413 +#: lib/command.php:490 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Ilmoituksia ei voi pistää päälle." -#: lib/command.php:418 +#: lib/command.php:495 #, fuzzy msgid "Already repeated that notice" msgstr "Poista tämä päivitys" -#: lib/command.php:426 +#: lib/command.php:503 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Päivitys lähetetty" -#: lib/command.php:428 +#: lib/command.php:505 #, fuzzy msgid "Error repeating notice." msgstr "Ongelma päivityksen tallentamisessa." -#: lib/command.php:482 +#: lib/command.php:536 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d" -#: lib/command.php:491 +#: lib/command.php:545 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Vastaa tähän päivitykseen" -#: lib/command.php:493 +#: lib/command.php:547 #, fuzzy msgid "Error saving notice." msgstr "Ongelma päivityksen tallentamisessa." -#: lib/command.php:547 +#: lib/command.php:594 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:589 -msgid "No such user" -msgstr "Käyttäjää ei ole." +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Et ole tilannut tämän käyttäjän päivityksiä." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Käyttäjän %s päivitykset tilattu" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 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:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Käyttäjän %s päivitysten tilaus lopetettu" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Komentoa ei ole vielä toteutettu." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Ilmoitukset pois päältä." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "Ilmoituksia ei voi pistää pois päältä." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Ilmoitukset päällä." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "Ilmoituksia ei voi pistää päälle." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Käyttäjän %s päivitysten tilaus lopetettu" -#: lib/command.php:709 +#: lib/command.php:752 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Et ole tilannut tämän käyttäjän päivityksiä." -#: lib/command.php:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 #, fuzzy msgid "No one is subscribed to you." msgstr "Toista ei voitu asettaa tilaamaan sinua." -#: lib/command.php:733 +#: lib/command.php:776 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:753 +#: lib/command.php:796 #, fuzzy msgid "You are not a member of any groups." msgstr "Sinä et kuulu tähän ryhmään." -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5709,49 +5719,49 @@ msgstr "Tagit ryhmän %s päivityksissä" msgid "This page is not available in a media type you accept" msgstr "Tämä sivu ei ole saatavilla sinulle sopivassa mediatyypissä." -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Kuvatiedoston formaattia ei ole tuettu." + +#: lib/imagefile.php:90 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Voit ladata ryhmälle logon." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Osittain ladattu palvelimelle." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Tiedoston lähetyksessä tapahtui järjestelmävirhe." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Tuo ei ole kelvollinen kuva tai tiedosto on rikkoutunut." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Kuvatiedoston formaattia ei ole tuettu." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Tiedosto hävisi." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Tunnistamaton tiedoston tyyppi" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5966,7 +5976,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 #, fuzzy msgid "from" msgstr " lähteestä " @@ -6122,25 +6132,25 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 #, fuzzy msgid "in context" msgstr "Ei sisältöä!" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 #, fuzzy msgid "Repeated by" msgstr "Luotu" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Vastaa tähän päivitykseen" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Vastaus" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 #, fuzzy msgid "Notice repeated" msgstr "Päivitys on poistettu." @@ -6469,47 +6479,47 @@ msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "muutama sekunti sitten" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "noin minuutti sitten" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "noin %d minuuttia sitten" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "noin tunti sitten" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "noin %d tuntia sitten" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "noin päivä sitten" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "noin %d päivää sitten" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "noin kuukausi sitten" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "noin %d kuukautta sitten" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "noin vuosi sitten" @@ -6523,7 +6533,7 @@ msgstr "Kotisivun verkko-osoite ei ole toimiva." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 4c9429e21..02bdef611 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:51+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:42:42+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -98,7 +98,7 @@ msgstr "Page non trouvée" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -107,10 +107,8 @@ msgstr "Page non trouvée" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Utilisateur non trouvé." @@ -212,12 +210,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:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "Méthode API non trouvée !" @@ -350,7 +348,7 @@ msgstr "Aucun statut trouvé avec cet identifiant. " msgid "This status is already a favorite." msgstr "Cet avis est déjà un favori." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Impossible de créer le favori." @@ -469,7 +467,7 @@ msgstr "Groupe non trouvé !" msgid "You are already a member of that group." msgstr "Vous êtes déjà membre de ce groupe." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "Vous avez été bloqué de ce groupe par l’administrateur." @@ -519,7 +517,7 @@ msgstr "Jeton incorrect." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -668,12 +666,12 @@ msgstr "" msgid "Unsupported format." msgstr "Format non supporté." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoris de %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s statuts favoris de %2$s / %2$s." @@ -683,7 +681,7 @@ msgstr "%1$s statuts favoris de %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Mises à jour mentionnant %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format 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." @@ -693,7 +691,7 @@ msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s." msgid "%s public timeline" msgstr "Activité publique %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s statuts de tout le monde !" @@ -708,12 +706,12 @@ msgstr "Repris pour %s" msgid "Repeats of %s" msgstr "Reprises de %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Avis marqués avec %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Mises à jour marquées avec %1$s dans %2$s !" @@ -775,7 +773,7 @@ msgid "Preview" msgstr "Aperçu" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Supprimer" @@ -858,8 +856,8 @@ msgstr "Impossible d’enregistrer les informations de blocage." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "Aucun groupe trouvé." @@ -960,7 +958,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:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "Un problème est survenu avec votre jeton de session." @@ -1021,7 +1019,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:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Supprimer cet avis" @@ -1274,7 +1272,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:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Impossible de créer les alias." @@ -1604,7 +1602,7 @@ msgstr "Vous ne pouvez pas attribuer des rôles aux utilisateurs sur ce site." #: actions/grantrole.php:82 msgid "User already has this role." -msgstr "L'utilisateur a déjà ce rôle." +msgstr "L’utilisateur a déjà ce rôle." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1985,7 +1983,7 @@ msgstr "Inviter de nouveaux utilisateurs" msgid "You are already subscribed to these users:" msgstr "Vous êtes déjà abonné à ces utilisateurs :" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2118,7 +2116,7 @@ msgstr "%1$s a rejoint le groupe %2$s" msgid "You must be logged in to leave a group." msgstr "Vous devez ouvrir une session pour quitter un groupe." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "Vous n’êtes pas membre de ce groupe." @@ -2239,12 +2237,12 @@ msgstr "Remplissez les champs ci-dessous pour créer un nouveau groupe :" msgid "New message" msgstr "Nouveau message" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Aucun contenu !" @@ -2252,7 +2250,7 @@ msgstr "Aucun contenu !" msgid "No recipient specified." msgstr "Aucun destinataire n’a été spécifié." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2267,7 +2265,7 @@ msgstr "Message envoyé" msgid "Direct message to %s sent." msgstr "Message direct envoyé à %s." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Erreur Ajax" @@ -2403,8 +2401,8 @@ msgstr "type de contenu " msgid "Only " msgstr "Seulement " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Format de données non supporté." @@ -2536,7 +2534,7 @@ msgstr "Ancien mot de passe incorrect" msgid "Error saving user; invalid." msgstr "Erreur lors de l’enregistrement de l’utilisateur ; invalide." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Impossible de sauvegarder le nouveau mot de passe." @@ -3043,7 +3041,7 @@ msgstr "Réinitialiser le mot de passe" msgid "Recover password" msgstr "Récupérer le mot de passe" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Récupération de mot de passe demandée" @@ -3063,19 +3061,19 @@ msgstr "Réinitialiser" msgid "Enter a nickname or email address." msgstr "Entrez un pseudo ou une adresse courriel." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Aucun utilisateur trouvé avec ce courriel ou ce nom." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Aucune adresse courriel enregistrée pour cet utilisateur." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Erreur lors de l’enregistrement de la confirmation du courriel." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3083,23 +3081,23 @@ msgstr "" "Les instructions pour récupérer votre mot de passe ont été envoyées à " "l’adresse courriel indiquée dans votre compte." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Réinitialisation inattendue du mot de passe." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Le mot de passe doit contenir au moins 6 caractères." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Le mot de passe et sa confirmation ne correspondent pas." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Erreur lors de la configuration de l’utilisateur." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" "Nouveau mot de passe créé avec succès. Votre session est maintenant ouverte." @@ -3304,7 +3302,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:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Repris" @@ -4572,7 +4570,7 @@ msgstr "Version" msgid "Author(s)" msgstr "Auteur(s)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4581,12 +4579,12 @@ msgstr "" "Un fichier ne peut pas être plus gros que %d octets et le fichier que vous " "avez envoyé pesait %d octets. Essayez d’importer une version moins grosse." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Un fichier aussi gros dépasserai votre quota utilisateur de %d octets." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Un fichier aussi gros dépasserai votre quota mensuel de %d octets." @@ -4664,7 +4662,7 @@ msgstr "Problème lors de l’enregistrement de l’avis." msgid "Problem saving group inbox." msgstr "Problème lors de l’enregistrement de la boîte de réception du groupe." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4693,28 +4691,28 @@ msgstr "Impossible de supprimer l’abonnement à soi-même." msgid "Couldn't delete subscription OMB token." msgstr "Impossible de supprimer le jeton OMB de l'abonnement ." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Impossible de cesser l’abonnement" -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Bienvenue à %1$s, @%2$s !" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Impossible de créer le groupe." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "Impossible de définir l'URI du groupe." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Impossible d’établir l’inscription au groupe." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "Impossible d’enregistrer les informations du groupe local." @@ -4918,7 +4916,7 @@ msgstr "Insigne" msgid "StatusNet software license" msgstr "Licence du logiciel StatusNet" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4927,12 +4925,12 @@ msgstr "" "**%%site.name%%** est un service de microblogging qui vous est proposé par " "[%%site.broughtby%%](%%site.broughtbyurl%%)." -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** est un service de micro-blogging." -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4943,45 +4941,45 @@ msgstr "" "version %s, disponible sous la licence [GNU Affero General Public License] " "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "Licence du contenu du site" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "Le contenu et les données de %1$s sont privés et confidentiels." -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" "Le contenu et les données sont sous le droit d’auteur de %1$s. Tous droits " "réservés." -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "Le contenu et les données sont sous le droit d’auteur du contributeur. Tous " "droits réservés." -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "Tous " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "licence." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Pagination" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "Après" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Avant" @@ -5085,7 +5083,7 @@ msgstr "" "La ressource de l’API a besoin de l’accès en lecture et en écriture, mais " "vous n’y avez accès qu’en lecture." -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5187,37 +5185,50 @@ msgstr "La modification du mot de passe a échoué" msgid "Password changing is not allowed" msgstr "La modification du mot de passe n’est pas autorisée" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Résultats de la commande" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Commande complétée" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Échec de la commande" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Désolé, cette commande n’a pas encore été implémentée." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Aucun avis avec cet identifiant n’existe" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "Aucun avis récent pour cet utilisateur" + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "Impossible de trouver un utilisateur avec le pseudo %s" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Impossible de trouver un utilisateur avec le pseudo %s" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Désolé, cette commande n’a pas encore été implémentée." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Ça n’a pas de sens de se faire un clin d’œil à soi-même !" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "Clin d’œil envoyé à %s" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5228,201 +5239,200 @@ msgstr "" "Abonnés : %2$s\n" "Messages : %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Aucun avis avec cet identifiant n’existe" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Aucun avis récent pour cet utilisateur" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Avis ajouté aux favoris." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "Vous êtes déjà membre de ce groupe" -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "Impossible d’inscrire l’utilisateur %s au groupe %s" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s a rejoint le groupe %s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "Impossible de retirer l’utilisateur %s du groupe %s" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s a quitté le groupe %s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Nom complet : %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Emplacement : %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Site Web : %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "À propos : %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" "Message trop long ! La taille maximale est de %d caractères ; vous en avez " "entré %d." -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Message direct envoyé à %s." -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Une erreur est survenue pendant l’envoi de votre message." -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "Impossible de reprendre votre propre avis" -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "Avis déjà repris" -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "Avis de %s repris" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "Erreur lors de la reprise de l’avis." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "Avis trop long ! La taille maximale est de %d caractères ; vous en avez " "entré %d." -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "Réponse à %s envoyée" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "Problème lors de l’enregistrement de l’avis." -#: lib/command.php:547 +#: lib/command.php:594 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:589 -msgid "No such user" -msgstr "Utilisateur non trouvé." +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Vous n’êtes pas abonné(e) à ce profil." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Abonné à %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 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:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Désabonné de %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Cette commande n’a pas encore été implémentée." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Avertissements désactivés." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "Impossible de désactiver les avertissements." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Avertissements activés." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "Impossible d’activer les avertissements." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "La commande d’ouverture de session est désactivée" -#: lib/command.php:665 +#: lib/command.php:708 #, 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:692 +#: lib/command.php:735 #, php-format msgid "Unsubscribed %s" msgstr "Désabonné de %s" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "Vous n’êtes abonné(e) à personne." -#: lib/command.php:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "Personne ne s’est abonné à vous." -#: lib/command.php:733 +#: lib/command.php:776 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:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "Vous n’êtes membre d’aucun groupe." -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5697,49 +5707,49 @@ msgid "This page is not available in a media type you accept" msgstr "" "Cette page n’est pas disponible dans un des formats que vous avez autorisés." -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Format de fichier d’image non supporté." + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Ce fichier est trop grand. La taille maximale est %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Transfert partiel." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Erreur système lors du transfert du fichier." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Ceci n’est pas une image, ou c’est un fichier corrompu." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Format de fichier d’image non supporté." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Fichier perdu." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Type de fichier inconnu" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "Mo" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "Ko" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "Source %d inconnue pour la boîte de réception." @@ -6020,7 +6030,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:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "de" @@ -6176,23 +6186,23 @@ msgstr "O" msgid "at" msgstr "chez" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "dans le contexte" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "Repris par" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Répondre à cet avis" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Répondre" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "Avis repris" @@ -6502,47 +6512,47 @@ msgctxt "role" msgid "Moderator" msgstr "Modérateur" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "il y a quelques secondes" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "il y a 1 minute" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "il y a %d minutes" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "il y a 1 heure" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "il y a %d heures" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "il y a 1 jour" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "il y a %d jours" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "il y a 1 mois" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "il y a %d mois" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "il y a environ 1 an" @@ -6557,7 +6567,7 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" "%s n’est pas une couleur valide ! Utilisez 3 ou 6 caractères hexadécimaux." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index dea9dd11c..ee14c3a2f 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:54+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:42:45+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -102,7 +102,7 @@ msgstr "Non existe a etiqueta." #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -111,10 +111,8 @@ msgstr "Non existe a etiqueta." #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Ningún usuario." @@ -208,12 +206,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:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Método da API non atopado" @@ -349,7 +347,7 @@ msgstr "Non se atopou un estado con ese ID." msgid "This status is already a favorite." msgstr "Este chío xa é un favorito!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Non se puido crear o favorito." @@ -474,7 +472,7 @@ msgstr "Método da API non atopado" msgid "You are already a member of that group." msgstr "Xa estas suscrito a estes usuarios:" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "" @@ -525,7 +523,7 @@ msgstr "Tamaño inválido." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -670,12 +668,12 @@ msgstr "" msgid "Unsupported format." msgstr "Formato de ficheiro de imaxe non soportado." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / Favoritos dende %s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s updates favorited by %s / %s." @@ -685,7 +683,7 @@ msgstr "%s updates favorited by %s / %s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Chíos que respostan a %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format 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." @@ -695,7 +693,7 @@ msgstr "Hai %1$s chíos en resposta a chíos dende %2$s / %3$s." msgid "%s public timeline" msgstr "Liña de tempo pública de %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s chíos de calquera!" @@ -710,12 +708,12 @@ msgstr "Replies to %s" msgid "Repeats of %s" msgstr "Replies to %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Chíos tagueados con %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualizacións dende %1$s en %2$s!" @@ -777,7 +775,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 #, fuzzy msgid "Delete" msgstr "eliminar" @@ -865,8 +863,8 @@ msgstr "Erro ao gardar información de bloqueo." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 #, fuzzy msgid "No such group." msgstr "Non existe a etiqueta." @@ -976,7 +974,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:1217 +#: lib/action.php:1220 #, fuzzy msgid "There was a problem with your session token." msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..." @@ -1040,7 +1038,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:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 #, fuzzy msgid "Delete this notice" msgstr "Eliminar chío" @@ -1319,7 +1317,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:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "Non se puido crear o favorito." @@ -2036,7 +2034,7 @@ msgstr "Invitar a novos usuarios" msgid "You are already subscribed to these users:" msgstr "Xa estas suscrito a estes usuarios:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2168,7 +2166,7 @@ msgstr "%s / Favoritos dende %s" msgid "You must be logged in to leave a group." msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 #, fuzzy msgid "You are not a member of that group." msgstr "Non estás suscrito a ese perfil" @@ -2287,12 +2285,12 @@ msgstr "" msgid "New message" msgstr "Nova mensaxe" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Non podes enviar mensaxes a este usurio." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Sen contido!" @@ -2300,7 +2298,7 @@ msgstr "Sen contido!" msgid "No recipient specified." msgstr "Non se especificou ningún destinatario" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2317,7 +2315,7 @@ msgstr "Non hai mensaxes de texto!" msgid "Direct message to %s sent." msgstr "Mensaxe directo a %s enviado" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Erro de Ajax" @@ -2449,8 +2447,8 @@ msgstr "Conectar" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Non é un formato de datos soportado." @@ -2590,7 +2588,7 @@ msgstr "Contrasinal actual incorrecta" msgid "Error saving user; invalid." msgstr "Acounteceu un erro gardando o usuario: é inválido." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Non se pode gardar a contrasinal." @@ -3103,7 +3101,7 @@ msgstr "Restaurar contrasinal" msgid "Recover password" msgstr "Recuperar contrasinal" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Petición de recuperación de contrasinal" @@ -3123,19 +3121,19 @@ msgstr "Restaurar" msgid "Enter a nickname or email address." msgstr "Insire o teu alcume ou enderezo de correo." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Non hai ningún usuario con isa dirección de correo ou nome de usuario." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Non hai un enderezo de correo rexistrado para ese usuario." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Acounteceu un erro gardando a confirmación de enderezo." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3143,23 +3141,23 @@ msgstr "" "As instruccións para recuperar a túa contrasinal foron enviadas ó enderezo " "de correo da túa conta." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Restauración de contrasinal non esperada." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "A contrasinal debe ter 6 caracteres ou máis." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "A contrasinal e a súa confirmación non coinciden." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Acounteceu un erro configurando o usuario." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "A nova contrasinal gardouse correctamente. Xa estas logueado." @@ -3372,7 +3370,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:674 +#: actions/repeat.php:114 lib/noticelist.php:676 #, fuzzy msgid "Repeated" msgstr "Crear" @@ -4633,19 +4631,19 @@ msgstr "Persoal" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4731,7 +4729,7 @@ msgstr "Aconteceu un erro ó gardar o chío." msgid "Problem saving group inbox." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4764,31 +4762,31 @@ msgstr "Non se pode eliminar a subscrición." msgid "Couldn't delete subscription OMB token." msgstr "Non se pode eliminar a subscrición." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Non se pode eliminar a subscrición." -#: classes/User.php:373 +#: classes/User.php:378 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Mensaxe de %1$s en %2$s" -#: classes/User_group.php:477 +#: classes/User_group.php:480 #, fuzzy msgid "Could not create group." msgstr "Non se puido crear o favorito." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Non se pode gardar a subscrición." -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "Non se pode gardar a subscrición." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Non se pode gardar a subscrición." @@ -5012,7 +5010,7 @@ msgstr "" msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -5021,12 +5019,12 @@ msgstr "" "**%%site.name%%** é un servizo de microbloguexo que che proporciona [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** é un servizo de microbloguexo." -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -5037,44 +5035,44 @@ msgstr "" "%s, dispoñible baixo licenza [GNU Affero General Public License](http://www." "fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 #, fuzzy msgid "Site content license" msgstr "Atopar no contido dos chíos" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 #, fuzzy msgid "All " msgstr "Todos" -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "" -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#: lib/action.php:1164 #, fuzzy msgid "After" msgstr "« Despois" -#: lib/action.php:1169 +#: lib/action.php:1172 #, fuzzy msgid "Before" msgstr "Antes »" @@ -5192,7 +5190,7 @@ msgstr "Confirmación de SMS" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5298,37 +5296,51 @@ msgstr "Contrasinal gardada." msgid "Password changing is not allowed" msgstr "Contrasinal gardada." -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Resultados do comando" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Comando completo" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Comando fallido" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Desculpa, este comando todavía non está implementado." +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "Non se atopou un perfil con ese ID." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "O usuario non ten último chio." + +#: lib/command.php:125 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Non se puido actualizar o usuario coa dirección de correo electrónico." -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Non se puido actualizar o usuario coa dirección de correo electrónico." + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Desculpa, este comando todavía non está implementado." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Toque enviado" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5339,176 +5351,174 @@ msgstr "" "Suscriptores: %2$s\n" "Chíos: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "Non se atopou un perfil con ese ID." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "O usuario non ten último chio." - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Chío marcado coma favorito." -#: lib/command.php:217 +#: lib/command.php:317 #, fuzzy msgid "You are already a member of that group" msgstr "Xa estas suscrito a estes usuarios:" -#: lib/command.php:231 +#: lib/command.php:331 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "Non podes seguir a este usuario: o Usuario non se atopa." -#: lib/command.php:236 +#: lib/command.php:336 #, fuzzy, php-format msgid "%s joined group %s" msgstr "%s / Favoritos dende %s" -#: lib/command.php:275 +#: lib/command.php:373 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "Non podes seguir a este usuario: o Usuario non se atopa." -#: lib/command.php:280 +#: lib/command.php:378 #, fuzzy, php-format msgid "%s left group %s" msgstr "%s / Favoritos dende %s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Ubicación: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Páxina persoal: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d " -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Mensaxe directo a %s enviado" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Erro ó enviar a mensaxe directa." -#: lib/command.php:413 +#: lib/command.php:490 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Non se pode activar a notificación." -#: lib/command.php:418 +#: lib/command.php:495 #, fuzzy msgid "Already repeated that notice" msgstr "Eliminar chío" -#: lib/command.php:426 +#: lib/command.php:503 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Chío publicado" -#: lib/command.php:428 +#: lib/command.php:505 #, fuzzy msgid "Error repeating notice." msgstr "Aconteceu un erro ó gardar o chío." -#: lib/command.php:482 +#: lib/command.php:536 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d " -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "Non se pode eliminar este chíos." -#: lib/command.php:493 +#: lib/command.php:547 #, fuzzy msgid "Error saving notice." msgstr "Aconteceu un erro ó gardar o chío." -#: lib/command.php:547 +#: lib/command.php:594 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:589 -msgid "No such user" -msgstr "Ningún usuario." +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Suscrito a %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "Especifica o nome de usuario ó que queres deixar de seguir" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Desuscribir de %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Comando non implementado." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Notificación desactivada." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "No se pode desactivar a notificación." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Notificación habilitada." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "Non se pode activar a notificación." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Desuscribir de %s" -#: lib/command.php:709 +#: lib/command.php:752 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:711 +#: lib/command.php:754 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Xa estas suscrito a estes usuarios:" @@ -5517,12 +5527,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:731 +#: lib/command.php:774 #, fuzzy msgid "No one is subscribed to you." msgstr "Outro usuario non se puido suscribir a ti." -#: lib/command.php:733 +#: lib/command.php:776 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." @@ -5531,12 +5541,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:753 +#: lib/command.php:796 #, fuzzy msgid "You are not a member of any groups." msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:755 +#: lib/command.php:798 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" @@ -5545,7 +5555,7 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:769 +#: lib/command.php:812 #, fuzzy msgid "" "Commands:\n" @@ -5812,51 +5822,51 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Formato de ficheiro de imaxe non soportado." + +#: lib/imagefile.php:90 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Podes actualizar a túa información do perfil persoal aquí" -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Carga parcial." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Aconteceu un erro no sistema namentras se estaba cargando o ficheiro." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Non é unha imaxe ou está corrupta." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Formato de ficheiro de imaxe non soportado." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 #, fuzzy msgid "Lost our file." msgstr "Bloqueo de usuario fallido." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 #, fuzzy msgid "Unknown file type" msgstr "tipo de ficheiro non soportado" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -6117,7 +6127,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 #, fuzzy msgid "from" msgstr " dende " @@ -6276,27 +6286,27 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 #, fuzzy msgid "in context" msgstr "Sen contido!" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 #, fuzzy msgid "Repeated by" msgstr "Crear" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 #, fuzzy msgid "Reply to this notice" msgstr "Non se pode eliminar este chíos." -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 #, fuzzy msgid "Reply" msgstr "contestar" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 #, fuzzy msgid "Notice repeated" msgstr "Chío publicado" @@ -6638,47 +6648,47 @@ msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "fai uns segundos" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "fai un minuto" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "fai %d minutos" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "fai unha hora" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "fai %d horas" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "fai un día" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "fai %d días" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "fai un mes" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "fai %d meses" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "fai un ano" @@ -6692,7 +6702,7 @@ msgstr "%1s non é unha orixe fiable." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d " diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 49f229a96..72ddfb14b 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:49:57+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:43:00+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -99,7 +99,7 @@ msgstr "אין הודעה כזו." #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -108,10 +108,8 @@ msgstr "אין הודעה כזו." #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "אין משתמש כזה." @@ -205,12 +203,12 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "קוד האישור לא נמצא." @@ -343,7 +341,7 @@ msgstr "" msgid "This status is already a favorite." msgstr "זהו כבר זיהוי ה-Jabber שלך." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "" @@ -466,7 +464,7 @@ msgstr "לא נמצא" msgid "You are already a member of that group." msgstr "כבר נכנסת למערכת!" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "" @@ -518,7 +516,7 @@ msgstr "גודל לא חוקי." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -661,12 +659,12 @@ msgstr "" msgid "Unsupported format." msgstr "פורמט התמונה אינו נתמך." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "הסטטוס של %1$s ב-%2$s " -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "מיקרובלוג מאת %s" @@ -676,7 +674,7 @@ msgstr "מיקרובלוג מאת %s" msgid "%1$s / Updates mentioning %2$s" msgstr "הסטטוס של %1$s ב-%2$s " -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" @@ -686,7 +684,7 @@ msgstr "" msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -701,12 +699,12 @@ msgstr "תגובת עבור %s" msgid "Repeats of %s" msgstr "תגובת עבור %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "מיקרובלוג מאת %s" @@ -769,7 +767,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 #, fuzzy msgid "Delete" msgstr "מחק" @@ -855,8 +853,8 @@ msgstr "" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 #, fuzzy msgid "No such group." msgstr "אין הודעה כזו." @@ -965,7 +963,7 @@ msgstr "לא שלחנו אלינו את הפרופיל הזה" #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "" @@ -1025,7 +1023,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "אין הודעה כזו." -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "" @@ -1297,7 +1295,7 @@ msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיו msgid "Could not update group." msgstr "עידכון המשתמש נכשל." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "שמירת מידע התמונה נכשל" @@ -2006,7 +2004,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -2108,7 +2106,7 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 #, fuzzy msgid "You are not a member of that group." msgstr "לא שלחנו אלינו את הפרופיל הזה" @@ -2223,12 +2221,12 @@ msgstr "" msgid "New message" msgstr "הודעה חדשה" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "אין תוכן!" @@ -2236,7 +2234,7 @@ msgstr "אין תוכן!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2251,7 +2249,7 @@ msgstr "הודעה חדשה" msgid "Direct message to %s sent." msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "" @@ -2380,8 +2378,8 @@ msgstr "התחבר" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "" @@ -2521,7 +2519,7 @@ msgstr "הסיסמה הישנה לא נכונה" msgid "Error saving user; invalid." msgstr "שגיאה בשמירת שם המשתמש, לא עומד בכללים." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "לא ניתן לשמור את הסיסמה" @@ -3019,7 +3017,7 @@ msgstr "איפוס סיסמה" msgid "Recover password" msgstr "סיסמת שיחזור" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "התבקש שיחזור סיסמה" @@ -3039,41 +3037,41 @@ msgstr "איפוס" msgid "Enter a nickname or email address." msgstr "" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "" -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "שגיאה בשמירת אישור הכתובת." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "איפוס סיסמה לא צפוי." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "הסיסמה חייבת להיות בת לפחות 6 אותיות." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "הסיסמה ואישורה אינן תואמות." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "שגיאה ביצירת שם המשתמש." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "הסיסמה החדשה נשמרה בהצלחה. אתה מחובר למערכת." @@ -3258,7 +3256,7 @@ msgstr "לא ניתן להירשם ללא הסכמה לרשיון" msgid "You already repeated that notice." msgstr "כבר נכנסת למערכת!" -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 #, fuzzy msgid "Repeated" msgstr "צור" @@ -4482,19 +4480,19 @@ msgstr "אישי" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4575,7 +4573,7 @@ msgstr "בעיה בשמירת ההודעה." msgid "Problem saving group inbox." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4608,31 +4606,31 @@ msgstr "מחיקת המנוי לא הצליחה." msgid "Couldn't delete subscription OMB token." msgstr "מחיקת המנוי לא הצליחה." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "מחיקת המנוי לא הצליחה." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: classes/User_group.php:477 +#: classes/User_group.php:480 #, fuzzy msgid "Could not create group." msgstr "שמירת מידע התמונה נכשל" -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "יצירת המנוי נכשלה." -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "יצירת המנוי נכשלה." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "יצירת המנוי נכשלה." @@ -4854,7 +4852,7 @@ msgstr "" msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4863,12 +4861,12 @@ msgstr "" "**%%site.name%%** הוא שרות ביקרובלוג הניתן על ידי [%%site.broughtby%%](%%" "site.broughtbyurl%%)." -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** הוא שרות ביקרובלוג." -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4879,43 +4877,43 @@ msgstr "" "s, המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)" -#: lib/action.php:821 +#: lib/action.php:824 #, fuzzy msgid "Site content license" msgstr "הודעה חדשה" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "" -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "" -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#: lib/action.php:1164 #, fuzzy msgid "After" msgstr "<< אחרי" -#: lib/action.php:1169 +#: lib/action.php:1172 #, fuzzy msgid "Before" msgstr "לפני >>" @@ -5027,7 +5025,7 @@ msgstr "הרשמות" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5133,37 +5131,52 @@ msgstr "הסיסמה נשמרה." msgid "Password changing is not allowed" msgstr "הסיסמה נשמרה." -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "" +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "אין פרופיל תואם לפרופיל המרוחק " -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +#, fuzzy +msgid "User has no last notice" +msgstr "למשתמש אין פרופיל." + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "עידכון המשתמש נכשל." -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "עידכון המשתמש נכשל." + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "תגובת עבור %s" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5171,206 +5184,202 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "אין פרופיל תואם לפרופיל המרוחק " - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -#, fuzzy -msgid "User has no last notice" -msgstr "למשתמש אין פרופיל." - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:317 #, fuzzy msgid "You are already a member of that group" msgstr "כבר נכנסת למערכת!" -#: lib/command.php:231 +#: lib/command.php:331 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "נכשלה ההפניה לשרת: %s" -#: lib/command.php:236 +#: lib/command.php:336 #, fuzzy, php-format msgid "%s joined group %s" msgstr "הסטטוס של %1$s ב-%2$s " -#: lib/command.php:275 +#: lib/command.php:373 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "נכשלה יצירת OpenID מתוך: %s" -#: lib/command.php:280 +#: lib/command.php:378 #, fuzzy, php-format msgid "%s left group %s" msgstr "הסטטוס של %1$s ב-%2$s " -#: lib/command.php:309 +#: lib/command.php:401 #, fuzzy, php-format msgid "Fullname: %s" msgstr "שם מלא" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "אודות: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:490 #, fuzzy msgid "Cannot repeat your own notice" msgstr "לא ניתן להירשם ללא הסכמה לרשיון" -#: lib/command.php:418 +#: lib/command.php:495 #, fuzzy msgid "Already repeated that notice" msgstr "כבר נכנסת למערכת!" -#: lib/command.php:426 +#: lib/command.php:503 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "הודעות" -#: lib/command.php:428 +#: lib/command.php:505 #, fuzzy msgid "Error repeating notice." msgstr "בעיה בשמירת ההודעה." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:545 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "תגובת עבור %s" -#: lib/command.php:493 +#: lib/command.php:547 #, fuzzy msgid "Error saving notice." msgstr "בעיה בשמירת ההודעה." -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 +#: lib/command.php:602 #, fuzzy -msgid "No such user" -msgstr "אין משתמש כזה." +msgid "Can't subscribe to OMB profiles by command." +msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "בטל מנוי" -#: lib/command.php:709 +#: lib/command.php:752 #, fuzzy msgid "You are not subscribed to anyone." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:711 +#: lib/command.php:754 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "לא שלחנו אלינו את הפרופיל הזה" msgstr[1] "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:731 +#: lib/command.php:774 #, fuzzy msgid "No one is subscribed to you." msgstr "הרשמה מרוחקת" -#: lib/command.php:733 +#: lib/command.php:776 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "הרשמה מרוחקת" msgstr[1] "הרשמה מרוחקת" -#: lib/command.php:753 +#: lib/command.php:796 #, fuzzy msgid "You are not a member of any groups." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:755 +#: lib/command.php:798 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "לא שלחנו אלינו את הפרופיל הזה" msgstr[1] "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5608,50 +5617,50 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "פורמט התמונה אינו נתמך." + +#: lib/imagefile.php:90 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "העלאה חלקית." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "שגיאת מערכת בהעלאת הקובץ." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "זהו לא קובץ תמונה, או שחל בו שיבוש." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "פורמט התמונה אינו נתמך." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 #, fuzzy msgid "Lost our file." msgstr "אין הודעה כזו." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5855,7 +5864,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "" @@ -6012,26 +6021,26 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 #, fuzzy msgid "in context" msgstr "אין תוכן!" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 #, fuzzy msgid "Repeated by" msgstr "צור" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 #, fuzzy msgid "Reply" msgstr "הגב" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 #, fuzzy msgid "Notice repeated" msgstr "הודעות" @@ -6361,47 +6370,47 @@ msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "לפני מספר שניות" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "לפני כדקה" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "לפני כ-%d דקות" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "לפני כשעה" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "לפני כ-%d שעות" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "לפני כיום" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "לפני כ-%d ימים" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "לפני כחודש" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "לפני כ-%d חודשים" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "לפני כשנה" @@ -6415,7 +6424,7 @@ msgstr "לאתר הבית יש כתובת לא חוקית." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 91d9c9c73..0856b4277 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:00+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:43:05+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -29,15 +29,13 @@ msgstr "Přistup" #. TRANS: Page notice #: actions/accessadminpanel.php:67 -#, fuzzy msgid "Site access settings" -msgstr "Sydłowe nastajenja składować" +msgstr "Nastajenja za sydłowy přistup" #. TRANS: Form legend for registration form. #: actions/accessadminpanel.php:161 -#, fuzzy msgid "Registration" -msgstr "Registrować" +msgstr "Registrowanje" #. TRANS: Checkbox instructions for admin setting "Private" #: actions/accessadminpanel.php:165 @@ -46,7 +44,6 @@ msgstr "" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" msgstr "Priwatny" @@ -73,12 +70,10 @@ msgstr "Začinjeny" #. TRANS: Title / tooltip for button to save access settings in site admin panel #: actions/accessadminpanel.php:202 -#, fuzzy msgid "Save access settings" -msgstr "Sydłowe nastajenja składować" +msgstr "Přistupne nastajenja składować" #: actions/accessadminpanel.php:203 -#, fuzzy msgctxt "BUTTON" msgid "Save" msgstr "Składować" @@ -99,7 +94,7 @@ msgstr "Strona njeeksistuje" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -108,10 +103,8 @@ msgstr "Strona njeeksistuje" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Wužiwar njeeksistuje" @@ -204,12 +197,12 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "API-metoda njenamakana." @@ -336,7 +329,7 @@ msgstr "Status z tym ID njenamakany." msgid "This status is already a favorite." msgstr "Tutón status je hižo faworit." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "" @@ -453,7 +446,7 @@ msgstr "Skupina njenamakana!" msgid "You are already a member of that group." msgstr "Sy hižo čłon teje skupiny." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "" @@ -491,9 +484,8 @@ msgid "No oauth_token parameter provided." msgstr "" #: actions/apioauthauthorize.php:106 -#, fuzzy msgid "Invalid token." -msgstr "Njepłaćiwa wulkosć." +msgstr "Njepłaćiwy token." #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:157 actions/disfavor.php:74 @@ -504,7 +496,7 @@ msgstr "Njepłaćiwa wulkosć." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -518,12 +510,10 @@ msgid "Invalid nickname / password!" msgstr "Njepłaćiwe přimjeno abo hesło!" #: actions/apioauthauthorize.php:159 -#, fuzzy msgid "Database error deleting OAuth application user." -msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije." +msgstr "Zmylk datoweje banki při zhašenju wužiwarja OAuth-aplikacije." #: actions/apioauthauthorize.php:185 -#, fuzzy msgid "Database error inserting OAuth application user." msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije." @@ -641,12 +631,12 @@ msgstr "" msgid "Unsupported format." msgstr "Njepodpěrany format." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" @@ -656,7 +646,7 @@ msgstr "" msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" @@ -666,7 +656,7 @@ msgstr "" msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -681,12 +671,12 @@ msgstr "" msgid "Repeats of %s" msgstr "" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -747,7 +737,7 @@ msgid "Preview" msgstr "Přehlad" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Zničić" @@ -827,8 +817,8 @@ msgstr "" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "Skupina njeeksistuje." @@ -915,14 +905,12 @@ msgid "Notices" msgstr "Zdźělenki" #: actions/deleteapplication.php:63 -#, fuzzy msgid "You must be logged in to delete an application." -msgstr "Dyrbiš přizjewjeny być, zo by skupinu wobdźěłał." +msgstr "Dyrbiš přizjewjeny być, zo by aplikaciju zničił." #: actions/deleteapplication.php:71 -#, fuzzy msgid "Application not found." -msgstr "Aplikaciski profil" +msgstr "Aplikaciska njenamakana." #: actions/deleteapplication.php:78 actions/editapplication.php:77 #: actions/showapplication.php:94 @@ -931,14 +919,13 @@ 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:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "" #: actions/deleteapplication.php:123 actions/deleteapplication.php:147 -#, fuzzy msgid "Delete application" -msgstr "Aplikacija njeeksistuje." +msgstr "Aplikaciju zničić" #: actions/deleteapplication.php:149 msgid "" @@ -948,14 +935,12 @@ msgid "" msgstr "" #: actions/deleteapplication.php:156 -#, fuzzy msgid "Do not delete this application" -msgstr "Tutu zdźělenku njewušmórnyć" +msgstr "Tutu aplikaciju njezničić" #: actions/deleteapplication.php:160 -#, fuzzy msgid "Delete this application" -msgstr "Tutu zdźělenku wušmórnyć" +msgstr "Tutu aplikaciju zničić" #. TRANS: Client error message #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62 @@ -990,7 +975,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:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Tutu zdźělenku wušmórnyć" @@ -1144,14 +1129,13 @@ msgid "Add to favorites" msgstr "K faworitam přidać" #: actions/doc.php:158 -#, fuzzy, php-format +#, php-format msgid "No such document \"%s\"" -msgstr "Dokument njeeksistuje." +msgstr "Dokument \"%s\" njeeksistuje" #: actions/editapplication.php:54 -#, fuzzy msgid "Edit Application" -msgstr "Aplikacije OAuth" +msgstr "Aplikaciju wobdźěłać" #: actions/editapplication.php:66 msgid "You must be logged in to edit an application." @@ -1175,9 +1159,8 @@ msgid "Name is too long (max 255 chars)." msgstr "Mjeno je předołho (maks. 255 znamješkow)." #: actions/editapplication.php:183 actions/newapplication.php:162 -#, fuzzy msgid "Name already in use. Try another one." -msgstr "Přimjeno so hižo wužiwa. Spytaj druhe." +msgstr "Mjeno so hižo wužiwa. Spytaj druhe." #: actions/editapplication.php:186 actions/newapplication.php:168 msgid "Description is required." @@ -1242,7 +1225,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:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Aliasy njejsu so dali wutworić." @@ -1547,23 +1530,20 @@ msgid "Cannot read file." msgstr "Dataja njeda so čitać." #: actions/grantrole.php:62 actions/revokerole.php:62 -#, fuzzy msgid "Invalid role." -msgstr "Njepłaćiwa wulkosć." +msgstr "Njepłaćiwa róla." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." msgstr "" #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać." +msgstr "Njemóžeš wužiwarske róle na tutym sydle garantować." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "Wužiwar nima profil." +msgstr "Wužiwar hižo ma tutu rólu." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1908,7 +1888,7 @@ msgstr "Nowych wužiwarjow přeprosyć" msgid "You are already subscribed to these users:" msgstr "Sy tutych wužiwarjow hižo abonował:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1953,7 +1933,6 @@ msgstr "Wosobinsku powěsć po dobrozdaću přeprošenju přidać." #. TRANS: Send button for inviting friends #: actions/invite.php:198 -#, fuzzy msgctxt "BUTTON" msgid "Send" msgstr "Pósłać" @@ -1999,9 +1978,8 @@ msgid "You must be logged in to join a group." msgstr "" #: actions/joingroup.php:88 actions/leavegroup.php:88 -#, fuzzy msgid "No nickname or ID." -msgstr "Žane přimjeno." +msgstr "Žane přimjeno abo žadyn ID." #: actions/joingroup.php:141 #, php-format @@ -2012,7 +1990,7 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "Dyrbiš přizjewjeny być, zo by skupinu wopušćił." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "Njejsy čłon teje skupiny." @@ -2090,9 +2068,8 @@ msgid "No current status" msgstr "Žadyn aktualny status" #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" -msgstr "Aplikacija njeeksistuje." +msgstr "Nowa aplikacija" #: actions/newapplication.php:64 msgid "You must be logged in to register an application." @@ -2122,12 +2099,12 @@ msgstr "Wužij tutón formular, zo by nowu skupinu wutworił." msgid "New message" msgstr "Nowa powěsć" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Žadyn wobsah!" @@ -2135,7 +2112,7 @@ msgstr "Žadyn wobsah!" msgid "No recipient specified." msgstr "Žadyn přijimowar podaty." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2149,7 +2126,7 @@ msgstr "Powěsć pósłana" msgid "Direct message to %s sent." msgstr "Direktna powěsć do %s pósłana." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Zmylk Ajax" @@ -2273,8 +2250,8 @@ msgstr "" msgid "Only " msgstr "Jenož " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Njeje podpěrany datowy format." @@ -2405,7 +2382,7 @@ msgstr "Wopačne stare hesło" msgid "Error saving user; invalid." msgstr "" -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "" @@ -2882,7 +2859,7 @@ msgstr "Hesło wróćo stajić" msgid "Recover password" msgstr "" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "" @@ -2902,42 +2879,42 @@ msgstr "Wróćo stajić" msgid "Enter a nickname or email address." msgstr "Zapodaj přimjeno abo e-mejlowu adresu." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" "Wužiwar z tej e-mejlowej adresu abo tym wužiwarskim mjenom njeeksistuje." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Wužiwar nima žanu zregistrowanu e-mejlowu adresu." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Hesło dyrbi 6 znamješkow abo wjace měć." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "" -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" @@ -3112,7 +3089,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:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Wospjetowany" @@ -3173,14 +3150,12 @@ msgid "Replies to %1$s on %2$s!" msgstr "" #: actions/revokerole.php:75 -#, fuzzy msgid "You cannot revoke user roles on this site." -msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać." +msgstr "Njemóžeš wužiwarske róle na tutym sydle wotwołać." #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "Wužiwar bjez hodźaceho so profila." +msgstr "Wužiwar nima tutu rólu." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" @@ -3201,9 +3176,8 @@ msgid "Sessions" msgstr "Posedźenja" #: actions/sessionsadminpanel.php:65 -#, fuzzy msgid "Session settings for this StatusNet site." -msgstr "Designowe nastajenja za tute sydło StatusNet." +msgstr "Nastajenja posedźenja za tute sydło StatusNet." #: actions/sessionsadminpanel.php:175 msgid "Handle sessions" @@ -3301,14 +3275,13 @@ msgid "" msgstr "" #: actions/showapplication.php:309 -#, fuzzy msgid "Are you sure you want to reset your consumer key and secret?" -msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?" +msgstr "Chceš woprawdźe swój přetrjebowarski kluč a potajny kod wróćo stajić?" #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "%1$s a přećeljo, strona %2$d" +msgstr "Preferowane zdźělenki wot %1$s, strona %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." @@ -3360,9 +3333,9 @@ msgid "%s group" msgstr "" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "%1$s skupinskich čłonow, strona %2$d" +msgstr "%1$s skupina, strona %2$d" #: actions/showgroup.php:226 msgid "Group profile" @@ -3475,9 +3448,9 @@ msgid " tagged %s" msgstr "" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s, page %2$d" -msgstr "%1$s a přećeljo, strona %2$d" +msgstr "%1$s, strona %2$d" #: actions/showstream.php:122 #, php-format @@ -3553,9 +3526,8 @@ msgid "User is already silenced." msgstr "" #: actions/siteadminpanel.php:69 -#, fuzzy msgid "Basic settings for this StatusNet site" -msgstr "Designowe nastajenja za tute sydło StatusNet." +msgstr "Zakładne nastajenja za tute sydło StatusNet." #: actions/siteadminpanel.php:133 msgid "Site name must have non-zero length." @@ -3623,9 +3595,8 @@ msgid "Default timezone for the site; usually UTC." msgstr "" #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Standardna sydłowa rěč" +msgstr "Standardna rěč" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" @@ -3652,37 +3623,32 @@ msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" -msgstr "Zdźělenki" +msgstr "Sydłowa zdźělenka" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "Nowa powěsć" +msgstr "Sydłodaloku powěsć wobdźěłać" #: actions/sitenoticeadminpanel.php:103 -#, fuzzy msgid "Unable to save site notice." -msgstr "Wužiwar nima poslednju powěsć" +msgstr "Njeje móžno, sydłowu zdźělenku składować." #: actions/sitenoticeadminpanel.php:113 msgid "Max length for the site-wide notice is 255 chars" msgstr "" #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Njepłaćiwy wobsah zdźělenki" +msgstr "Tekst sydłoweje zdźělenki" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" msgstr "" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Sydłowe nastajenja składować" +msgstr "Sydłowu zdźělenku składować" #: actions/smssettings.php:58 msgid "SMS settings" @@ -3783,9 +3749,8 @@ msgid "Snapshots" msgstr "" #: actions/snapshotadminpanel.php:65 -#, fuzzy msgid "Manage snapshot configuration" -msgstr "SMS-wobkrućenje" +msgstr "Konfiguraciju wobrazowkoweho fota zrjadować" #: actions/snapshotadminpanel.php:127 msgid "Invalid snapshot run value." @@ -3832,9 +3797,8 @@ msgid "Snapshots will be sent to this URL" msgstr "" #: actions/snapshotadminpanel.php:248 -#, fuzzy msgid "Save snapshot settings" -msgstr "Sydłowe nastajenja składować" +msgstr "Nastajenja wobrazowkoweho fota składować" #: actions/subedit.php:70 msgid "You are not subscribed to that profile." @@ -3850,14 +3814,12 @@ msgid "This action only accepts POST requests." msgstr "" #: actions/subscribe.php:107 -#, fuzzy msgid "No such profile." -msgstr "Dataja njeeksistuje." +msgstr "Profil 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ł." +msgstr "Njemóžeš zdaleny profil OMB 0.1 z tutej akciju abonować." #: actions/subscribe.php:145 msgid "Subscribed" @@ -4039,7 +4001,6 @@ msgstr "" #. TRANS: User admin panel title #: actions/useradminpanel.php:59 -#, fuzzy msgctxt "TITLE" msgid "User" msgstr "Wužiwar" @@ -4214,9 +4175,9 @@ msgid "Enjoy your hotdog!" msgstr "" #: actions/usergroups.php:64 -#, fuzzy, php-format +#, php-format msgid "%1$s groups, page %2$d" -msgstr "%1$s skupinskich čłonow, strona %2$d" +msgstr "%1$s skupinow, strona %2$d" #: actions/usergroups.php:130 msgid "Search for more groups" @@ -4289,19 +4250,19 @@ msgstr "Wersija" msgid "Author(s)" msgstr "Awtorojo" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4319,9 +4280,8 @@ msgid "Group leave failed." msgstr "Wopušćenje skupiny je so njeporadźiło." #: classes/Local_group.php:41 -#, fuzzy msgid "Could not update local group." -msgstr "Skupina njeje so dała aktualizować." +msgstr "Lokalna skupina njeda so aktualizować." #: classes/Login_token.php:76 #, php-format @@ -4376,7 +4336,7 @@ msgstr "" msgid "Problem saving group inbox." msgstr "" -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4402,36 +4362,33 @@ msgid "Couldn't delete self-subscription." msgstr "Sebjeabonement njeje so dał zničić." #: classes/Subscription.php:190 -#, fuzzy msgid "Couldn't delete subscription OMB token." -msgstr "Abonoment njeje so dał zničić." +msgstr "Znamjo OMB-abonementa njeda so zhašeć." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Abonoment njeje so dał zničić." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "" -#: classes/User_group.php:486 -#, fuzzy +#: classes/User_group.php:489 msgid "Could not set group URI." -msgstr "Skupina njeje so dała aktualizować." +msgstr "URI skupiny njeda so nastajić." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "" -#: classes/User_group.php:521 -#, fuzzy +#: classes/User_group.php:524 msgid "Could not save local group info." -msgstr "Profil njeje so składować dał." +msgstr "Informacije wo lokalnej skupinje njedachu so składować." #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" @@ -4481,24 +4438,21 @@ msgid "Personal profile and friends timeline" msgstr "" #: lib/action.php:433 -#, fuzzy msgctxt "MENU" msgid "Personal" msgstr "Wosobinski" #. TRANS: Tooltip for main menu option "Account" #: lib/action.php:435 -#, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" -msgstr "Změń swoje hesło." +msgstr "Wašu e-mejl, waš awatar, waše hesło, waš profil změnić" #. TRANS: Tooltip for main menu option "Services" #: lib/action.php:440 -#, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" -msgstr "Zwiski" +msgstr "Ze słužbami zwjazać" #: lib/action.php:443 msgid "Connect" @@ -4506,93 +4460,78 @@ msgstr "Zwjazać" #. TRANS: Tooltip for menu option "Admin" #: lib/action.php:446 -#, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" -msgstr "SMS-wobkrućenje" +msgstr "Sydłowu konfiguraciju změnić" #: lib/action.php:449 -#, fuzzy msgctxt "MENU" msgid "Admin" msgstr "Administrator" #. TRANS: Tooltip for main menu option "Invite" #: lib/action.php:453 -#, fuzzy, php-format +#, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" -msgstr "" -"Wužij tutón formular, zo by swojich přećelow a kolegow přeprosył, zo bychu " -"tutu słužbu wužiwali." +msgstr "Přećelow a kolegow přeprosyć, so tebi na %s přidružić" #: lib/action.php:456 -#, fuzzy msgctxt "MENU" msgid "Invite" msgstr "Přeprosyć" #. TRANS: Tooltip for main menu option "Logout" #: lib/action.php:462 -#, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" -msgstr "Šat za sydło." +msgstr "Ze sydła wotzjewić" #: lib/action.php:465 -#, fuzzy msgctxt "MENU" msgid "Logout" -msgstr "Logo" +msgstr "Wotzjewić" #. TRANS: Tooltip for main menu option "Register" #: lib/action.php:470 -#, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "Konto załožić" #: lib/action.php:473 -#, fuzzy msgctxt "MENU" msgid "Register" msgstr "Registrować" #. TRANS: Tooltip for main menu option "Login" #: lib/action.php:476 -#, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Při sydle přizjewić" #: lib/action.php:479 -#, fuzzy msgctxt "MENU" msgid "Login" -msgstr "Přizjewić" +msgstr "Přizjewjenje" #. TRANS: Tooltip for main menu option "Help" #: lib/action.php:482 -#, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "Pomhaj!" #: lib/action.php:485 -#, fuzzy msgctxt "MENU" msgid "Help" msgstr "Pomoc" #. TRANS: Tooltip for main menu option "Search" #: lib/action.php:488 -#, fuzzy msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Za ludźimi abo tekstom pytać" #: lib/action.php:491 -#, fuzzy msgctxt "MENU" msgid "Search" msgstr "Pytać" @@ -4651,19 +4590,19 @@ msgstr "" msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%). " msgstr "" -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4671,41 +4610,41 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "" -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "" -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "" @@ -4753,7 +4692,6 @@ msgstr "" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:350 -#, fuzzy msgctxt "MENU" msgid "Site" msgstr "Sydło" @@ -4765,16 +4703,14 @@ msgstr "" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:358 -#, fuzzy msgctxt "MENU" msgid "Design" msgstr "Design" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:364 -#, fuzzy msgid "User configuration" -msgstr "SMS-wobkrućenje" +msgstr "Wužiwarska konfiguracija" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 @@ -4783,9 +4719,8 @@ msgstr "Wužiwar" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:372 -#, fuzzy msgid "Access configuration" -msgstr "SMS-wobkrućenje" +msgstr "Přistupna konfiguracija" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:380 @@ -4794,27 +4729,24 @@ msgstr "" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:388 -#, fuzzy msgid "Sessions configuration" -msgstr "SMS-wobkrućenje" +msgstr "Konfiguracija posedźenjow" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:396 -#, fuzzy msgid "Edit site notice" -msgstr "Dwójna zdźělenka" +msgstr "Sydłowu zdźělenku wobdźěłać" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:404 -#, fuzzy msgid "Snapshots configuration" -msgstr "SMS-wobkrućenje" +msgstr "Konfiguracija wobrazowkowych fotow" #: lib/apiauth.php:94 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4912,37 +4844,50 @@ msgstr "Změnjenje hesła je so njeporadźiło" msgid "Password changing is not allowed" msgstr "Změnjenje hesła njeje dowolene" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "" +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Zdźělenka z tym ID njeeksistuje" + +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "Wužiwar nima poslednju powěsć" -#: lib/command.php:88 +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "" -#: lib/command.php:92 +#: lib/command.php:143 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -4950,170 +4895,168 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Zdźělenka z tym ID njeeksistuje" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Wužiwar nima poslednju powěsć" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "Sy hižo čłon teje skupiny" -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "Njebě móžno wužiwarja %s skupinje %s přidać" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s je so k skupinje %s přizamknył" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "Njebě móžno wužiwarja %s do skupiny %s přesunyć" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s je skupinu %s wopušćił" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Dospołne mjeno: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Městno: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "Wo: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Direktna powěsć do %s pósłana" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "Njemóžeš swójsku powěsć wospjetować" -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "Tuta zdźělenka bu hižo wospjetowana" -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "Zdźělenka wot %s wospjetowana" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "Zmylk při wospjetowanju zdźělenki" -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "Wotmołwa na %s pósłana" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "" -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 +#: lib/command.php:602 #, fuzzy -msgid "No such user" -msgstr "Wužiwar njeeksistuje" +msgid "Can't subscribe to OMB profiles by command." +msgstr "Njejsy tón profil abonował." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 -#, fuzzy, php-format +#: lib/command.php:735 +#, php-format msgid "Unsubscribed %s" -msgstr "Wotskazany" +msgstr "%s wotskazany" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:711 +#: lib/command.php:754 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Sy tutu wosobu abonował:" @@ -5121,11 +5064,11 @@ msgstr[1] "Sy tutej wosobje abonował:" msgstr[2] "Sy tute wosoby abonował:" msgstr[3] "Sy tute wosoby abonował:" -#: lib/command.php:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:733 +#: lib/command.php:776 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Tuta wosoba je će abonowała:" @@ -5133,11 +5076,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:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:755 +#: lib/command.php:798 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Sy čłon tuteje skupiny:" @@ -5145,7 +5088,7 @@ msgstr[1] "Sy čłon tuteju skupinow:" msgstr[2] "Sy čłon tutych skupinow:" msgstr[3] "Sy čłon tutych skupinow:" -#: lib/command.php:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5373,49 +5316,49 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Dźělne nahraće." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "" - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Naša dataja je so zhubiła." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Njeznaty datajowy typ" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "KB" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "Njeznate žórło postoweho kašćika %d." @@ -5610,7 +5553,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "wot" @@ -5700,7 +5643,6 @@ msgid "Available characters" msgstr "K dispoziciji stejace znamješka" #: lib/messageform.php:178 lib/noticeform.php:236 -#, fuzzy msgctxt "Send button for sending notice" msgid "Send" msgstr "Pósłać" @@ -5761,23 +5703,23 @@ msgstr "Z" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "Wospjetowany wot" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Na tutu zdźělenku wotmołwić" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Wotmołwić" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "Zdźělenka wospjetowana" @@ -5915,9 +5857,9 @@ msgid "Repeat this notice" msgstr "Tutu zdźělenku wospjetować" #: lib/revokeroleform.php:91 -#, fuzzy, php-format +#, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Tutoho wužiwarja za tutu skupinu blokować" +msgstr "Rólu \"%s\" tutoho wužiwarja wotwołać" #: lib/router.php:671 msgid "No single user defined for single-user mode." @@ -6074,62 +6016,60 @@ msgid "Moderate" msgstr "" #: lib/userprofile.php:352 -#, fuzzy msgid "User role" -msgstr "Wužiwarski profil" +msgstr "Wužiwarska róla" #: lib/userprofile.php:354 -#, fuzzy msgctxt "role" msgid "Administrator" -msgstr "Administratorojo" +msgstr "Administrator" #: lib/userprofile.php:355 msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "před něšto sekundami" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "před něhdźe jednej mjeńšinu" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "před %d mjeńšinami" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "před něhdźe jednej hodźinu" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "před něhdźe %d hodźinami" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "před něhdźe jednym dnjom" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "před něhdźe %d dnjemi" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "před něhdźe jednym měsacom" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "před něhdźe %d měsacami" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "před něhdźe jednym lětom" @@ -6145,7 +6085,7 @@ msgstr "" "%s płaćiwa barba njeje! Wužij 3 heksadecimalne znamješka abo 6 " "heksadecimalnych znamješkow." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 7a96686ed..3169d6fa4 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:08+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:43:09+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -42,7 +42,6 @@ msgstr "Prohibir al usatores anonyme (sin session aperte) de vider le sito?" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" msgstr "Private" @@ -73,7 +72,6 @@ msgid "Save access settings" msgstr "Salveguardar configurationes de accesso" #: actions/accessadminpanel.php:203 -#, fuzzy msgctxt "BUTTON" msgid "Save" msgstr "Salveguardar" @@ -94,7 +92,7 @@ msgstr "Pagina non existe" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -103,10 +101,8 @@ msgstr "Pagina non existe" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Usator non existe." @@ -207,12 +203,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:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "Methodo API non trovate." @@ -343,7 +339,7 @@ msgstr "Nulle stato trovate con iste ID." msgid "This status is already a favorite." msgstr "Iste stato es ja favorite." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Non poteva crear le favorite." @@ -460,7 +456,7 @@ msgstr "Gruppo non trovate!" msgid "You are already a member of that group." msgstr "Tu es ja membro de iste gruppo." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "Le administrator te ha blocate de iste gruppo." @@ -510,7 +506,7 @@ msgstr "Indicio invalide." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -656,12 +652,12 @@ msgstr "" msgid "Unsupported format." msgstr "Formato non supportate." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favorites de %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s actualisationes favoritisate per %2$s / %2$s." @@ -671,7 +667,7 @@ msgstr "%1$s actualisationes favoritisate per %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Actualisationes que mentiona %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" @@ -682,7 +678,7 @@ msgstr "" msgid "%s public timeline" msgstr "Chronologia public de %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Actualisationes de totes in %s!" @@ -697,12 +693,12 @@ msgstr "Repetite a %s" msgid "Repeats of %s" msgstr "Repetitiones de %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notas con etiquetta %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualisationes con etiquetta %1$s in %2$s!" @@ -763,7 +759,7 @@ msgid "Preview" msgstr "Previsualisation" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Deler" @@ -846,8 +842,8 @@ msgstr "Falleva de salveguardar le information del blocada." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "Gruppo non existe." @@ -948,7 +944,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:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "Il habeva un problema con tu indicio de session." @@ -1009,7 +1005,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:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Deler iste nota" @@ -1262,7 +1258,7 @@ msgstr "description es troppo longe (max %d chars)." msgid "Could not update group." msgstr "Non poteva actualisar gruppo." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Non poteva crear aliases." @@ -1578,23 +1574,20 @@ msgid "Cannot read file." msgstr "Non pote leger file." #: actions/grantrole.php:62 actions/revokerole.php:62 -#, fuzzy msgid "Invalid role." -msgstr "Indicio invalide." +msgstr "Rolo invalide." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." -msgstr "" +msgstr "Iste rolo es reservate e non pote esser apponite." #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "Tu non pote mitter usatores in le cassa de sablo in iste sito." +msgstr "Tu non pote conceder rolos a usatores in iste sito." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "Usator es ja silentiate." +msgstr "Le usator ha ja iste rolo." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1968,7 +1961,7 @@ msgstr "Invitar nove usatores" msgid "You are already subscribed to these users:" msgstr "Tu es a subscribite a iste usatores:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2016,7 +2009,6 @@ msgstr "Si tu vole, adde un message personal al invitation." #. TRANS: Send button for inviting friends #: actions/invite.php:198 -#, fuzzy msgctxt "BUTTON" msgid "Send" msgstr "Inviar" @@ -2088,9 +2080,8 @@ msgid "You must be logged in to join a group." msgstr "Tu debe aperir un session pro facer te membro de un gruppo." #: actions/joingroup.php:88 actions/leavegroup.php:88 -#, fuzzy msgid "No nickname or ID." -msgstr "Nulle pseudonymo." +msgstr "Nulle pseudonymo o ID." #: actions/joingroup.php:141 #, php-format @@ -2101,7 +2092,7 @@ msgstr "%1$s es ora membro del gruppo %2$s" msgid "You must be logged in to leave a group." msgstr "Tu debe aperir un session pro quitar un gruppo." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "Tu non es membro de iste gruppo." @@ -2217,12 +2208,12 @@ msgstr "Usa iste formulario pro crear un nove gruppo." msgid "New message" msgstr "Nove message" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Tu non pote inviar un message a iste usator." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Nulle contento!" @@ -2230,7 +2221,7 @@ msgstr "Nulle contento!" msgid "No recipient specified." msgstr "Nulle destinatario specificate." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2246,7 +2237,7 @@ msgstr "Message inviate" msgid "Direct message to %s sent." msgstr "Message directe a %s inviate." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Error de Ajax" @@ -2381,8 +2372,8 @@ msgstr "typo de contento " msgid "Only " msgstr "Solmente " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Formato de datos non supportate." @@ -2514,7 +2505,7 @@ msgstr "Ancian contrasigno incorrecte" msgid "Error saving user; invalid." msgstr "Error de salveguardar le usator; invalide." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Non pote salveguardar le nove contrasigno." @@ -3015,7 +3006,7 @@ msgstr "Reinitialisar contrasigno" msgid "Recover password" msgstr "Recuperar contrasigno" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Recuperation de contrasigno requestate" @@ -3035,19 +3026,19 @@ msgstr "Reinitialisar" msgid "Enter a nickname or email address." msgstr "Entra un pseudonymo o adresse de e-mail." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Nulle usator existe con iste adresse de e-mail o nomine de usator." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Nulle adresse de e-mail registrate pro iste usator." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Error al salveguardar le confirmation del adresse." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3055,23 +3046,23 @@ msgstr "" "Instructiones pro recuperar tu contrasigno ha essite inviate al adresse de e-" "mail registrate in tu conto." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Reinitialisation inexpectate del contrasigno." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Le contrasigno debe haber 6 characteres o plus." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Contrasigno e confirmation non corresponde." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Error durante le configuration del usator." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Nove contrasigno salveguardate con successo. Tu session es ora aperte." @@ -3273,7 +3264,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:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Repetite" @@ -3340,14 +3331,12 @@ msgid "Replies to %1$s on %2$s!" msgstr "Responsas a %1$s in %2$s!" #: actions/revokerole.php:75 -#, fuzzy msgid "You cannot revoke user roles on this site." -msgstr "Tu non pote silentiar usatores in iste sito." +msgstr "Tu non pote revocar rolos de usatores in iste sito." #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "Usator sin profilo correspondente" +msgstr "Le usator non ha iste rolo." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" @@ -3750,9 +3739,8 @@ msgid "User is already silenced." msgstr "Usator es ja silentiate." #: actions/siteadminpanel.php:69 -#, fuzzy msgid "Basic settings for this StatusNet site" -msgstr "Configurationes de base pro iste sito de StatusNet." +msgstr "Configurationes de base pro iste sito de StatusNet" #: actions/siteadminpanel.php:133 msgid "Site name must have non-zero length." @@ -3820,13 +3808,14 @@ msgid "Default timezone for the site; usually UTC." msgstr "Fuso horari predefinite pro le sito; normalmente UTC." #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Lingua predefinite del sito" +msgstr "Lingua predefinite" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" msgstr "" +"Le lingua del sito quando le detection automatic ex le configuration del " +"navigator non es disponibile" #: actions/siteadminpanel.php:271 msgid "Limits" @@ -3851,37 +3840,33 @@ msgstr "" "publicar le mesme cosa de novo." #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" msgstr "Aviso del sito" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "Nove message" +msgstr "Modificar message a tote le sito" #: actions/sitenoticeadminpanel.php:103 -#, fuzzy msgid "Unable to save site notice." -msgstr "Impossibile salveguardar le configurationes del apparentia." +msgstr "Impossibile salveguardar le aviso del sito." #: actions/sitenoticeadminpanel.php:113 msgid "Max length for the site-wide notice is 255 chars" -msgstr "" +msgstr "Le longitude maxime del aviso a tote le sito es 255 characteres" #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Aviso del sito" +msgstr "Texto del aviso del sito" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" msgstr "" +"Le texto del aviso a tote le sito (max. 255 characteres; HTML permittite)" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Aviso del sito" +msgstr "Salveguardar aviso del sito" #: actions/smssettings.php:58 msgid "SMS settings" @@ -3989,9 +3974,8 @@ msgid "Snapshots" msgstr "Instantaneos" #: actions/snapshotadminpanel.php:65 -#, fuzzy msgid "Manage snapshot configuration" -msgstr "Modificar le configuration del sito" +msgstr "Gerer configuration de instantaneos" #: actions/snapshotadminpanel.php:127 msgid "Invalid snapshot run value." @@ -4038,9 +4022,8 @@ msgid "Snapshots will be sent to this URL" msgstr "Le instantaneos essera inviate a iste URL" #: actions/snapshotadminpanel.php:248 -#, fuzzy msgid "Save snapshot settings" -msgstr "Salveguardar configurationes del sito" +msgstr "Salveguardar configuration de instantaneos" #: actions/subedit.php:70 msgid "You are not subscribed to that profile." @@ -4053,17 +4036,15 @@ msgstr "Non poteva salveguardar le subscription." #: actions/subscribe.php:77 msgid "This action only accepts POST requests." -msgstr "" +msgstr "Iste action accepta solmente le requestas de typo POST." #: actions/subscribe.php:107 -#, fuzzy msgid "No such profile." -msgstr "File non existe." +msgstr "Profilo 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." +msgstr "Tu non pote subscriber te a un profilo remote OMB 0.1 con iste action." #: actions/subscribe.php:145 msgid "Subscribed" @@ -4262,7 +4243,6 @@ msgstr "" #. TRANS: User admin panel title #: actions/useradminpanel.php:59 -#, fuzzy msgctxt "TITLE" msgid "User" msgstr "Usator" @@ -4535,7 +4515,7 @@ msgstr "Version" msgid "Author(s)" msgstr "Autor(es)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4544,12 +4524,12 @@ msgstr "" "Nulle file pote esser plus grande que %d bytes e le file que tu inviava ha %" "d bytes. Tenta incargar un version minus grande." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Un file de iste dimension excederea tu quota de usator de %d bytes." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Un file de iste dimension excederea tu quota mensual de %d bytes." @@ -4567,9 +4547,8 @@ msgid "Group leave failed." msgstr "Le cancellation del membrato del gruppo ha fallite." #: classes/Local_group.php:41 -#, fuzzy msgid "Could not update local group." -msgstr "Non poteva actualisar gruppo." +msgstr "Non poteva actualisar gruppo local." #: classes/Login_token.php:76 #, php-format @@ -4628,7 +4607,7 @@ msgstr "Problema salveguardar nota." msgid "Problem saving group inbox." msgstr "Problema salveguardar le cassa de entrata del gruppo." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4654,36 +4633,33 @@ msgid "Couldn't delete self-subscription." msgstr "Non poteva deler auto-subscription." #: classes/Subscription.php:190 -#, fuzzy msgid "Couldn't delete subscription OMB token." -msgstr "Non poteva deler subscription." +msgstr "Non poteva deler le indicio OMB del subscription." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Non poteva deler subscription." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Benvenite a %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Non poteva crear gruppo." -#: classes/User_group.php:486 -#, fuzzy +#: classes/User_group.php:489 msgid "Could not set group URI." -msgstr "Non poteva configurar le membrato del gruppo." +msgstr "Non poteva definir le URL del gruppo." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Non poteva configurar le membrato del gruppo." -#: classes/User_group.php:521 -#, fuzzy +#: classes/User_group.php:524 msgid "Could not save local group info." -msgstr "Non poteva salveguardar le subscription." +msgstr "Non poteva salveguardar le informationes del gruppo local." #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" @@ -4728,30 +4704,26 @@ msgstr "Navigation primari del sito" #. TRANS: Tooltip for main menu option "Personal" #: lib/action.php:430 -#, fuzzy msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Profilo personal e chronologia de amicos" #: lib/action.php:433 -#, fuzzy msgctxt "MENU" msgid "Personal" msgstr "Personal" #. TRANS: Tooltip for main menu option "Account" #: lib/action.php:435 -#, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" msgstr "Cambiar tu e-mail, avatar, contrasigno, profilo" #. TRANS: Tooltip for main menu option "Services" #: lib/action.php:440 -#, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" -msgstr "Connecter con servicios" +msgstr "Connecter a servicios" #: lib/action.php:443 msgid "Connect" @@ -4759,91 +4731,78 @@ msgstr "Connecter" #. TRANS: Tooltip for menu option "Admin" #: lib/action.php:446 -#, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" msgstr "Modificar le configuration del sito" #: lib/action.php:449 -#, fuzzy msgctxt "MENU" msgid "Admin" -msgstr "Administrator" +msgstr "Admin" #. TRANS: Tooltip for main menu option "Invite" #: lib/action.php:453 -#, fuzzy, php-format +#, php-format msgctxt "TOOLTIP" msgid "Invite friends and colleagues to join you on %s" msgstr "Invitar amicos e collegas a accompaniar te in %s" #: lib/action.php:456 -#, fuzzy msgctxt "MENU" msgid "Invite" msgstr "Invitar" #. TRANS: Tooltip for main menu option "Logout" #: lib/action.php:462 -#, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "Terminar le session del sito" #: lib/action.php:465 -#, fuzzy msgctxt "MENU" msgid "Logout" msgstr "Clauder session" #. TRANS: Tooltip for main menu option "Register" #: lib/action.php:470 -#, fuzzy msgctxt "TOOLTIP" msgid "Create an account" msgstr "Crear un conto" #: lib/action.php:473 -#, fuzzy msgctxt "MENU" msgid "Register" msgstr "Crear conto" #. TRANS: Tooltip for main menu option "Login" #: lib/action.php:476 -#, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" msgstr "Identificar te a iste sito" #: lib/action.php:479 -#, fuzzy msgctxt "MENU" msgid "Login" msgstr "Aperir session" #. TRANS: Tooltip for main menu option "Help" #: lib/action.php:482 -#, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "Adjuta me!" #: lib/action.php:485 -#, fuzzy msgctxt "MENU" msgid "Help" msgstr "Adjuta" #. TRANS: Tooltip for main menu option "Search" #: lib/action.php:488 -#, fuzzy msgctxt "TOOLTIP" msgid "Search for people or text" msgstr "Cercar personas o texto" #: lib/action.php:491 -#, fuzzy msgctxt "MENU" msgid "Search" msgstr "Cercar" @@ -4902,7 +4861,7 @@ msgstr "Insignia" msgid "StatusNet software license" msgstr "Licentia del software StatusNet" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4911,12 +4870,12 @@ msgstr "" "**%%site.name%%** es un servicio de microblog offerite per [%%site.broughtby%" "%](%%site.broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** es un servicio de microblog. " -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4927,56 +4886,56 @@ msgstr "" "net/), version %s, disponibile sub le [GNU Affero General Public License]" "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "Licentia del contento del sito" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "Le contento e datos de %1$s es private e confidential." -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "Contento e datos sub copyright de %1$s. Tote le derectos reservate." -#: lib/action.php:834 +#: lib/action.php:837 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:847 +#: lib/action.php:850 msgid "All " msgstr "Totes " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "licentia." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Pagination" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "Post" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Ante" #: lib/activity.php:453 msgid "Can't handle remote content yet." -msgstr "" +msgstr "Non pote ancora tractar contento remote." #: lib/activity.php:481 msgid "Can't handle embedded XML content yet." -msgstr "" +msgstr "Non pote ancora tractar contento XML incastrate." #: lib/activity.php:485 msgid "Can't handle embedded Base64 content yet." -msgstr "" +msgstr "Non pote ancora tractar contento Base64 incastrate." #. TRANS: Client error message #: lib/adminpanelaction.php:98 @@ -5010,7 +4969,6 @@ msgstr "Configuration basic del sito" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:350 -#, fuzzy msgctxt "MENU" msgid "Site" msgstr "Sito" @@ -5022,7 +4980,6 @@ msgstr "Configuration del apparentia" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:358 -#, fuzzy msgctxt "MENU" msgid "Design" msgstr "Apparentia" @@ -5054,15 +5011,13 @@ msgstr "Configuration del sessiones" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:396 -#, fuzzy msgid "Edit site notice" -msgstr "Aviso del sito" +msgstr "Modificar aviso del sito" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:404 -#, fuzzy msgid "Snapshots configuration" -msgstr "Configuration del camminos" +msgstr "Configuration del instantaneos" #: lib/apiauth.php:94 msgid "API resource requires read-write access, but you only have read access." @@ -5070,7 +5025,7 @@ msgstr "" "Le ressource de API require accesso pro lectura e scriptura, ma tu ha " "solmente accesso pro lectura." -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5172,37 +5127,50 @@ msgstr "Cambio del contrasigno fallite" msgid "Password changing is not allowed" msgstr "Cambio del contrasigno non permittite" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Resultatos del commando" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Commando complete" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Commando fallite" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Pardono, iste commando non es ancora implementate." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Non existe un nota con iste ID" + +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "Usator non ha ultime nota" -#: lib/command.php:88 +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "Non poteva trovar un usator con pseudonymo %s" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Non poteva trovar un usator con pseudonymo %s" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Pardono, iste commando non es ancora implementate." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Non ha multe senso pulsar te mesme!" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "Pulsata inviate a %s" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5213,198 +5181,196 @@ msgstr "" "Subscriptores: %2$s\n" "Notas: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Non existe un nota con iste ID" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Usator non ha ultime nota" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Nota marcate como favorite." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "Tu es ja membro de iste gruppo" -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "Non poteva facer le usator %s membro del gruppo %s" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s se faceva membro del gruppo %s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "Non poteva remover le usator %s del gruppo %s" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s quitava le gruppo %s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Nomine complete: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Loco: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Pagina personal: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "A proposito: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Message troppo longe - maximo es %d characteres, tu inviava %d" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Message directe a %s inviate" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Error durante le invio del message directe." -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "Non pote repeter tu proprie nota" -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "Iste nota ha ja essite repetite" -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "Nota de %s repetite" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "Error durante le repetition del nota." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Nota troppo longe - maximo es %d characteres, tu inviava %d" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "Responsa a %s inviate" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "Errur durante le salveguarda del nota." -#: lib/command.php:547 +#: lib/command.php:594 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:589 -msgid "No such user" -msgstr "Usator non existe" +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Tu non es subscribite a iste profilo." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Subscribite a %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "Specifica le nomine del usator al qual cancellar le subscription" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Subscription a %s cancellate" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Commando non ancora implementate." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Notification disactivate." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "Non pote disactivar notification." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Notification activate." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "Non pote activar notification." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "Le commando de apertura de session es disactivate" -#: lib/command.php:665 +#: lib/command.php:708 #, 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:692 -#, fuzzy, php-format +#: lib/command.php:735 +#, php-format msgid "Unsubscribed %s" -msgstr "Subscription a %s cancellate" +msgstr "Subscription de %s cancellate" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "Tu non es subscribite a alcuno." -#: lib/command.php:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "Necuno es subscribite a te." -#: lib/command.php:733 +#: lib/command.php:776 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:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "Tu non es membro de alcun gruppo." -#: lib/command.php:755 +#: lib/command.php:798 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:769 -#, fuzzy +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5454,9 +5420,10 @@ msgstr "" "subscriptions - listar le personas que tu seque\n" "subscribers - listar le personas qui te seque\n" "leave - cancellar subscription al usator\n" -"d - diriger message al usator\n" -"get - obtener ultime nota del usator\n" +"d - diriger un message al usator\n" +"get - obtener le ultime nota del usator\n" "whois - obtener info de profilo del usator\n" +"lose - fortiar le usator de cessar de sequer te\n" "fav - adder ultime nota del usator como favorite\n" "fav # - adder nota con le ID date como favorite\n" "repeat # - repeter le nota con le ID date\n" @@ -5597,7 +5564,7 @@ msgstr "Ir" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "" +msgstr "Conceder le rolo \"%s\" a iste usator" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" @@ -5673,49 +5640,49 @@ msgstr "Etiquettas in le notas del gruppo %s" msgid "This page is not available in a media type you accept" msgstr "Iste pagina non es disponibile in un formato que tu accepta" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Formato de file de imagine non supportate." + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Iste file es troppo grande. Le dimension maximal es %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Incargamento partial." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Error de systema durante le incargamento del file." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Le file non es un imagine o es defectuose." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Formato de file de imagine non supportate." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "File perdite." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Typo de file incognite" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "KB" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "Fonte de cassa de entrata \"%s\" incognite" @@ -5996,7 +5963,7 @@ msgstr "" "altere usatores in conversation. Altere personas pote inviar te messages que " "solmente tu pote leger." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "de" @@ -6090,7 +6057,6 @@ msgid "Available characters" msgstr "Characteres disponibile" #: lib/messageform.php:178 lib/noticeform.php:236 -#, fuzzy msgctxt "Send button for sending notice" msgid "Send" msgstr "Inviar" @@ -6153,23 +6119,23 @@ msgstr "W" msgid "at" msgstr "a" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "in contexto" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "Repetite per" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Responder a iste nota" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "Nota repetite" @@ -6307,9 +6273,9 @@ msgid "Repeat this notice" msgstr "Repeter iste nota" #: lib/revokeroleform.php:91 -#, fuzzy, php-format +#, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Blocar iste usator de iste gruppo" +msgstr "Revocar le rolo \"%s\" de iste usator" #: lib/router.php:671 msgid "No single user defined for single-user mode." @@ -6466,63 +6432,60 @@ msgid "Moderate" msgstr "Moderar" #: lib/userprofile.php:352 -#, fuzzy msgid "User role" -msgstr "Profilo del usator" +msgstr "Rolo de usator" #: lib/userprofile.php:354 -#, fuzzy msgctxt "role" msgid "Administrator" -msgstr "Administratores" +msgstr "Administrator" #: lib/userprofile.php:355 -#, fuzzy msgctxt "role" msgid "Moderator" -msgstr "Moderar" +msgstr "Moderator" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "alcun secundas retro" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "circa un minuta retro" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "circa %d minutas retro" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "circa un hora retro" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "circa %d horas retro" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "circa un die retro" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "circa %d dies retro" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "circa un mense retro" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "circa %d menses retro" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "circa un anno retro" @@ -6536,7 +6499,7 @@ msgstr "%s non es un color valide!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s non es un color valide! Usa 3 o 6 characteres hexadecimal." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d." diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 3c8f33565..71caf4b56 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:12+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:43:19+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -102,7 +102,7 @@ msgstr "Ekkert þannig merki." #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -111,10 +111,8 @@ msgstr "Ekkert þannig merki." #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Enginn svoleiðis notandi." @@ -207,12 +205,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:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Aðferð í forritsskilum fannst ekki!" @@ -345,7 +343,7 @@ msgstr "Engin staða fundin með þessu kenni." msgid "This status is already a favorite." msgstr "Þetta babl er nú þegar í uppáhaldi!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Gat ekki búið til uppáhald." @@ -468,7 +466,7 @@ msgstr "Aðferð í forritsskilum fannst ekki!" msgid "You are already a member of that group." msgstr "Þú ert nú þegar meðlimur í þessum hópi" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "" @@ -520,7 +518,7 @@ msgstr "Ótæk stærð." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -662,12 +660,12 @@ msgstr "" msgid "Unsupported format." msgstr "Skráarsnið myndar ekki stutt." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / Uppáhaldsbabl frá %s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, 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." @@ -677,7 +675,7 @@ msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s." msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format 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." @@ -687,7 +685,7 @@ msgstr "%1$s færslur sem svara færslum frá %2$s / %3$s." msgid "%s public timeline" msgstr "Almenningsrás %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s færslur frá öllum!" @@ -702,12 +700,12 @@ msgstr "Svör við %s" msgid "Repeats of %s" msgstr "Svör við %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Babl merkt með %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -767,7 +765,7 @@ msgid "Preview" msgstr "Forsýn" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Eyða" @@ -850,8 +848,8 @@ msgstr "Mistókst að vista upplýsingar um notendalokun" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "Enginn þannig hópur." @@ -958,7 +956,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:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "Það komu upp vandamál varðandi setutókann þinn." @@ -1017,7 +1015,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:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Eyða þessu babli" @@ -1288,7 +1286,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:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "" @@ -1986,7 +1984,7 @@ msgstr "Bjóða nýjum notendum að vera með" msgid "You are already subscribed to these users:" msgstr "Þú ert nú þegar í áskrift að þessum notendum:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2119,7 +2117,7 @@ msgstr "%s bætti sér í hópinn %s" msgid "You must be logged in to leave a group." msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "Þú ert ekki meðlimur í þessum hópi." @@ -2240,12 +2238,12 @@ msgstr "Notaðu þetta eyðublað til að búa til nýjan hóp." msgid "New message" msgstr "Ný skilaboð" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Þú getur ekki sent þessum notanda skilaboð." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Ekkert innihald!" @@ -2253,7 +2251,7 @@ msgstr "Ekkert innihald!" msgid "No recipient specified." msgstr "Enginn móttökuaðili tilgreindur." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2269,7 +2267,7 @@ msgstr "" msgid "Direct message to %s sent." msgstr "Bein skilaboð send til %s" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax villa" @@ -2400,8 +2398,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Enginn stuðningur við gagnasnið." @@ -2540,7 +2538,7 @@ msgstr "Rangt eldra lykilorð" msgid "Error saving user; invalid." msgstr "Villa kom upp í vistun notanda: ótækt." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Get ekki vistað nýja lykilorðið." @@ -3042,7 +3040,7 @@ msgstr "Endurstilla lykilorð" msgid "Recover password" msgstr "Endurheimta lykilorð" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Beiðni um að endurheimta lykilorð hefur verið send inn" @@ -3062,19 +3060,19 @@ msgstr "Endurstilla" msgid "Enter a nickname or email address." msgstr "Sláðu inn stuttnefni eða tölvupóstfang." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Enginn notandi með þetta tölvupóstfang eða notendanafn" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Ekkert tölvupóstfang á skrá fyrir þennan notanda." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Villa kom upp í vistun netfangsstaðfestingar." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3082,23 +3080,23 @@ msgstr "" "Leiðbeiningar um það hvernig þú getur endurheimt lykilorðið þitt hafa verið " "sendar á tölvupóstfangið sem er tengt notendaaðganginum þínum." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Bjóst ekki við endurstillingu lykilorðs." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Lykilorð verður að vera 6 tákn eða fleiri." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Lykilorð og staðfesting passa ekki saman." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Villa kom upp í stillingu notanda." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Tókst að vista nýtt lykilorð. Þú ert núna innskráð(ur)" @@ -3304,7 +3302,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:674 +#: actions/repeat.php:114 lib/noticelist.php:676 #, fuzzy msgid "Repeated" msgstr "Í sviðsljósinu" @@ -4530,19 +4528,19 @@ msgstr "Persónulegt" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4624,7 +4622,7 @@ msgstr "Vandamál komu upp við að vista babl." msgid "Problem saving group inbox." msgstr "Vandamál komu upp við að vista babl." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4657,29 +4655,29 @@ msgstr "Gat ekki eytt áskrift." msgid "Couldn't delete subscription OMB token." msgstr "Gat ekki eytt áskrift." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Gat ekki eytt áskrift." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Gat ekki búið til hóp." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Gat ekki skráð hópmeðlimi." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Gat ekki skráð hópmeðlimi." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Gat ekki vistað áskrift." @@ -4903,7 +4901,7 @@ msgstr "" msgid "StatusNet software license" msgstr "Hugbúnaðarleyfi StatusNet" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4912,12 +4910,12 @@ msgstr "" "**%%site.name%%** er örbloggsþjónusta í boði [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** er örbloggsþjónusta." -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4928,42 +4926,42 @@ msgstr "" "sem er gefinn út undir [GNU Affero almenningsleyfinu](http://www.fsf.org/" "licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 #, fuzzy msgid "Site content license" msgstr "Hugbúnaðarleyfi StatusNet" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "Allt " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "leyfi." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Uppröðun" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "Eftir" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Áður" @@ -5079,7 +5077,7 @@ msgstr "SMS staðfesting" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5184,37 +5182,51 @@ msgstr "Lykilorðabreyting" msgid "Password changing is not allowed" msgstr "Lykilorðabreyting" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Niðurstöður skipunar" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Fullkláruð skipun" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Misheppnuð skipun" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Fyrirgefðu en þessi skipun hefur ekki enn verið útbúin." +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "Enginn persónuleg síða með þessu einkenni." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "Notandi hefur ekkert nýtt babl" + +#: lib/command.php:125 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi." -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi." + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Fyrirgefðu en þessi skipun hefur ekki enn verið útbúin." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Ýtt við notanda" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5222,203 +5234,201 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "Enginn persónuleg síða með þessu einkenni." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Notandi hefur ekkert nýtt babl" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Babl gert að uppáhaldi." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "Þú ert nú þegar meðlimur í þessum hópi" -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "Gat ekki bætt notandanum %s í hópinn %s" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s bætti sér í hópinn %s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s gekk úr hópnum %s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Fullt nafn: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Staðsetning: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Heimasíða: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "Um: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Bein skilaboð send til %s" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Villa kom upp við að senda bein skilaboð" -#: lib/command.php:413 +#: lib/command.php:490 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Get ekki kveikt á tilkynningum." -#: lib/command.php:418 +#: lib/command.php:495 #, fuzzy msgid "Already repeated that notice" msgstr "Eyða þessu babli" -#: lib/command.php:426 +#: lib/command.php:503 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Babl sent inn" -#: lib/command.php:428 +#: lib/command.php:505 #, fuzzy msgid "Error repeating notice." msgstr "Vandamál komu upp við að vista babl." -#: lib/command.php:482 +#: lib/command.php:536 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d" -#: lib/command.php:491 +#: lib/command.php:545 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Svara þessu babli" -#: lib/command.php:493 +#: lib/command.php:547 #, fuzzy msgid "Error saving notice." msgstr "Vandamál komu upp við að vista babl." -#: lib/command.php:547 +#: lib/command.php:594 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:589 -msgid "No such user" -msgstr "Enginn svoleiðis notandi." +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Þú ert ekki áskrifandi." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Nú ert þú áskrifandi að %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Nú ert þú ekki lengur áskrifandi að %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Skipun hefur ekki verið fullbúin" -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Tilkynningar af." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "Get ekki slökkt á tilkynningum." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Tilkynningar á." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "Get ekki kveikt á tilkynningum." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Nú ert þú ekki lengur áskrifandi að %s" -#: lib/command.php:709 +#: lib/command.php:752 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Þú ert ekki áskrifandi." -#: lib/command.php:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 #, fuzzy msgid "No one is subscribed to you." msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér." -#: lib/command.php:733 +#: lib/command.php:776 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:753 +#: lib/command.php:796 #, fuzzy msgid "You are not a member of any groups." msgstr "Þú ert ekki meðlimur í þessum hópi." -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5653,49 +5663,49 @@ msgid "This page is not available in a media type you accept" msgstr "" "Þessi síða er ekki aðgengileg í margmiðlunargerðinni sem þú tekur á móti" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Skráarsnið myndar ekki stutt." + +#: lib/imagefile.php:90 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Upphal að hluta til." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Kerfisvilla kom upp við upphal skráar." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Annaðhvort ekki mynd eða þá að skráin er gölluð." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Skráarsnið myndar ekki stutt." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Týndum skránni okkar" -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Óþekkt skráargerð" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5900,7 +5910,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 #, fuzzy msgid "from" msgstr "frá" @@ -6056,24 +6066,24 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 #, fuzzy msgid "Repeated by" msgstr "Í sviðsljósinu" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Svara þessu babli" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Svara" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 #, fuzzy msgid "Notice repeated" msgstr "Babl sent inn" @@ -6396,47 +6406,47 @@ msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "fyrir nokkrum sekúndum" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "fyrir um einni mínútu síðan" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "fyrir um %d mínútum síðan" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "fyrir um einum klukkutíma síðan" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "fyrir um %d klukkutímum síðan" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "fyrir um einum degi síðan" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "fyrir um %d dögum síðan" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "fyrir um einum mánuði síðan" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "fyrir um %d mánuðum síðan" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "fyrir um einu ári síðan" @@ -6450,7 +6460,7 @@ msgstr "" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 1bd3f26ad..96328690d 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:15+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:43:26+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -95,7 +95,7 @@ msgstr "Pagina inesistente." #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -104,10 +104,8 @@ msgstr "Pagina inesistente." #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Utente inesistente." @@ -209,12 +207,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:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "Metodo delle API non trovato." @@ -345,7 +343,7 @@ msgstr "Nessuno messaggio trovato con quel ID." msgid "This status is already a favorite." msgstr "Questo messaggio è già un preferito." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Impossibile creare un preferito." @@ -464,7 +462,7 @@ msgstr "Gruppo non trovato!" msgid "You are already a member of that group." msgstr "Fai già parte di quel gruppo." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo." @@ -514,7 +512,7 @@ msgstr "Token non valido." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -656,12 +654,12 @@ msgstr "" msgid "Unsupported format." msgstr "Formato non supportato." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Preferiti da %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s aggiornamenti preferiti da %2$s / %3$s" @@ -671,7 +669,7 @@ msgstr "%1$s aggiornamenti preferiti da %2$s / %3$s" msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Messaggi che citano %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format 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" @@ -681,7 +679,7 @@ msgstr "%1$s messaggi in risposta a quelli da %2$s / %3$s" msgid "%s public timeline" msgstr "Attività pubblica di %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Aggiornamenti di %s da tutti!" @@ -696,12 +694,12 @@ msgstr "Ripetuto a %s" msgid "Repeats of %s" msgstr "Ripetizioni di %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Messaggi etichettati con %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Messaggi etichettati con %1$s su %2$s!" @@ -762,7 +760,7 @@ msgid "Preview" msgstr "Anteprima" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Elimina" @@ -845,8 +843,8 @@ msgstr "Salvataggio delle informazioni per il blocco non riuscito." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "Nessuna gruppo." @@ -947,7 +945,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:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "Si è verificato un problema con il tuo token di sessione." @@ -1007,7 +1005,7 @@ msgstr "Vuoi eliminare questo messaggio?" msgid "Do not delete this notice" msgstr "Non eliminare il messaggio" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Elimina questo messaggio" @@ -1260,7 +1258,7 @@ msgstr "La descrizione è troppo lunga (max %d caratteri)." msgid "Could not update group." msgstr "Impossibile aggiornare il gruppo." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Impossibile creare gli alias." @@ -1967,7 +1965,7 @@ msgstr "Invita nuovi utenti" msgid "You are already subscribed to these users:" msgstr "Hai già un abbonamento a questi utenti:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2097,7 +2095,7 @@ msgstr "%1$s fa ora parte del gruppo %2$s" msgid "You must be logged in to leave a group." msgstr "Devi eseguire l'accesso per lasciare un gruppo." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "Non fai parte di quel gruppo." @@ -2211,12 +2209,12 @@ msgstr "Usa questo modulo per creare un nuovo gruppo." msgid "New message" msgstr "Nuovo messaggio" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Non puoi inviare un messaggio a questo utente." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Nessun contenuto!" @@ -2224,7 +2222,7 @@ msgstr "Nessun contenuto!" msgid "No recipient specified." msgstr "Nessun destinatario specificato." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente." @@ -2238,7 +2236,7 @@ msgstr "Messaggio inviato" msgid "Direct message to %s sent." msgstr "Messaggio diretto a %s inviato." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Errore di Ajax" @@ -2372,8 +2370,8 @@ msgstr "tipo di contenuto " msgid "Only " msgstr "Solo " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Non è un formato di dati supportato." @@ -2506,7 +2504,7 @@ msgstr "Vecchia password non corretta" msgid "Error saving user; invalid." msgstr "Errore nel salvare l'utente; non valido." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Impossibile salvare la nuova password." @@ -3006,7 +3004,7 @@ msgstr "Reimposta la password" msgid "Recover password" msgstr "Recupera la password" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Richiesta password di ripristino" @@ -3026,19 +3024,19 @@ msgstr "Reimposta" msgid "Enter a nickname or email address." msgstr "Inserisci un soprannome o un indirizzo email." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Nessun utente con quell'email o nome utente." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Nessun indirizzo email registrato per quell'utente." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Errore nel salvare la conferma dell'indirizzo." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3046,23 +3044,23 @@ msgstr "" "Le istruzioni per recuperare la tua password sono state inviate " "all'indirizzo email registrato nel tuo account." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Ripristino della password inaspettato." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "La password deve essere lunga almeno 6 caratteri." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "La password e la conferma non corrispondono." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Errore nell'impostare l'utente." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Nuova password salvata con successo. Hai effettuato l'accesso." @@ -3266,7 +3264,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:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Ripetuti" @@ -4515,7 +4513,7 @@ msgstr "Versione" msgid "Author(s)" msgstr "Autori" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4524,13 +4522,13 @@ msgstr "" "Nessun file può superare %d byte e il file inviato era di %d byte. Prova a " "caricarne una versione più piccola." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Un file di questa dimensione supererebbe la tua quota utente di %d byte." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4609,7 +4607,7 @@ msgstr "Problema nel salvare il messaggio." msgid "Problem saving group inbox." msgstr "Problema nel salvare la casella della posta del gruppo." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4638,28 +4636,28 @@ msgstr "Impossibile eliminare l'auto-abbonamento." msgid "Couldn't delete subscription OMB token." msgstr "Impossibile eliminare il token di abbonamento OMB." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Impossibile eliminare l'abbonamento." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Benvenuti su %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Impossibile creare il gruppo." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "Impossibile impostare l'URI del gruppo." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Impossibile impostare la membership al gruppo." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "Impossibile salvare le informazioni del gruppo locale." @@ -4863,7 +4861,7 @@ msgstr "Badge" msgid "StatusNet software license" msgstr "Licenza del software StatusNet" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4872,12 +4870,12 @@ msgstr "" "**%%site.name%%** è un servizio di microblog offerto da [%%site.broughtby%%]" "(%%site.broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** è un servizio di microblog. " -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4888,44 +4886,44 @@ msgstr "" "s, disponibile nei termini della licenza [GNU Affero General Public License]" "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "Licenza del contenuto del sito" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "I contenuti e i dati di %1$s sono privati e confidenziali." -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" "I contenuti e i dati sono copyright di %1$s. Tutti i diritti riservati." -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "I contenuti e i dati sono forniti dai collaboratori. Tutti i diritti " "riservati." -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "Tutti " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "licenza." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Paginazione" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "Successivi" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Precedenti" @@ -5029,7 +5027,7 @@ msgstr "" "Le risorse API richiedono accesso lettura-scrittura, ma si dispone del solo " "accesso in lettura." -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5130,37 +5128,50 @@ msgstr "Modifica della password non riuscita" msgid "Password changing is not allowed" msgstr "La modifica della password non è permessa" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Risultati comando" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Comando completato" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Comando non riuscito" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Questo comando non è ancora implementato." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Un messaggio con quel ID non esiste" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "L'utente non ha un ultimo messaggio." + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "Impossibile trovare un utente col soprannome %s" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Impossibile trovare un utente col soprannome %s" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Questo comando non è ancora implementato." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Non ha molto senso se cerchi di richiamarti!" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "Richiamo inviato a %s" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5171,197 +5182,196 @@ msgstr "" "Abbonati: %2$s\n" "Messaggi: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Un messaggio con quel ID non esiste" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "L'utente non ha un ultimo messaggio." - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Messaggio indicato come preferito." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "Fai già parte di quel gruppo" -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s." -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s fa ora parte del gruppo %s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%1$s ha lasciato il gruppo %2$s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Posizione: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Pagina web: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "Informazioni: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Messaggio diretto a %s inviato." -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Errore nell'inviare il messaggio diretto." -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "Impossibile ripetere un proprio messaggio" -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "Hai già ripetuto quel messaggio" -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "Messaggio da %s ripetuto" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "Errore nel ripetere il messaggio." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "Risposta a %s inviata" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "Errore nel salvare il messaggio." -#: lib/command.php:547 +#: lib/command.php:594 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:589 -msgid "No such user" -msgstr "Utente inesistente." +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Non hai una abbonamento a quel profilo." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Abbonati a %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento." -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Abbonamento a %s annullato" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Comando non ancora implementato." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Notifiche disattivate." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "Impossibile disattivare le notifiche." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Notifiche attivate." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "Impossibile attivare le notifiche." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "Il comando di accesso è disabilitato" -#: lib/command.php:665 +#: lib/command.php:708 #, 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:692 +#: lib/command.php:735 #, php-format msgid "Unsubscribed %s" msgstr "%s ha annullato l'abbonamento" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "Il tuo abbonamento è stato annullato." -#: lib/command.php:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "Nessuno è abbonato ai tuoi messaggi." -#: lib/command.php:733 +#: lib/command.php:776 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:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "Non fai parte di alcun gruppo." -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5634,49 +5644,49 @@ msgstr "Etichette nei messaggi del gruppo %s" msgid "This page is not available in a media type you accept" msgstr "Questa pagina non è disponibile in un tipo di supporto che tu accetti" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Formato file immagine non supportato." + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Quel file è troppo grande. La dimensione massima è %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Caricamento parziale." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Errore di sistema nel caricare il file." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Non è un'immagine o il file è danneggiato." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Formato file immagine non supportato." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Perso il nostro file." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Tipo di file sconosciuto" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "Sorgente casella in arrivo %d sconosciuta." @@ -5957,7 +5967,7 @@ msgstr "" "iniziare una conversazione con altri utenti. Altre persone possono mandare " "messaggi riservati solamente a te." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "via" @@ -6112,23 +6122,23 @@ msgstr "O" msgid "at" msgstr "presso" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "in una discussione" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "Ripetuto da" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Rispondi a questo messaggio" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Rispondi" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "Messaggio ripetuto" @@ -6438,47 +6448,47 @@ msgctxt "role" msgid "Moderator" msgstr "Moderatore" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "pochi secondi fa" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "circa un minuto fa" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "circa %d minuti fa" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "circa un'ora fa" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "circa %d ore fa" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "circa un giorno fa" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "circa %d giorni fa" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "circa un mese fa" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "circa %d mesi fa" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "circa un anno fa" @@ -6492,7 +6502,7 @@ msgstr "%s non è un colore valido." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s non è un colore valido. Usa 3 o 6 caratteri esadecimali." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d." diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 847f24c59..a3e00a367 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:18+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:43:30+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -97,7 +97,7 @@ msgstr "そのようなページはありません。" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -106,10 +106,8 @@ msgstr "そのようなページはありません。" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "そのようなユーザはいません。" @@ -208,12 +206,12 @@ msgstr "%2$s に %1$s と友人からの更新があります！" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "API メソッドが見つかりません。" @@ -344,7 +342,7 @@ msgstr "そのＩＤのステータスが見つかりません。" msgid "This status is already a favorite." msgstr "このステータスはすでにお気に入りです。" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "お気に入りを作成できません。" @@ -464,7 +462,7 @@ msgstr "グループが見つかりません!" msgid "You are already a member of that group." msgstr "すでにこのグループのメンバーです。" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "管理者によってこのグループからブロックされています。" @@ -514,7 +512,7 @@ msgstr "不正なトークン。" #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -651,12 +649,12 @@ msgstr "つぶやきは URL を含めて最大 %d 字までです。" msgid "Unsupported format." msgstr "サポート外の形式です。" -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / %2$s からのお気に入り" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s は %2$s でお気に入りを更新しました / %2$s。" @@ -666,7 +664,7 @@ msgstr "%1$s は %2$s でお気に入りを更新しました / %2$s。" msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / %2$s について更新" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%2$s からアップデートに答える %1$s アップデート" @@ -676,7 +674,7 @@ msgstr "%2$s からアップデートに答える %1$s アップデート" msgid "%s public timeline" msgstr "%s のパブリックタイムライン" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "皆からの %s アップデート!" @@ -691,12 +689,12 @@ msgstr "%s への返信" msgid "Repeats of %s" msgstr "%s の返信" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "%s とタグ付けされたつぶやき" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%2$s に %1$s による更新があります！" @@ -756,7 +754,7 @@ msgid "Preview" msgstr "プレビュー" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "削除" @@ -840,8 +838,8 @@ msgstr "ブロック情報の保存に失敗しました。" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "そのようなグループはありません。" @@ -942,7 +940,7 @@ msgstr "このアプリケーションのオーナーではありません。" #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "あなたのセッショントークンに関する問題がありました。" @@ -1003,7 +1001,7 @@ msgstr "本当にこのつぶやきを削除しますか？" msgid "Do not delete this notice" msgstr "このつぶやきを削除できません。" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "このつぶやきを削除" @@ -1256,7 +1254,7 @@ msgstr "記述が長すぎます。（最長 %d 字）" msgid "Could not update group." msgstr "グループを更新できません。" -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "別名を作成できません。" @@ -1963,7 +1961,7 @@ msgstr "新しいユーザを招待" msgid "You are already subscribed to these users:" msgstr "すでにこれらのユーザをフォローしています:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -2096,7 +2094,7 @@ msgstr "%1$s はグループ %2$s に参加しました" msgid "You must be logged in to leave a group." msgstr "グループから離れるにはログインしていなければなりません。" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "あなたはそのグループのメンバーではありません。" @@ -2209,12 +2207,12 @@ msgstr "このフォームを使って新しいグループを作成します。 msgid "New message" msgstr "新しいメッセージ" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "このユーザにメッセージを送ることはできません。" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "コンテンツがありません！" @@ -2222,7 +2220,7 @@ msgstr "コンテンツがありません！" msgid "No recipient specified." msgstr "受取人が書かれていません。" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2237,7 +2235,7 @@ msgstr "メッセージを送りました" msgid "Direct message to %s sent." msgstr "ダイレクトメッセージを %s に送りました" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax エラー" @@ -2370,8 +2368,8 @@ msgstr "内容種別 " msgid "Only " msgstr "だけ " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "サポートされていないデータ形式。" @@ -2504,7 +2502,7 @@ msgstr "古いパスワードが間違っています。" msgid "Error saving user; invalid." msgstr "ユーザ保存エラー; 不正なユーザ" -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "新しいパスワードを保存できません。" @@ -3005,7 +3003,7 @@ msgstr "パスワードをリセット" msgid "Recover password" msgstr "パスワードを回復" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "パスワード回復がリクエストされました" @@ -3025,41 +3023,41 @@ msgstr "リセット" msgid "Enter a nickname or email address." msgstr "ニックネームかメールアドレスを入力してください。" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "そのメールアドレスかユーザ名をもっているユーザがありません。" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "そのユーザにはメールアドレスの登録がありません。" -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "アドレス確認保存エラー" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "登録されたメールアドレスにパスワードの回復方法をお送りしました。" -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "予期せぬパスワードのリセットです。" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "パスワードは6字以上でなければいけません。" -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "パスワードと確認が一致しません。" -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "ユーザ設定エラー" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "新しいパスワードの保存に成功しました。ログインしています。" @@ -3260,7 +3258,7 @@ msgstr "自分のつぶやきは繰り返せません。" msgid "You already repeated that notice." msgstr "すでにそのつぶやきを繰り返しています。" -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "繰り返された" @@ -4514,7 +4512,7 @@ msgstr "バージョン" msgid "Author(s)" msgstr "作者" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4524,13 +4522,13 @@ msgstr "" "ファイルは %d バイトでした。より小さいバージョンをアップロードするようにして" "ください。" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "これほど大きいファイルはあなたの%dバイトのユーザ割当てを超えているでしょう。" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4609,7 +4607,7 @@ msgstr "つぶやきを保存する際に問題が発生しました。" msgid "Problem saving group inbox." msgstr "グループ受信箱を保存する際に問題が発生しました。" -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4639,29 +4637,29 @@ msgstr "自己フォローを削除できません。" msgid "Couldn't delete subscription OMB token." msgstr "フォローを削除できません" -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "フォローを削除できません" -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "ようこそ %1$s、@%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "グループを作成できません。" -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "グループメンバーシップをセットできません。" -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "グループメンバーシップをセットできません。" -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "フォローを保存できません。" @@ -4883,7 +4881,7 @@ msgstr "バッジ" msgid "StatusNet software license" msgstr "StatusNet ソフトウェアライセンス" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4892,12 +4890,12 @@ msgstr "" "**%%site.name%%** は [%%site.broughtby%%](%%site.broughtbyurl%%) が提供するマ" "イクロブログサービスです。 " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** はマイクロブログサービスです。 " -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4908,41 +4906,41 @@ msgstr "" "いています。 ライセンス [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)。" -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "サイト内容ライセンス" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "全て " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "ライセンス。" -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "ページ化" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "<<後" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "前>>" @@ -5050,7 +5048,7 @@ msgstr "" "APIリソースは読み書きアクセスが必要です、しかしあなたは読みアクセスしか持って" "いません。" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5150,37 +5148,50 @@ msgstr "パスワード変更に失敗しました" msgid "Password changing is not allowed" msgstr "パスワード変更は許可されていません" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "コマンド結果" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "コマンド完了" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "コマンド失敗" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "すみません、このコマンドはまだ実装されていません。" +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "その ID によるつぶやきは存在していません" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "ユーザはまだつぶやいていません" + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "ユーザを更新できません" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "ユーザを更新できません" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "すみません、このコマンドはまだ実装されていません。" + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "それは自分自身への合図で多くは意味がありません!" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "%s へ合図を送りました" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5191,193 +5202,191 @@ msgstr "" "フォローされている: %2$s\n" "つぶやき: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "その ID によるつぶやきは存在していません" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "ユーザはまだつぶやいていません" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "お気に入りにされているつぶやき。" -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "あなたは既にそのグループに参加しています。" -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "ユーザ %s はグループ %s に参加できません" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s はグループ %s に参加しました" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "ユーザ %s をグループ %s から削除することができません" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s はグループ %s に残りました。" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "フルネーム： %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "場所: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "ホームページ: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "About: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "メッセージが長すぎます - 最大 %d 字、あなたが送ったのは %d" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "ダイレクトメッセージを %s に送りました" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "ダイレクトメッセージ送信エラー。" -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "自分のつぶやきを繰り返すことはできません" -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "すでにこのつぶやきは繰り返されています" -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "%s からつぶやきが繰り返されています" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "つぶやき繰り返しエラー" -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "つぶやきが長すぎます - 最大 %d 字、あなたが送ったのは %d" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "%s へ返信を送りました" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "つぶやき保存エラー。" -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "フォローするユーザの名前を指定してください" -#: lib/command.php:554 lib/command.php:589 +#: lib/command.php:602 #, fuzzy -msgid "No such user" -msgstr "そのようなユーザはいません。" +msgid "Can't subscribe to OMB profiles by command." +msgstr "あなたはそのプロファイルにフォローされていません。" -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "%s をフォローしました" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "フォローをやめるユーザの名前を指定してください" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "%s のフォローをやめる" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "コマンドはまだ実装されていません。" -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "通知オフ。" -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "通知をオフできません。" -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "通知オン。" -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "通知をオンできません。" -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "ログインコマンドが無効になっています。" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "このリンクは、かつてだけ使用可能であり、2分間だけ良いです: %s" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "%s のフォローをやめる" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "あなたはだれにもフォローされていません。" -#: lib/command.php:711 +#: lib/command.php:754 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "あなたはこの人にフォローされています:" -#: lib/command.php:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "誰もフォローしていません。" -#: lib/command.php:733 +#: lib/command.php:776 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "この人はあなたにフォローされている:" -#: lib/command.php:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "あなたはどのグループのメンバーでもありません。" -#: lib/command.php:755 +#: lib/command.php:798 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "あなたはこのグループのメンバーではありません:" -#: lib/command.php:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5609,49 +5618,49 @@ msgstr "%s グループのつぶやきにあるタグ" msgid "This page is not available in a media type you accept" msgstr "このページはあなたが承認したメディアタイプでは利用できません。" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "サポート外の画像形式です。" + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "ファイルが大きすぎます。最大ファイルサイズは %s 。" -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "不完全なアップロード。" -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "ファイルのアップロードでシステムエラー" -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "画像ではないかファイルが破損しています。" -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "サポート外の画像形式です。" - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "ファイルを紛失。" -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "不明なファイルタイプ" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "不明な受信箱のソース %d。" @@ -5931,7 +5940,7 @@ msgstr "" "に引き込むプライベートメッセージを送ることができます。人々はあなただけへの" "メッセージを送ることができます。" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "from" @@ -6094,23 +6103,23 @@ msgstr "西" msgid "at" msgstr "at" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "このつぶやきへ返信" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "返信" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "つぶやきを繰り返しました" @@ -6424,47 +6433,47 @@ msgctxt "role" msgid "Moderator" msgstr "管理" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "数秒前" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "約 1 分前" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "約 %d 分前" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "約 1 時間前" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "約 %d 時間前" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "約 1 日前" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "約 %d 日前" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "約 1 ヵ月前" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "約 %d ヵ月前" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "約 1 年前" @@ -6478,7 +6487,7 @@ msgstr "%sは有効な色ではありません!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s は有効な色ではありません! 3か6の16進数を使ってください。" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 69bf4efb9..ce01a9966 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:22+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:43:33+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -100,7 +100,7 @@ msgstr "그러한 태그가 없습니다." #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -109,10 +109,8 @@ msgstr "그러한 태그가 없습니다." #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "그러한 사용자는 없습니다." @@ -206,12 +204,12 @@ msgstr "%1$s 및 %2$s에 있는 친구들의 업데이트!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "API 메서드를 찾을 수 없습니다." @@ -345,7 +343,7 @@ msgstr "그 ID로 발견된 상태가 없습니다." msgid "This status is already a favorite." msgstr "이 게시글은 이미 좋아하는 게시글입니다." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "좋아하는 게시글을 생성할 수 없습니다." @@ -471,7 +469,7 @@ msgstr "API 메서드를 찾을 수 없습니다." msgid "You are already a member of that group." msgstr "당신은 이미 이 그룹의 멤버입니다." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "" @@ -523,7 +521,7 @@ msgstr "옳지 않은 크기" #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -666,12 +664,12 @@ msgstr "" msgid "Unsupported format." msgstr "지원하지 않는 그림 파일 형식입니다." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / %s의 좋아하는 글들" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s 좋아하는 글이 업데이트 됐습니다. %S에 의해 / %s." @@ -681,7 +679,7 @@ msgstr "%s 좋아하는 글이 업데이트 됐습니다. %S에 의해 / %s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / %2$s에게 답신 업데이트" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다." @@ -691,7 +689,7 @@ msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다." msgid "%s public timeline" msgstr "%s 공개 타임라인" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "모두로부터의 업데이트 %s개!" @@ -706,12 +704,12 @@ msgstr "%s에 답신" msgid "Repeats of %s" msgstr "%s에 답신" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "%s 태그된 통지" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%2$s에 있는 %1$s의 업데이트!" @@ -772,7 +770,7 @@ msgid "Preview" msgstr "미리보기" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "삭제" @@ -855,8 +853,8 @@ msgstr "정보차단을 저장하는데 실패했습니다." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "그러한 그룹이 없습니다." @@ -965,7 +963,7 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "당신의 세션토큰관련 문제가 있습니다." @@ -1027,7 +1025,7 @@ msgstr "정말로 통지를 삭제하시겠습니까?" msgid "Do not delete this notice" msgstr "이 통지를 지울 수 없습니다." -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "이 게시글 삭제하기" @@ -1302,7 +1300,7 @@ msgstr "설명이 너무 길어요. (최대 140글자)" msgid "Could not update group." msgstr "그룹을 업데이트 할 수 없습니다." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "좋아하는 게시글을 생성할 수 없습니다." @@ -2015,7 +2013,7 @@ msgstr "새 사용자를 초대" msgid "You are already subscribed to these users:" msgstr "당신은 다음 사용자를 이미 구독하고 있습니다." -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2140,7 +2138,7 @@ msgstr "%s 는 그룹 %s에 가입했습니다." msgid "You must be logged in to leave a group." msgstr "그룹을 떠나기 위해서는 로그인해야 합니다." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "당신은 해당 그룹의 멤버가 아닙니다." @@ -2258,12 +2256,12 @@ msgstr "새 그룹을 만들기 위해 이 양식을 사용하세요." msgid "New message" msgstr "새로운 메시지입니다." -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "내용이 없습니다!" @@ -2271,7 +2269,7 @@ msgstr "내용이 없습니다!" msgid "No recipient specified." msgstr "수신자를 지정하지 않았습니다." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2287,7 +2285,7 @@ msgstr "메시지" msgid "Direct message to %s sent." msgstr "%s에게 보낸 직접 메시지" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax 에러입니다." @@ -2418,8 +2416,8 @@ msgstr "연결" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "지원하는 형식의 데이터가 아닙니다." @@ -2557,7 +2555,7 @@ msgstr "기존 비밀 번호가 틀렸습니다" msgid "Error saving user; invalid." msgstr "사용자 저장 오류; 무효한 사용자" -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "새 비밀번호를 저장 할 수 없습니다." @@ -3057,7 +3055,7 @@ msgstr "비밀 번호 초기화" msgid "Recover password" msgstr "비밀 번호 복구" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "비밀 번호 복구가 요청되었습니다." @@ -3077,41 +3075,41 @@ msgstr "초기화" msgid "Enter a nickname or email address." msgstr "별명이나 이메일 계정을 입력하십시오." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "그러한 이메일 주소나 계정을 가진 사용자는 없습니다." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "그 사용자는 등록된 메일주소가 없습니다." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "주소 확인 저장 에러" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "가입하신 이메일로 비밀 번호 재발급에 관한 안내를 보냈습니다." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "잘못된 비밀 번호 지정" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "비밀 번호는 6자 이상이어야 합니다." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "비밀 번호가 일치하지 않습니다." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "사용자 세팅 오류" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" "새로운 비밀 번호를 성공적으로 저장했습니다. 귀하는 이제 로그인 되었습니다." @@ -3318,7 +3316,7 @@ msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다." msgid "You already repeated that notice." msgstr "당신은 이미 이 사용자를 차단하고 있습니다." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 #, fuzzy msgid "Repeated" msgstr "생성" @@ -4551,19 +4549,19 @@ msgstr "개인적인" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4649,7 +4647,7 @@ msgstr "통지를 저장하는데 문제가 발생했습니다." msgid "Problem saving group inbox." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4682,29 +4680,29 @@ msgstr "예약 구독을 삭제 할 수 없습니다." msgid "Couldn't delete subscription OMB token." msgstr "예약 구독을 삭제 할 수 없습니다." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "예약 구독을 삭제 할 수 없습니다." -#: classes/User.php:373 +#: classes/User.php:378 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%2$s에서 %1$s까지 메시지" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "새 그룹을 만들 수 없습니다." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "그룹 맴버십을 세팅할 수 없습니다." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "그룹 맴버십을 세팅할 수 없습니다." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "구독을 저장할 수 없습니다." @@ -4928,7 +4926,7 @@ msgstr "찔러 보기" msgid "StatusNet software license" msgstr "라코니카 소프트웨어 라이선스" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4937,12 +4935,12 @@ msgstr "" "**%%site.name%%** 는 [%%site.broughtby%%](%%site.broughtbyurl%%)가 제공하는 " "마이크로블로깅서비스입니다." -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다." -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4953,42 +4951,42 @@ msgstr "" "을 사용합니다. StatusNet는 [GNU Affero General Public License](http://www." "fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 있습니다." -#: lib/action.php:821 +#: lib/action.php:824 #, fuzzy msgid "Site content license" msgstr "라코니카 소프트웨어 라이선스" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "모든 것" -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "라이선스" -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "페이지수" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "뒷 페이지" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "앞 페이지" @@ -5105,7 +5103,7 @@ msgstr "SMS 인증" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5211,37 +5209,51 @@ msgstr "비밀번호 변경" msgid "Password changing is not allowed" msgstr "비밀번호 변경" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "실행결과" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "실행 완료" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "실행 실패" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "죄송합니다. 이 명령은 아직 실행되지 않았습니다." +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "해당 id의 프로필이 없습니다." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "이용자의 지속적인 게시글이 없습니다." + +#: lib/command.php:125 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "이 이메일 주소로 사용자를 업데이트 할 수 없습니다." -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "이 이메일 주소로 사용자를 업데이트 할 수 없습니다." + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "죄송합니다. 이 명령은 아직 실행되지 않았습니다." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "찔러 보기를 보냈습니다." -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5249,200 +5261,198 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "해당 id의 프로필이 없습니다." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "이용자의 지속적인 게시글이 없습니다." - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "게시글이 좋아하는 글로 지정되었습니다." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "당신은 이미 이 그룹의 멤버입니다." -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "그룹 %s에 %s는 가입할 수 없습니다." -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s 는 그룹 %s에 가입했습니다." -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다." -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s가 그룹%s를 떠났습니다." -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "전체이름: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "위치: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "홈페이지: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "자기소개: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다." -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "%s에게 보낸 직접 메시지" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "직접 메시지 보내기 오류." -#: lib/command.php:413 +#: lib/command.php:490 #, fuzzy msgid "Cannot repeat your own notice" msgstr "알림을 켤 수 없습니다." -#: lib/command.php:418 +#: lib/command.php:495 #, fuzzy msgid "Already repeated that notice" msgstr "이 게시글 삭제하기" -#: lib/command.php:426 +#: lib/command.php:503 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "게시글이 등록되었습니다." -#: lib/command.php:428 +#: lib/command.php:505 #, fuzzy msgid "Error repeating notice." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: lib/command.php:482 +#: lib/command.php:536 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다." -#: lib/command.php:491 +#: lib/command.php:545 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "이 게시글에 대해 답장하기" -#: lib/command.php:493 +#: lib/command.php:547 #, fuzzy msgid "Error saving notice." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "구독하려는 사용자의 이름을 지정하십시오." -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "그러한 사용자는 없습니다." +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "당신은 이 프로필에 구독되지 않고있습니다." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "%s에게 구독되었습니다." -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "구독을 해제하려는 사용자의 이름을 지정하십시오." -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "%s에서 구독을 해제했습니다." -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "명령이 아직 실행되지 않았습니다." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "알림끄기." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "알림을 끌 수 없습니다." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "알림이 켜졌습니다." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "알림을 켤 수 없습니다." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "%s에서 구독을 해제했습니다." -#: lib/command.php:709 +#: lib/command.php:752 #, fuzzy msgid "You are not subscribed to anyone." msgstr "당신은 이 프로필에 구독되지 않고있습니다." -#: lib/command.php:711 +#: lib/command.php:754 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다." -#: lib/command.php:731 +#: lib/command.php:774 #, fuzzy msgid "No one is subscribed to you." msgstr "다른 사람을 구독 하실 수 없습니다." -#: lib/command.php:733 +#: lib/command.php:776 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "다른 사람을 구독 하실 수 없습니다." -#: lib/command.php:753 +#: lib/command.php:796 #, fuzzy msgid "You are not a member of any groups." msgstr "당신은 해당 그룹의 멤버가 아닙니다." -#: lib/command.php:755 +#: lib/command.php:798 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다." -#: lib/command.php:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5678,49 +5688,49 @@ msgstr "%s 그룹 게시글의 태그" msgid "This page is not available in a media type you accept" msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다." -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "지원하지 않는 그림 파일 형식입니다." + +#: lib/imagefile.php:90 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "불완전한 업로드." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "파일을 올리는데 시스템 오류 발생" -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "그림 파일이 아니거나 손상된 파일 입니다." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "지원하지 않는 그림 파일 형식입니다." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "파일을 잃어버렸습니다." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "알 수 없는 종류의 파일입니다" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5923,7 +5933,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 #, fuzzy msgid "from" msgstr "다음에서:" @@ -6079,25 +6089,25 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 #, fuzzy msgid "in context" msgstr "내용이 없습니다!" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 #, fuzzy msgid "Repeated by" msgstr "생성" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "이 게시글에 대해 답장하기" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "답장하기" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 #, fuzzy msgid "Notice repeated" msgstr "게시글이 등록되었습니다." @@ -6426,47 +6436,47 @@ msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "몇 초 전" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "1분 전" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "%d분 전" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "1시간 전" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "%d시간 전" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "하루 전" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "%d일 전" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "1달 전" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "%d달 전" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "1년 전" @@ -6480,7 +6490,7 @@ msgstr "홈페이지 주소형식이 올바르지 않습니다." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다." diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 74b9cb228..7b85fa9bb 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:24+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:43:36+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -95,7 +95,7 @@ msgstr "Нема таква страница" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -104,10 +104,8 @@ msgstr "Нема таква страница" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Нема таков корисник." @@ -209,12 +207,12 @@ msgstr "Подновувања од %1$s и пријатели на %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "API методот не е пронајден." @@ -346,7 +344,7 @@ msgstr "Нема пронајдено статус со таков ID." msgid "This status is already a favorite." msgstr "Овој статус веќе Ви е омилен." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Не можам да создадам омилина забелешка." @@ -465,7 +463,7 @@ msgstr "Групата не е пронајдена!" msgid "You are already a member of that group." msgstr "Веќе членувате во таа група." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "Блокирани сте од таа група од администраторот." @@ -515,7 +513,7 @@ msgstr "Погрешен жетон." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -657,12 +655,12 @@ msgstr "" msgid "Unsupported format." msgstr "Неподдржан формат." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Омилени од %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "Подновувања на %1$s омилени на %2$s / %2$s." @@ -672,7 +670,7 @@ msgstr "Подновувања на %1$s омилени на %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Подновувања кои споменуваат %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s подновувања коишто се одговор на подновувањата од %2$s / %3$s." @@ -682,7 +680,7 @@ msgstr "%1$s подновувања коишто се одговор на под msgid "%s public timeline" msgstr "Јавна историја на %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s подновуввања од сите!" @@ -697,12 +695,12 @@ msgstr "Повторено за %s" msgid "Repeats of %s" msgstr "Повторувања на %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Забелешки означени со %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Подновувањата се означени со %1$s на %2$s!" @@ -764,7 +762,7 @@ msgid "Preview" msgstr "Преглед" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Бриши" @@ -848,8 +846,8 @@ msgstr "Не можев да ги снимам инофрмациите за б #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "Нема таква група." @@ -950,7 +948,7 @@ msgstr "Не сте сопственик на овој програм." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "Се појави проблем со Вашиот сесиски жетон." @@ -1011,7 +1009,7 @@ msgstr "Дали сте сигурни дека сакате да ја избр msgid "Do not delete this notice" msgstr "Не ја бриши оваа забелешка" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Бриши ја оваа забелешка" @@ -1264,7 +1262,7 @@ msgstr "описот е предолг (максимум %d знаци)" msgid "Could not update group." msgstr "Не можев да ја подновам групата." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Не можеше да се создадат алијаси." @@ -1973,7 +1971,7 @@ msgstr "Покани нови корисници" msgid "You are already subscribed to these users:" msgstr "Веќе сте претплатени на овие корисници:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2104,7 +2102,7 @@ msgstr "%1$s се зачлени во групата %2$s" msgid "You must be logged in to leave a group." msgstr "Мора да сте најавени за да можете да ја напуштите групата." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "Не членувате во таа група." @@ -2219,12 +2217,12 @@ msgstr "Овој образец служи за создавање нова гр msgid "New message" msgstr "Нова порака" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Не можете да испратите порака до овојо корисник." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Нема содржина!" @@ -2232,7 +2230,7 @@ msgstr "Нема содржина!" msgid "No recipient specified." msgstr "Нема назначено примач." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2248,7 +2246,7 @@ msgstr "Пораката е испратена" msgid "Direct message to %s sent." msgstr "Директната порака до %s е испратена." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax-грешка" @@ -2382,8 +2380,8 @@ msgstr "тип на содржини " msgid "Only " msgstr "Само " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Ова не е поддржан формат на податотека." @@ -2516,7 +2514,7 @@ msgstr "Неточна стара лозинка" msgid "Error saving user; invalid." msgstr "Грешка во зачувувањето на корисникот; неправилен." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Не можам да ја зачувам новата лозинка." @@ -3021,7 +3019,7 @@ msgstr "Рестетирај ја лозинката" msgid "Recover password" msgstr "Пронаоѓање на лозинка" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Побарано е пронаоѓање на лозинката" @@ -3041,19 +3039,19 @@ msgstr "Врати одново" msgid "Enter a nickname or email address." msgstr "Внесете прекар или е-пошта" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Нема корисник со таа е-поштенска адреса или корисничко име." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Нема регистрирана адреса за е-пошта за тој корисник." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Грешка при зачувувањето на потврдата за адреса." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3061,23 +3059,23 @@ msgstr "" "Упатството за пронаоѓање на Вашата лозинка е испратено до адресата за е-" "пошта што е регистрирана со Вашата сметка." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Неочекувано подновување на лозинката." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Лозинката мора да биде од најмалку 6 знаци." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Двете лозинки не се совпаѓаат." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Грешка во поставувањето на корисникот." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Новата лозинка е успешно зачувана. Сега сте најавени." @@ -3281,7 +3279,7 @@ msgstr "Не можете да повторувате сопствена заб msgid "You already repeated that notice." msgstr "Веќе ја имате повторено таа забелешка." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Повторено" @@ -4538,7 +4536,7 @@ msgstr "Верзија" msgid "Author(s)" msgstr "Автор(и)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4547,13 +4545,13 @@ msgstr "" "Ниедна податотека не смее да биде поголема од %d бајти, а подаотеката што ја " "испративте содржи %d бајти. Подигнете помала верзија." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Волку голема податотека ќе ја надмине Вашата корисничка квота од %d бајти." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "ВОлку голема податотека ќе ја надмине Вашата месечна квота од %d бајти" @@ -4631,7 +4629,7 @@ msgstr "Проблем во зачувувањето на белешката." msgid "Problem saving group inbox." msgstr "Проблем при зачувувањето на групното приемно сандаче." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4661,28 +4659,28 @@ msgstr "Не можам да ја избришам самопретплатат msgid "Couldn't delete subscription OMB token." msgstr "Не можете да го избришете OMB-жетонот за претплата." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Претплата не може да се избрише." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добредојдовте на %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Не можев да ја создадам групата." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "Не можев да поставам URI на групата." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Не можев да назначам членство во групата." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "Не можев да ги зачувам информациите за локалните групи." @@ -4886,7 +4884,7 @@ msgstr "Значка" msgid "StatusNet software license" msgstr "Лиценца на програмот StatusNet" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4895,12 +4893,12 @@ msgstr "" "**%%site.name%%** е сервис за микроблогирање што ви го овозможува [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** е сервис за микроблогирање." -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4911,45 +4909,45 @@ msgstr "" "верзија %s, достапен пд [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "Лиценца на содржините на веб-страницата" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "Содржината и податоците на %1$s се лични и доверливи." -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" "Авторските права на содржината и податоците се во сопственост на %1$s. Сите " "права задржани." -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "Авторските права на содржината и податоците им припаѓаат на учесниците. Сите " "права задржани." -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "Сите " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "лиценца." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Прелом на страници" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "По" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Пред" @@ -5053,7 +5051,7 @@ msgstr "" "API-ресурсот бара да може и да чита и да запишува, а вие можете само да " "читате." -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "Неуспешен обид за API-заверка, прекар = %1$s, прокси = %2$s, IP = %3$s" @@ -5152,37 +5150,50 @@ msgstr "Менувањето на лозинката не успеа" msgid "Password changing is not allowed" msgstr "Менувањето на лозинка не е дозволено" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Резултати од наредбата" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Наредбата е завршена" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Наредбата не успеа" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Жалиме, оваа наредба сè уште не е имплементирана." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Не постои забелешка со таков id" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "Корисникот нема последна забелешка" + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "Не можев да пронајдам корисник со прекар %s" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Не можев да пронајдам корисник со прекар %s" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Жалиме, оваа наредба сè уште не е имплементирана." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Нема баш логика да се подбуцнувате сами себеси." -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "Испратено подбуцнување на %s" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5193,198 +5204,197 @@ msgstr "" "Претплатници: %2$s\n" "Забелешки: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Не постои забелешка со таков id" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Корисникот нема последна забелешка" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Забелешката е обележана како омилена." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "Веќе членувате во таа група" -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "Не можев да го зачленам корисникот %s во групата %s" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s се зачлени во групата %s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "Не можев да го отстранам корисникот %s од групата %s" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s ја напушти групата %s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Име и презиме: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Локација: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Домашна страница: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "За: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" "Пораката е предолга - дозволени се највеќе %d знаци, а вие испративте %d" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Директната порака до %s е испратена" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Грашка при испаќањето на директната порака." -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "Не можете да повторувате сопствени забалешки" -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "Оваа забелешка е веќе повторена" -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "Забелешката од %s е повторена" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "Грешка при повторувањето на белешката." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "Забелешката е предолга - треба да нема повеќе од %d знаци, а Вие испративте %" "d" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "Одговорот на %s е испратен" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "Грешка при зачувувањето на белешката." -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "Назначете го името на корисникот на којшто сакате да се претплатите" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Нема таков корисник" +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Не сте претплатени на тој профил." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Претплатено на %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "Назначете го името на корисникот од кого откажувате претплата." -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Претплатата на %s е откажана" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Наредбата сè уште не е имплементирана." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Известувањето е исклучено." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "Не можам да исклучам известување." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Известувањето е вклучено." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "Не можам да вклучам известување." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "Наредбата за најава е оневозможена" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "Оваа врска може да се употреби само еднаш, и трае само 2 минути: %s" -#: lib/command.php:692 +#: lib/command.php:735 #, php-format msgid "Unsubscribed %s" msgstr "Откажана претплата на %s" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "Не сте претплатени никому." -#: lib/command.php:711 +#: lib/command.php:754 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Не ни го испративте тој профил." msgstr[1] "Не ни го испративте тој профил." -#: lib/command.php:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "Никој не е претплатен на Вас." -#: lib/command.php:733 +#: lib/command.php:776 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Оддалечена претплата" msgstr[1] "Оддалечена претплата" -#: lib/command.php:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "Не членувате во ниедна група." -#: lib/command.php:755 +#: lib/command.php:798 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Не ни го испративте тој профил." msgstr[1] "Не ни го испративте тој профил." -#: lib/command.php:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5653,49 +5663,49 @@ msgstr "Ознаки во забелешките на групата %s" msgid "This page is not available in a media type you accept" msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате." -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Неподдржан фомрат на слики." + +#: lib/imagefile.php:90 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Ова е предолго. Максималната должина е 140 знаци." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Делумно подигање." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Системска грешка при подигањето на податотеката." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Не е слика или податотеката е пореметена." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Неподдржан фомрат на слики." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Податотеката е изгубена." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Непознат тип на податотека" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "МБ" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "кб" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "Непознат извор на приемна пошта %d." @@ -5978,7 +5988,7 @@ msgstr "" "впуштите во разговор со други корисници. Луѓето можат да ви испраќаат пораки " "што ќе можете да ги видите само Вие." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "од" @@ -6136,23 +6146,23 @@ msgstr "З" msgid "at" msgstr "во" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "во контекст" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "Повторено од" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Одговори на забелешкава" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Одговор" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "Забелешката е повторена" @@ -6462,47 +6472,47 @@ msgctxt "role" msgid "Moderator" msgstr "Модератор" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "пред неколку секунди" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "пред една минута" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "пред %d минути" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "пред еден час" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "пред %d часа" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "пред еден ден" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "пред %d денови" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "пред еден месец" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "пред %d месеца" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "пред една година" @@ -6516,7 +6526,7 @@ msgstr "%s не е важечка боја!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s не е важечка боја! Користете 3 или 6 шеснаесетни (hex) знаци." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index b687e445e..3845dca75 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-08 21:11:29+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:43:40+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63415); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -93,7 +93,7 @@ msgstr "Ingen slik side" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -102,10 +102,8 @@ msgstr "Ingen slik side" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Ingen slik bruker" @@ -205,12 +203,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:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "API-metode ikke funnet!" @@ -343,7 +341,7 @@ msgstr "Fant ingen status med den ID-en." msgid "This status is already a favorite." msgstr "Denne statusen er allerede en favoritt." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Kunne ikke opprette favoritt." @@ -460,7 +458,7 @@ msgstr "Gruppe ikke funnet!" msgid "You are already a member of that group." msgstr "Du er allerede medlem av den gruppen." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "Du har blitt blokkert fra den gruppen av administratoren." @@ -510,7 +508,7 @@ msgstr "Ugyldig symbol." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -648,12 +646,12 @@ msgstr "Maks notisstørrelse er %d tegn, inklusive vedleggs-URL." msgid "Unsupported format." msgstr "Formatet støttes ikke." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoritter fra %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s oppdateringer markert som favoritt av %2$s / %2$s." @@ -663,7 +661,7 @@ msgstr "%1$s oppdateringer markert som favoritt av %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Oppdateringer som nevner %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format 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." @@ -673,7 +671,7 @@ msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s." msgid "%s public timeline" msgstr "%s offentlig tidslinje" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s oppdateringer fra alle sammen!" @@ -688,12 +686,12 @@ msgstr "Gjentatt til %s" msgid "Repeats of %s" msgstr "Repetisjoner av %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notiser merket med %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Oppdateringer merket med %1$s på %2$s!" @@ -753,7 +751,7 @@ msgid "Preview" msgstr "Forhåndsvis" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Slett" @@ -836,8 +834,8 @@ msgstr "Kunne ikke lagre blokkeringsinformasjon." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "Ingen slik gruppe." @@ -938,7 +936,7 @@ msgstr "Du er ikke eieren av dette programmet." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "" @@ -999,7 +997,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:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Slett denne notisen" @@ -1252,7 +1250,7 @@ msgstr "beskrivelse er for lang (maks %d tegn)" msgid "Could not update group." msgstr "Kunne ikke oppdatere gruppe." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Kunne ikke opprette alias." @@ -1482,7 +1480,7 @@ msgstr "" #: lib/personalgroupnav.php:115 #, php-format msgid "%s's favorite notices" -msgstr "" +msgstr "%s sine favorittnotiser" #: actions/favoritesrss.php:115 #, php-format @@ -1502,7 +1500,7 @@ msgstr "" #: actions/featured.php:99 #, php-format msgid "A selection of some great users on %s" -msgstr "" +msgstr "Et utvalg av noen store brukere på %s" #: actions/file.php:34 msgid "No notice ID." @@ -1598,9 +1596,8 @@ msgid "Only an admin can block group members." msgstr "" #: actions/groupblock.php:95 -#, fuzzy msgid "User is already blocked from group." -msgstr "Du er allerede logget inn!" +msgstr "Bruker er allerede blokkert fra gruppe." #: actions/groupblock.php:100 msgid "User is not a member of group." @@ -1624,7 +1621,7 @@ msgstr "Ikke blokker denne brukeren fra denne gruppa" #: actions/groupblock.php:179 msgid "Block this user from this group" -msgstr "" +msgstr "Blokker denne brukeren fra denne gruppen" #: actions/groupblock.php:196 msgid "Database error blocking user from group." @@ -1797,9 +1794,8 @@ msgid "Error removing the block." msgstr "Feil under oppheving av blokkering." #: actions/imsettings.php:59 -#, fuzzy msgid "IM settings" -msgstr "Innstillinger for IM" +msgstr "Innstillinger for direktemeldinger" #: actions/imsettings.php:70 #, php-format @@ -1826,9 +1822,8 @@ msgstr "" "instruksjoner (la du %s til vennelisten din?)" #: actions/imsettings.php:124 -#, fuzzy msgid "IM address" -msgstr "IM-adresse" +msgstr "Direktemeldingsadresse" #: actions/imsettings.php:126 #, php-format @@ -1926,7 +1921,7 @@ msgstr "Inviter nye brukere" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2047,9 +2042,9 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." -msgstr "" +msgstr "Du er ikke et medlem av den gruppen." #: actions/leavegroup.php:137 #, php-format @@ -2075,7 +2070,7 @@ msgstr "Logg inn" #: actions/login.php:227 msgid "Login to site" -msgstr "" +msgstr "Logg inn på nettstedet" #: actions/login.php:236 actions/register.php:478 msgid "Remember me" @@ -2118,18 +2113,17 @@ msgid "Can't get membership record for %1$s in group %2$s." msgstr "Klarte ikke å oppdatere bruker." #: actions/makeadmin.php:146 -#, fuzzy, php-format +#, php-format msgid "Can't make %1$s an admin for group %2$s." -msgstr "Gjør brukeren til en administrator for gruppen" +msgstr "Kan ikke gjøre %1$s til administrator for gruppen %2$s." #: actions/microsummary.php:69 msgid "No current status" msgstr "Ingen nåværende status" #: actions/newapplication.php:52 -#, fuzzy msgid "New Application" -msgstr "Ingen slik side" +msgstr "Nytt program" #: actions/newapplication.php:64 msgid "You must be logged in to register an application." @@ -2160,12 +2154,12 @@ msgstr "Bruk dette skjemaet for å opprette en ny gruppe." msgid "New message" msgstr "Ny melding" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Du kan ikke sende en melding til denne brukeren." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Inget innhold." @@ -2173,7 +2167,7 @@ msgstr "Inget innhold." msgid "No recipient specified." msgstr "Ingen mottaker oppgitt." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2183,11 +2177,11 @@ msgid "Message sent" msgstr "Melding sendt" #: actions/newmessage.php:185 -#, fuzzy, php-format +#, php-format msgid "Direct message to %s sent." -msgstr "Direktemeldinger til %s" +msgstr "Direktemelding til %s sendt." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax-feil" @@ -2211,9 +2205,9 @@ msgid "Text search" msgstr "Tekst-søk" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "Søkestrøm for «%s»" +msgstr "Søkeresultat for «%1$s» på %2$s" #: actions/noticesearch.php:121 #, php-format @@ -2232,12 +2226,12 @@ msgstr "" #: actions/noticesearchrss.php:96 #, php-format msgid "Updates with \"%s\"" -msgstr "" +msgstr "Oppdateringer med «%s»" #: actions/noticesearchrss.php:98 -#, fuzzy, php-format +#, php-format msgid "Updates matching search term \"%1$s\" on %2$s!" -msgstr "Alle oppdateringer for søket: «%s»" +msgstr "Oppdateringer som samsvarer søkestrengen «%1$s» på %2$s." #: actions/nudge.php:85 msgid "" @@ -2258,7 +2252,7 @@ msgstr "" #: actions/oauthappssettings.php:74 msgid "OAuth applications" -msgstr "" +msgstr "OAuth-program" #: actions/oauthappssettings.php:85 msgid "Applications you have registered" @@ -2275,21 +2269,20 @@ msgstr "" #: actions/oauthconnectionssettings.php:83 msgid "You have allowed the following applications to access you account." -msgstr "" +msgstr "Du har tillatt følgende programmer å få tilgang til den konto." #: actions/oauthconnectionssettings.php:175 -#, fuzzy msgid "You are not a user of that application." -msgstr "Du er allerede logget inn!" +msgstr "Du er ikke bruker av dette programmet." #: actions/oauthconnectionssettings.php:186 msgid "Unable to revoke access for app: " -msgstr "" +msgstr "Kunne ikke tilbakekalle tilgang for programmet: " #: actions/oauthconnectionssettings.php:198 #, php-format msgid "You have not authorized any applications to use your account." -msgstr "" +msgstr "Du har ikke tillatt noen programmer å bruke din konto." #: actions/oauthconnectionssettings.php:211 msgid "Developers can edit the registration settings for their applications " @@ -2312,8 +2305,8 @@ msgstr "innholdstype " msgid "Only " msgstr "Bare " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "" @@ -2448,7 +2441,7 @@ msgstr "Feil gammelt passord" msgid "Error saving user; invalid." msgstr "" -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Klarer ikke å lagre nytt passord." @@ -2935,7 +2928,7 @@ msgstr "" msgid "Recover password" msgstr "" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "" @@ -2955,19 +2948,19 @@ msgstr "Nullstill" msgid "Enter a nickname or email address." msgstr "" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "" -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -2975,23 +2968,23 @@ msgstr "" "Instruksjoner om hvordan du kan gjenopprette ditt passord har blitt sendt " "til din registrerte e-postadresse." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Passordet må bestå av 6 eller flere tegn." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "" -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" @@ -3187,7 +3180,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "Du er allerede logget inn!" -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Gjentatt" @@ -3386,28 +3379,28 @@ msgid "Are you sure you want to reset your consumer key and secret?" msgstr "Er du sikker på at du vil slette denne notisen?" #: actions/showfavorites.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s's favorite notices, page %2$d" -msgstr "%s og venner" +msgstr "%1$s sine favorittnotiser, side %2$d" #: actions/showfavorites.php:132 msgid "Could not retrieve favorite notices." -msgstr "" +msgstr "Kunne ikke hente favorittnotiser." #: actions/showfavorites.php:171 -#, fuzzy, php-format +#, php-format msgid "Feed for favorites of %s (RSS 1.0)" -msgstr "Feed for %s sine venner" +msgstr "Mating for favoritter av %s (RSS 1.0)" #: actions/showfavorites.php:178 -#, fuzzy, php-format +#, php-format msgid "Feed for favorites of %s (RSS 2.0)" -msgstr "Feed for %s sine venner" +msgstr "Mating for favoritter av %s (RSS 2.0)" #: actions/showfavorites.php:185 -#, fuzzy, php-format +#, php-format msgid "Feed for favorites of %s (Atom)" -msgstr "Feed for %s sine venner" +msgstr "Mating for favoritter av %s (Atom)" #: actions/showfavorites.php:206 msgid "" @@ -3437,22 +3430,21 @@ msgstr "" #: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" -msgstr "" +msgstr "%s gruppe" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "Alle abonnementer" +msgstr "%1$s gruppe, side %2$d" #: actions/showgroup.php:226 -#, fuzzy msgid "Group profile" -msgstr "Klarte ikke å lagre profil." +msgstr "Gruppeprofil" #: actions/showgroup.php:271 actions/tagother.php:118 #: actions/userauthorization.php:175 lib/userprofile.php:177 msgid "URL" -msgstr "" +msgstr "Nettadresse" #: actions/showgroup.php:282 actions/tagother.php:128 #: actions/userauthorization.php:187 lib/userprofile.php:194 @@ -3470,17 +3462,17 @@ msgstr "" #: actions/showgroup.php:337 #, php-format msgid "Notice feed for %s group (RSS 1.0)" -msgstr "" +msgstr "Notismating for %s gruppe (RSS 1.0)" #: actions/showgroup.php:343 #, php-format msgid "Notice feed for %s group (RSS 2.0)" -msgstr "" +msgstr "Notismating for %s gruppe (RSS 2.0)" #: actions/showgroup.php:349 #, php-format msgid "Notice feed for %s group (Atom)" -msgstr "" +msgstr "Notismating for %s gruppe (Atom)" #: actions/showgroup.php:354 #, fuzzy, php-format @@ -3488,24 +3480,22 @@ msgid "FOAF for %s group" msgstr "Klarte ikke å lagre profil." #: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 -#, fuzzy msgid "Members" -msgstr "Medlem siden" +msgstr "Medlemmer" #: actions/showgroup.php:395 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" -msgstr "" +msgstr "(Ingen)" #: actions/showgroup.php:401 msgid "All members" -msgstr "" +msgstr "Alle medlemmer" #: actions/showgroup.php:441 -#, fuzzy msgid "Created" -msgstr "Opprett" +msgstr "Opprettet" #: actions/showgroup.php:457 #, php-format @@ -3516,6 +3506,12 @@ msgid "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** er en brukergruppe på %%%%site.name%%%%, en [mikrobloggingstjeneste]" +"(http://no.wikipedia.org/wiki/Mikroblogg) basert på det frie " +"programvareverktøyet [StatusNet](http://status.net/). Dets medlemmer deler " +"korte meldinger om deres liv og interesser. [Bli med nå](%%%%action.register%" +"%%%) for å bli medlem av denne gruppen og mange fler. ([Les mer](%%%%doc.help" +"%%%%))" #: actions/showgroup.php:463 #, php-format @@ -3525,14 +3521,18 @@ msgid "" "[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " msgstr "" +"**%s** er en brukergruppe på %%%%site.name%%%%, en [mikrobloggingstjeneste]" +"(http://no.wikipedia.org/wiki/Mikroblogg) basert på det frie " +"programvareverktøyet [StatusNet](http://status.net/). Dets medlemmer deler " +"korte meldinger om deres liv og interesser. " #: actions/showgroup.php:491 msgid "Admins" -msgstr "" +msgstr "Administratorer" #: actions/showmessage.php:81 msgid "No such message." -msgstr "" +msgstr "Ingen slik melding." #: actions/showmessage.php:98 msgid "Only the sender and recipient may read this message." @@ -3541,16 +3541,16 @@ msgstr "" #: actions/showmessage.php:108 #, php-format msgid "Message to %1$s on %2$s" -msgstr "" +msgstr "Melding til %1$s på %2$s" #: actions/showmessage.php:113 #, php-format msgid "Message from %1$s on %2$s" -msgstr "" +msgstr "Melding fra %1$s på %2$s" #: actions/shownotice.php:90 msgid "Notice deleted." -msgstr "" +msgstr "Notis slettet." #: actions/showstream.php:73 #, fuzzy, php-format @@ -3558,29 +3558,29 @@ msgid " tagged %s" msgstr "Tagger" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s, page %2$d" -msgstr "%s og venner" +msgstr "%1$s, side %2$d" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "Feed for taggen %s" +msgstr "Notismating for %1$s merket %2$s (RSS 1.0)" #: actions/showstream.php:129 #, php-format msgid "Notice feed for %s (RSS 1.0)" -msgstr "" +msgstr "Notismating for %s (RSS 1.0)" #: actions/showstream.php:136 #, php-format msgid "Notice feed for %s (RSS 2.0)" -msgstr "" +msgstr "Notismating for %s (RSS 2.0)" #: actions/showstream.php:143 #, php-format msgid "Notice feed for %s (Atom)" -msgstr "" +msgstr "Notismating for %s (Atom)" #: actions/showstream.php:148 #, fuzzy, php-format @@ -3616,6 +3616,11 @@ msgid "" "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to " "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" +"**%s** har en konto på %%%%site.name%%%%, en [mikrobloggingstjeneste] " +"(http://no.wikipedia.org/wiki/Mikroblogg) basert på det frie " +"programvareverktøyet [StatusNet](http://status.net/). [Bli med nå](%%%%" +"action.register%%%%) for å følge **%s** og mange flere sine notiser. ([Les " +"mer](%%%%doc.help%%%%))" #: actions/showstream.php:248 #, php-format @@ -3624,11 +3629,14 @@ msgid "" "wikipedia.org/wiki/Micro-blogging) service based on the Free Software " "[StatusNet](http://status.net/) tool. " msgstr "" +"**%s** har en konto på %%%%site.name%%%%, en [mikrobloggingstjeneste] " +"(http://no.wikipedia.org/wiki/Mikroblogg) basert på det frie " +"programvareverktøyet [StatusNet](http://status.net/). " #: actions/showstream.php:305 -#, fuzzy, php-format +#, php-format msgid "Repeat of %s" -msgstr "Svar til %s" +msgstr "Repetisjon av %s" #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." @@ -3648,14 +3656,13 @@ msgid "Site name must have non-zero length." msgstr "" #: actions/siteadminpanel.php:141 -#, fuzzy msgid "You must have a valid contact email address." -msgstr "Ugyldig e-postadresse" +msgstr "Du må ha en gyldig e-postadresse." #: actions/siteadminpanel.php:159 #, php-format msgid "Unknown language \"%s\"." -msgstr "" +msgstr "Ukjent språk «%s»." #: actions/siteadminpanel.php:165 msgid "Minimum text limit is 140 characters." @@ -3667,11 +3674,11 @@ msgstr "" #: actions/siteadminpanel.php:221 msgid "General" -msgstr "" +msgstr "Generell" #: actions/siteadminpanel.php:224 msgid "Site name" -msgstr "" +msgstr "Nettstedsnavn" #: actions/siteadminpanel.php:225 msgid "The name of your site, like \"Yourcompany Microblog\"" @@ -3703,16 +3710,15 @@ msgstr "" #: actions/siteadminpanel.php:256 msgid "Default timezone" -msgstr "" +msgstr "Standard tidssone" #: actions/siteadminpanel.php:257 msgid "Default timezone for the site; usually UTC." -msgstr "" +msgstr "Standard tidssone for nettstedet; vanligvis UTC." #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Foretrukket språk" +msgstr "Standardspråk" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" @@ -4106,9 +4112,8 @@ msgid "API method under construction." msgstr "API-metode under utvikling." #: actions/unblock.php:59 -#, fuzzy msgid "You haven't blocked that user." -msgstr "Du er allerede logget inn!" +msgstr "Du har ikke blokkert den brukeren." #: actions/unsandbox.php:72 msgid "User is not sandboxed." @@ -4136,24 +4141,24 @@ msgstr "" #: actions/useradminpanel.php:59 msgctxt "TITLE" msgid "User" -msgstr "" +msgstr "Bruker" #: actions/useradminpanel.php:70 msgid "User settings for this StatusNet site." -msgstr "" +msgstr "Brukerinnstillinger for dette StatusNet-nettstedet." #: actions/useradminpanel.php:149 msgid "Invalid bio limit. Must be numeric." -msgstr "" +msgstr "Ugyldig biografigrense. Må være numerisk." #: actions/useradminpanel.php:155 msgid "Invalid welcome text. Max length is 255 characters." -msgstr "" +msgstr "Ugyldig velkomsttekst. Maks lengde er 255 tegn." #: actions/useradminpanel.php:165 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." -msgstr "" +msgstr "Ugyldig standardabonnement: '%1$s' er ikke bruker." #: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 @@ -4162,48 +4167,43 @@ msgstr "Profil" #: actions/useradminpanel.php:222 msgid "Bio Limit" -msgstr "" +msgstr "Biografigrense" #: actions/useradminpanel.php:223 msgid "Maximum length of a profile bio in characters." -msgstr "" +msgstr "Maks lengde på en profilbiografi i tegn." #: actions/useradminpanel.php:231 -#, fuzzy msgid "New users" -msgstr "slett" +msgstr "Nye brukere" #: actions/useradminpanel.php:235 msgid "New user welcome" -msgstr "" +msgstr "Velkomst av ny bruker" #: actions/useradminpanel.php:236 msgid "Welcome text for new users (Max 255 chars)." -msgstr "" +msgstr "Velkomsttekst for nye brukere (Maks 255 tegn)." #: actions/useradminpanel.php:241 -#, fuzzy msgid "Default subscription" -msgstr "Alle abonnementer" +msgstr "Standardabonnement" #: actions/useradminpanel.php:242 -#, fuzzy msgid "Automatically subscribe new users to this user." -msgstr "" -"Abonner automatisk på de som abonnerer på meg (best for ikke-mennesker)" +msgstr "Legger automatisk til et abonnement på denne brukeren til nye brukere." #: actions/useradminpanel.php:251 -#, fuzzy msgid "Invitations" -msgstr "Bekreftelseskode" +msgstr "Invitasjoner" #: actions/useradminpanel.php:256 msgid "Invitations enabled" -msgstr "" +msgstr "Invitasjoner aktivert" #: actions/useradminpanel.php:258 msgid "Whether to allow users to invite new users." -msgstr "" +msgstr "Hvorvidt brukere tillates å invitere nye brukere." #: actions/userauthorization.php:105 msgid "Authorize subscription" @@ -4218,7 +4218,7 @@ msgstr "" #: actions/userauthorization.php:196 actions/version.php:165 msgid "License" -msgstr "" +msgstr "Lisens" #: actions/userauthorization.php:217 msgid "Accept" @@ -4227,16 +4227,15 @@ msgstr "Godta" #: actions/userauthorization.php:218 lib/subscribeform.php:115 #: lib/subscribeform.php:139 msgid "Subscribe to this user" -msgstr "" +msgstr "Abonner på denne brukeren" #: actions/userauthorization.php:219 msgid "Reject" -msgstr "" +msgstr "Avvis" #: actions/userauthorization.php:220 -#, fuzzy msgid "Reject this subscription" -msgstr "Alle abonnementer" +msgstr "Avvis dette abonnementet" #: actions/userauthorization.php:232 msgid "No authorization request!" @@ -4312,7 +4311,7 @@ msgstr "" #: actions/userdesignsettings.php:282 msgid "Enjoy your hotdog!" -msgstr "" +msgstr "Bon appétit." #: actions/usergroups.php:64 #, fuzzy, php-format @@ -4321,17 +4320,17 @@ msgstr "Alle abonnementer" #: actions/usergroups.php:130 msgid "Search for more groups" -msgstr "" +msgstr "Søk etter flere grupper" #: actions/usergroups.php:157 -#, fuzzy, php-format +#, php-format msgid "%s is not a member of any group." -msgstr "Du er allerede logget inn!" +msgstr "%s er ikke medlem av noen gruppe." #: actions/usergroups.php:162 #, php-format msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." -msgstr "" +msgstr "Prøv å [søke etter grupper](%%action.groupsearch%%) og bli med i dem." #: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66 #: lib/atomusernoticefeed.php:72 @@ -4340,9 +4339,9 @@ msgid "Updates from %1$s on %2$s!" msgstr "Oppdateringar fra %1$s på %2$s!" #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "Statistikk" +msgstr "StatusNet %s" #: actions/version.php:153 #, php-format @@ -4350,10 +4349,12 @@ msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" +"Dette nettstedet drives av %1$s versjon %2$s, Copyright 2008-2010 StatusNet, " +"Inc. og andre bidragsytere." #: actions/version.php:161 msgid "Contributors" -msgstr "" +msgstr "Bidragsytere" #: actions/version.php:168 msgid "" @@ -4380,30 +4381,29 @@ msgstr "" #: actions/version.php:189 msgid "Plugins" -msgstr "" +msgstr "Programtillegg" #: actions/version.php:196 lib/action.php:767 -#, fuzzy msgid "Version" -msgstr "Personlig" +msgstr "Versjon" #: actions/version.php:197 msgid "Author(s)" -msgstr "" +msgstr "Forfatter(e)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4481,10 +4481,10 @@ msgstr "" msgid "Problem saving group inbox." msgstr "" -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" -msgstr "" +msgstr "RT @%1$s %2$s" #: classes/Subscription.php:66 lib/oauthstore.php:465 msgid "You have been banned from subscribing." @@ -4496,7 +4496,7 @@ msgstr "" #: classes/Subscription.php:74 msgid "User has blocked you." -msgstr "" +msgstr "Bruker har blokkert deg." #: classes/Subscription.php:157 #, fuzzy @@ -4513,34 +4513,30 @@ msgstr "Klarte ikke å lagre avatar-informasjonen" msgid "Couldn't delete subscription OMB token." msgstr "Klarte ikke å lagre avatar-informasjonen" -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "" -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" -msgstr "" +msgstr "Velkommen til %1$s, @%2$s." -#: classes/User_group.php:477 -#, fuzzy +#: classes/User_group.php:480 msgid "Could not create group." -msgstr "Klarte ikke å lagre avatar-informasjonen" +msgstr "Kunne ikke opprette gruppe." -#: classes/User_group.php:486 -#, fuzzy +#: classes/User_group.php:489 msgid "Could not set group URI." -msgstr "Klarte ikke å lagre avatar-informasjonen" +msgstr "Kunne ikke stille inn gruppe-URI." -#: classes/User_group.php:507 -#, fuzzy +#: classes/User_group.php:510 msgid "Could not set group membership." -msgstr "Klarte ikke å lagre avatar-informasjonen" +msgstr "Kunne ikke stille inn gruppemedlemskap." -#: classes/User_group.php:521 -#, fuzzy +#: classes/User_group.php:524 msgid "Could not save local group info." -msgstr "Klarte ikke å lagre avatar-informasjonen" +msgstr "Kunne ikke lagre lokal gruppeinformasjon." #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" @@ -4565,20 +4561,20 @@ msgstr "Klarte ikke å lagre profil." #: lib/accountsettingsaction.php:128 msgid "Other" -msgstr "" +msgstr "Andre" #: lib/accountsettingsaction.php:128 msgid "Other options" -msgstr "" +msgstr "Andre valg" #: lib/action.php:144 -#, fuzzy, php-format +#, php-format msgid "%1$s - %2$s" -msgstr "%1$s sin status på %2$s" +msgstr "%1$s - %2$s" #: lib/action.php:159 msgid "Untitled page" -msgstr "" +msgstr "Side uten tittel" #: lib/action.php:424 msgid "Primary site navigation" @@ -4591,7 +4587,6 @@ msgid "Personal profile and friends timeline" msgstr "" #: lib/action.php:433 -#, fuzzy msgctxt "MENU" msgid "Personal" msgstr "Personlig" @@ -4605,10 +4600,9 @@ msgstr "Endre passordet ditt" #. TRANS: Tooltip for main menu option "Services" #: lib/action.php:440 -#, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" -msgstr "Koble til" +msgstr "Koble til tjenester" #: lib/action.php:443 msgid "Connect" @@ -4618,10 +4612,9 @@ msgstr "Koble til" #: lib/action.php:446 msgctxt "TOOLTIP" msgid "Change site configuration" -msgstr "" +msgstr "Endre nettstedskonfigurasjon" #: lib/action.php:449 -#, fuzzy msgctxt "MENU" msgid "Admin" msgstr "Administrator" @@ -4747,7 +4740,7 @@ msgstr "" msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4756,12 +4749,12 @@ msgstr "" "**%%site.name%%** er en mikrobloggingtjeneste av [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** er en mikrobloggingtjeneste. " -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4769,41 +4762,41 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "Alle " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "lisens." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "Etter" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Før" @@ -4832,12 +4825,12 @@ msgstr "" #. TRANS: Client error message #: lib/adminpanelaction.php:229 msgid "showForm() not implemented." -msgstr "" +msgstr "showForm() ikke implementert." #. TRANS: Client error message #: lib/adminpanelaction.php:259 msgid "saveSettings() not implemented." -msgstr "" +msgstr "saveSettings() ikke implementert." #. TRANS: Client error message #: lib/adminpanelaction.php:283 @@ -4851,10 +4844,9 @@ msgstr "" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:350 -#, fuzzy msgctxt "MENU" msgid "Site" -msgstr "Nettstedslogo" +msgstr "Nettsted" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:356 @@ -4871,22 +4863,22 @@ msgstr "Personlig" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:364 msgid "User configuration" -msgstr "" +msgstr "Brukerkonfigurasjon" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115 msgid "User" -msgstr "" +msgstr "Bruker" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:372 msgid "Access configuration" -msgstr "" +msgstr "Tilgangskonfigurasjon" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:380 msgid "Paths configuration" -msgstr "" +msgstr "Stikonfigurasjon" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:388 @@ -4908,38 +4900,35 @@ msgstr "" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" #: lib/applicationeditform.php:136 msgid "Edit application" -msgstr "" +msgstr "Rediger program" #: lib/applicationeditform.php:184 msgid "Icon for this application" -msgstr "" +msgstr "Ikon for dette programmet" #: lib/applicationeditform.php:204 -#, fuzzy, php-format +#, php-format msgid "Describe your application in %d characters" -msgstr "Beskriv degselv og dine interesser med 140 tegn" +msgstr "Beskriv programmet ditt med %d tegn" #: lib/applicationeditform.php:207 -#, fuzzy msgid "Describe your application" -msgstr "Beskriv degselv og dine interesser med 140 tegn" +msgstr "Beskriv programmet ditt" #: lib/applicationeditform.php:216 -#, fuzzy msgid "Source URL" -msgstr "Kilde" +msgstr "Nettadresse til kilde" #: lib/applicationeditform.php:218 -#, fuzzy msgid "URL of the homepage of this application" -msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside." +msgstr "Nettadresse til hjemmesiden for dette programmet" #: lib/applicationeditform.php:224 msgid "Organization responsible for this application" @@ -4956,298 +4945,306 @@ msgstr "" #: lib/applicationeditform.php:258 msgid "Browser" -msgstr "" +msgstr "Nettleser" #: lib/applicationeditform.php:274 msgid "Desktop" -msgstr "" +msgstr "Skrivebord" #: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" -msgstr "" +msgstr "Type program, nettleser eller skrivebord" #: lib/applicationeditform.php:297 msgid "Read-only" -msgstr "" +msgstr "Skrivebeskyttet" #: lib/applicationeditform.php:315 msgid "Read-write" -msgstr "" +msgstr "Les og skriv" #: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" msgstr "" +"Standardtilgang for dette programmet: skrivebeskyttet eller lese- og " +"skrivetilgang" #: lib/applicationlist.php:154 -#, fuzzy msgid "Revoke" -msgstr "Fjern" +msgstr "Tilbakekall" #: lib/attachmentlist.php:87 msgid "Attachments" -msgstr "" +msgstr "Vedlegg" #: lib/attachmentlist.php:265 msgid "Author" -msgstr "" +msgstr "Forfatter" #: lib/attachmentlist.php:278 -#, fuzzy msgid "Provider" -msgstr "Profil" +msgstr "Leverandør" #: lib/attachmentnoticesection.php:67 msgid "Notices where this attachment appears" -msgstr "" +msgstr "Notiser hvor dette vedlegget forekommer" #: lib/attachmenttagcloudsection.php:48 msgid "Tags for this attachment" msgstr "" #: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225 -#, fuzzy msgid "Password changing failed" -msgstr "Passordet ble lagret" +msgstr "Endring av passord mislyktes" #: lib/authenticationplugin.php:235 -#, fuzzy msgid "Password changing is not allowed" -msgstr "Passordet ble lagret" +msgstr "Endring av passord er ikke tillatt" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "" +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Notis med den id'en finnes ikke" -#: lib/command.php:88 -#, fuzzy, php-format +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "Bruker har ingen siste notis" + +#: lib/command.php:125 +#, php-format msgid "Could not find a user with nickname %s" -msgstr "Klarte ikke å oppdatere bruker med bekreftet e-post." +msgstr "Fant ingen bruker med kallenavn %s" -#: lib/command.php:92 -msgid "It does not make a lot of sense to nudge yourself!" +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Fant ingen bruker med kallenavn %s" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." msgstr "" -#: lib/command.php:99 +#: lib/command.php:221 +msgid "It does not make a lot of sense to nudge yourself!" +msgstr "Det gir ikke så mye mening å knuffe seg selv." + +#: lib/command.php:228 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Svar til %s" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" "Subscribers: %2$s\n" "Notices: %3$s" msgstr "" +"Abonnement: %1$s\n" +"Abonnenter: %2$s\n" +"Notiser: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -#, fuzzy -msgid "User has no last notice" -msgstr "Brukeren har ingen profil." - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." -msgstr "" +msgstr "Notis markert som favoritt." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "Du er allerede medlem av den gruppen." -#: lib/command.php:231 +#: lib/command.php:331 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "Klarte ikke å oppdatere bruker." -#: lib/command.php:236 +#: lib/command.php:336 #, fuzzy, php-format msgid "%s joined group %s" msgstr "%1$s sin status på %2$s" -#: lib/command.php:275 +#: lib/command.php:373 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "Klarte ikke å oppdatere bruker." -#: lib/command.php:280 -#, fuzzy, php-format +#: lib/command.php:378 +#, php-format msgid "%s left group %s" -msgstr "%1$s sin status på %2$s" +msgstr "%s forlot gruppen %s" -#: lib/command.php:309 -#, fuzzy, php-format +#: lib/command.php:401 +#, php-format msgid "Fullname: %s" -msgstr "Fullt navn" +msgstr "Fullt navn: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" -msgstr "" +msgstr "Posisjon: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" -msgstr "" +msgstr "Hjemmeside: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" +msgstr "Om: %s" + +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." msgstr "" -#: lib/command.php:349 +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "" +msgstr "Melding for lang - maks er %d tegn, du sendte %d" -#: lib/command.php:367 -#, fuzzy, php-format +#: lib/command.php:468 +#, php-format msgid "Direct message to %s sent" -msgstr "Direktemeldinger til %s" +msgstr "Direktemelding til %s sendt" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." -msgstr "" +msgstr "Feil ved sending av direktemelding." -#: lib/command.php:413 -#, fuzzy +#: lib/command.php:490 msgid "Cannot repeat your own notice" -msgstr "Kan ikke slette notisen." +msgstr "Kan ikke repetere din egen notis" -#: lib/command.php:418 -#, fuzzy +#: lib/command.php:495 msgid "Already repeated that notice" -msgstr "Kan ikke slette notisen." +msgstr "Allerede repetert den notisen" -#: lib/command.php:426 -#, fuzzy, php-format +#: lib/command.php:503 +#, php-format msgid "Notice from %s repeated" -msgstr "Nytt nick" +msgstr "Notis fra %s repetert" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." -msgstr "" +msgstr "Feil ved repetering av notis." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "" +msgstr "Notis for lang - maks er %d tegn, du sendte %d" -#: lib/command.php:491 -#, fuzzy, php-format +#: lib/command.php:545 +#, php-format msgid "Reply to %s sent" -msgstr "Svar til %s" +msgstr "Svar til %s sendt" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." -msgstr "" +msgstr "Feil ved lagring av notis." -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 -#, fuzzy -msgid "No such user" -msgstr "Ingen slik bruker" +#: lib/command.php:602 +msgid "Can't subscribe to OMB profiles by command." +msgstr "" -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Svar til %s" -#: lib/command.php:709 +#: lib/command.php:752 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Ikke autorisert." -#: lib/command.php:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 #, fuzzy msgid "No one is subscribed to you." msgstr "Svar til %s" -#: lib/command.php:733 +#: lib/command.php:776 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:753 +#: lib/command.php:796 #, fuzzy msgid "You are not a member of any groups." msgstr "Du er allerede logget inn!" -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5482,49 +5479,49 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "Denne siden er ikke tilgjengelig i en mediatype du aksepterer" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Bildefilformatet støttes ikke." + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Filen er for stor. Maks filstørrelse er %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Delvis opplasting." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Systemfeil ved opplasting av fil." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Ikke et bilde eller en korrupt fil." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Bildefilformatet støttes ikke." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Mistet filen vår." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Ukjent filtype" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "Ukjent innbokskilde %d." @@ -5804,7 +5801,7 @@ msgstr "" "engasjere andre brukere i en samtale. Personer kan sende deg meldinger som " "bare du kan se." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "fra" @@ -5956,23 +5953,23 @@ msgstr "V" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "Repetert av" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Svar på denne notisen" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Svar" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "Notis repetert" @@ -6288,47 +6285,47 @@ msgctxt "role" msgid "Moderator" msgstr "Moderator" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "noen få sekunder siden" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "omtrent ett minutt siden" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "omtrent %d minutter siden" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "omtrent én time siden" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "omtrent %d timer siden" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "omtrent én dag siden" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "omtrent %d dager siden" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "omtrent én måned siden" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "omtrent %d måneder siden" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "omtrent ett år siden" @@ -6342,7 +6339,7 @@ msgstr "%s er ikke en gyldig farge." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s er ikke en gyldig farge. Bruk 3 eller 6 heksadesimale tegn." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d." diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index c73771f84..09e782be1 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:33+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:43:46+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -94,7 +94,7 @@ msgstr "Deze pagina bestaat niet" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -103,10 +103,8 @@ msgstr "Deze pagina bestaat niet" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Onbekende gebruiker." @@ -208,12 +206,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:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "De API-functie is niet aangetroffen." @@ -346,7 +344,7 @@ msgstr "Er is geen status gevonden met dit ID." msgid "This status is already a favorite." msgstr "Deze mededeling staat al in uw favorietenlijst." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Het was niet mogelijk een favoriet aan te maken." @@ -469,7 +467,7 @@ msgstr "De groep is niet aangetroffen!" msgid "You are already a member of that group." msgstr "U bent al lid van die groep." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden van die groep." @@ -519,7 +517,7 @@ msgstr "Ongeldig token." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -667,12 +665,12 @@ msgstr "" msgid "Unsupported format." msgstr "Niet-ondersteund bestandsformaat." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favorieten van %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, 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" @@ -682,7 +680,7 @@ msgstr "%1$s updates op de favorietenlijst geplaatst door %2$s / %3$s" msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Updates over %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format 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." @@ -692,7 +690,7 @@ msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s." msgid "%s public timeline" msgstr "%s publieke tijdlijn" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s updates van iedereen" @@ -707,12 +705,12 @@ msgstr "Herhaald naar %s" msgid "Repeats of %s" msgstr "Herhaald van %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Mededelingen met het label %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Updates met het label %1$s op %2$s!" @@ -773,7 +771,7 @@ msgid "Preview" msgstr "Voorvertoning" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Verwijderen" @@ -857,8 +855,8 @@ msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "De opgegeven groep bestaat niet." @@ -959,7 +957,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:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "Er is een probleem met uw sessietoken." @@ -1020,7 +1018,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:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Deze mededeling verwijderen" @@ -1274,7 +1272,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:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Het was niet mogelijk de aliassen aan te maken." @@ -1987,7 +1985,7 @@ msgstr "Nieuwe gebruikers uitnodigen" msgid "You are already subscribed to these users:" msgstr "U bent als geabonneerd op deze gebruikers:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2120,7 +2118,7 @@ msgstr "%1$s is lid geworden van de groep %2$s" msgid "You must be logged in to leave a group." msgstr "U moet aangemeld zijn om een groep te kunnen verlaten." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "U bent geen lid van deze groep" @@ -2235,12 +2233,12 @@ msgstr "Gebruik dit formulier om een nieuwe groep aan te maken." msgid "New message" msgstr "Nieuw bericht" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "U kunt geen bericht naar deze gebruiker zenden." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Geen inhoud!" @@ -2248,7 +2246,7 @@ msgstr "Geen inhoud!" msgid "No recipient specified." msgstr "Er is geen ontvanger aangegeven." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd." @@ -2262,7 +2260,7 @@ msgstr "Bericht verzonden." msgid "Direct message to %s sent." msgstr "Het directe bericht aan %s is verzonden." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Er is een Ajax-fout opgetreden" @@ -2401,8 +2399,8 @@ msgstr "inhoudstype " msgid "Only " msgstr "Alleen " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Geen ondersteund gegevensformaat." @@ -2533,7 +2531,7 @@ msgstr "Het oude wachtwoord is onjuist" msgid "Error saving user; invalid." msgstr "Fout bij opslaan gebruiker; ongeldig." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan." @@ -3042,7 +3040,7 @@ msgstr "Wachtwoord herstellen" msgid "Recover password" msgstr "Wachtwoord herstellen" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Wachtwoordherstel aangevraagd" @@ -3062,21 +3060,21 @@ msgstr "Herstellen" msgid "Enter a nickname or email address." msgstr "Voer een gebruikersnaam of e-mailadres in." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" "Er bestaat geen gebruiker met het opgegeven e-mailadres of de opgegeven " "gebruikersnaam." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Die gebruiker heeft geen e-mailadres geregistreerd." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Er is een fout opgetreden bij het opslaan van de adresbevestiging." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3084,23 +3082,23 @@ msgstr "" "De instructies om uw wachtwoord te herstellen zijn verstuurd naar het e-" "mailadres dat voor uw gebruiker is geregistreerd." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Het wachtwoord is onverwacht opnieuw ingesteld." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Het wachtwoord moet uit zes of meer tekens bestaan." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Het wachtwoord en de bevestiging komen niet overeen." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Het nieuwe wachtwoord is opgeslagen. U bent nu aangemeld." @@ -3302,7 +3300,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:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Herhaald" @@ -4568,7 +4566,7 @@ msgstr "Versie" msgid "Author(s)" msgstr "Auteur(s)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4577,13 +4575,13 @@ msgstr "" "Bestanden mogen niet groter zijn dan %d bytes, en uw bestand was %d bytes. " "Probeer een kleinere versie te uploaden." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Een bestand van deze grootte overschijdt uw gebruikersquota van %d bytes." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4669,7 +4667,7 @@ msgstr "" "Er is een probleem opgetreden bij het opslaan van het Postvak IN van de " "groep." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4699,28 +4697,28 @@ msgid "Couldn't delete subscription OMB token." msgstr "" "Het was niet mogelijk om het OMB-token voor het abonnement te verwijderen." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Kon abonnement niet verwijderen." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Welkom bij %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Het was niet mogelijk de groep aan te maken." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "Het was niet mogelijk de groeps-URI in te stellen." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Het was niet mogelijk het groepslidmaatschap in te stellen." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "Het was niet mogelijk de lokale groepsinformatie op te slaan." @@ -4924,7 +4922,7 @@ msgstr "Widget" msgid "StatusNet software license" msgstr "Licentie van de StatusNet-software" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4933,12 +4931,12 @@ msgstr "" "**%%site.name%%** is een microblogdienst van [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** is een microblogdienst. " -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4949,45 +4947,45 @@ msgstr "" "versie %s, beschikbaar onder de [GNU Affero General Public License](http://" "www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "Licentie voor siteinhoud" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "Inhoud en gegevens van %1$s zijn persoonlijk en vertrouwelijk." -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" "Auteursrechten op inhoud en gegevens rusten bij %1$s. Alle rechten " "voorbehouden." -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "Auteursrechten op inhoud en gegevens rusten bij de respectievelijke " "gebruikers. Alle rechten voorbehouden." -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "Alle " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "licentie." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Paginering" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "Later" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Eerder" @@ -5091,7 +5089,7 @@ msgstr "" "Het API-programma heeft lezen-en-schrijventoegang nodig, maar u hebt alleen " "maar leestoegang." -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5191,37 +5189,50 @@ msgstr "Wachtwoord wijzigen is mislukt" msgid "Password changing is not allowed" msgstr "Wachtwoord wijzigen is niet toegestaan" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Commandoresultaten" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Het commando is uitgevoerd" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Het uitvoeren van het commando is mislukt" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Dit commando is nog niet geïmplementeerd." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Er bestaat geen mededeling met dat ID" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "Deze gebruiker heeft geen laatste mededeling" + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "De gebruiker %s is niet aangetroffen" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "De gebruiker %s is niet aangetroffen" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Dit commando is nog niet geïmplementeerd." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Het heeft niet zoveel zin om uzelf te porren..." -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "De por naar %s is verzonden" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5232,202 +5243,201 @@ msgstr "" "Abonnees: %2$s\n" "Mededelingen: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Er bestaat geen mededeling met dat ID" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Deze gebruiker heeft geen laatste mededeling" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "De mededeling is op de favorietenlijst geplaatst." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "U bent al lid van deze groep" -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "Het was niet mogelijk om de gebruiker %s toe te voegen aan de groep %s" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s is lid geworden van de groep %s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "De gebruiker %s kon niet uit de groep %s verwijderd worden" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s heeft de groep %s verlaten" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Volledige naam: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Locatie: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Thuispagina: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "Over: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" "Het bericht te is lang. De maximale lengte is %d tekens. De lengte van uw " "bericht was %d" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Het directe bericht aan %s is verzonden" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Er is een fout opgetreden bij het verzonden van het directe bericht." -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "U kunt uw eigen mededelingen niet herhalen." -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "U hebt die mededeling al herhaald." -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "De mededeling van %s is herhaald" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "Er is een fout opgetreden bij het herhalen van de mededeling." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "De mededeling is te lang. De maximale lengte is %d tekens. Uw mededeling " "bevatte %d tekens" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "Het antwoord aan %s is verzonden" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "Er is een fout opgetreden bij het opslaan van de mededeling." -#: lib/command.php:547 +#: lib/command.php:594 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:589 -msgid "No such user" -msgstr "De opgegeven gebruiker bestaat niet" +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "U bent niet geabonneerd op dat profiel." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Geabonneerd op %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 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:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Uw abonnement op %s is opgezegd" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Dit commando is nog niet geïmplementeerd." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Notificaties uitgeschakeld." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "Het is niet mogelijk de mededelingen uit te schakelen." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Notificaties ingeschakeld." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "Het is niet mogelijk de notificatie uit te schakelen." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "Het aanmeldcommando is uitgeschakeld" -#: lib/command.php:665 +#: lib/command.php:708 #, 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:692 +#: lib/command.php:735 #, php-format msgid "Unsubscribed %s" msgstr "Het abonnement van %s is opgeheven" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "U bent op geen enkele gebruiker geabonneerd." -#: lib/command.php:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "Niemand heeft een abonnenment op u." -#: lib/command.php:733 +#: lib/command.php:776 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:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "U bent lid van geen enkele groep." -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5700,49 +5710,49 @@ msgstr "Labels in de groepsmededelingen van %s" msgid "This page is not available in a media type you accept" msgstr "Deze pagina is niet beschikbaar in een mediatype dat u accepteert" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Niet ondersteund beeldbestandsformaat." + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Dat bestand is te groot. De maximale bestandsgrootte is %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Gedeeltelijke upload." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Er is een systeemfout opgetreden tijdens het uploaden van het bestand." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Het bestand is geen afbeelding of het bestand is beschadigd." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Niet ondersteund beeldbestandsformaat." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Het bestand is zoekgeraakt." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Onbekend bestandstype" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "Onbekende bron Postvak IN %d." @@ -6024,7 +6034,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:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "van" @@ -6182,23 +6192,23 @@ msgstr "W" msgid "at" msgstr "op" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "in context" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "Herhaald door" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Op deze mededeling antwoorden" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Antwoorden" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "Mededeling herhaald" @@ -6509,47 +6519,47 @@ msgctxt "role" msgid "Moderator" msgstr "Moderator" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "een paar seconden geleden" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "ongeveer een minuut geleden" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "ongeveer %d minuten geleden" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "ongeveer een uur geleden" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "ongeveer %d uur geleden" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "ongeveer een dag geleden" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "ongeveer %d dagen geleden" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "ongeveer een maand geleden" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "ongeveer %d maanden geleden" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "ongeveer een jaar geleden" @@ -6563,7 +6573,7 @@ msgstr "%s is geen geldige kleur." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s is geen geldige kleur. Gebruik drie of zes hexadecimale tekens." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index a16e15649..900e9fa19 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:30+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:43:43+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -100,7 +100,7 @@ msgstr "Dette emneord finst ikkje." #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -109,10 +109,8 @@ msgstr "Dette emneord finst ikkje." #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Brukaren finst ikkje." @@ -206,12 +204,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:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Fann ikkje API-metode." @@ -345,7 +343,7 @@ msgstr "Fann ingen status med den ID-en." msgid "This status is already a favorite." msgstr "Denne notisen er alt ein favoritt!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Kunne ikkje lagre favoritt." @@ -469,7 +467,7 @@ msgstr "Fann ikkje API-metode." msgid "You are already a member of that group." msgstr "Du er allereie medlem av den gruppa" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "" @@ -521,7 +519,7 @@ msgstr "Ugyldig storleik." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -664,12 +662,12 @@ msgstr "" msgid "Unsupported format." msgstr "Støttar ikkje bileteformatet." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s / Favorittar frå %s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s oppdateringar favorisert av %s / %s." @@ -679,7 +677,7 @@ msgstr "%s oppdateringar favorisert av %s / %s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Oppdateringar som svarar til %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format 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." @@ -689,7 +687,7 @@ msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s." msgid "%s public timeline" msgstr "%s offentleg tidsline" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s oppdateringar frå alle saman!" @@ -704,12 +702,12 @@ msgstr "Svar til %s" msgid "Repeats of %s" msgstr "Svar til %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notisar merka med %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Oppdateringar frå %1$s på %2$s!" @@ -770,7 +768,7 @@ msgid "Preview" msgstr "Forhandsvis" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Slett" @@ -853,8 +851,8 @@ msgstr "Lagring av informasjon feila." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "Denne gruppa finst ikkje." @@ -963,7 +961,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:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "Det var eit problem med sesjons billetten din." @@ -1026,7 +1024,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:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Slett denne notisen" @@ -1301,7 +1299,7 @@ msgstr "skildringa er for lang (maks 140 teikn)." msgid "Could not update group." msgstr "Kann ikkje oppdatera gruppa." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "Kunne ikkje lagre favoritt." @@ -2014,7 +2012,7 @@ msgstr "Invitér nye brukarar" msgid "You are already subscribed to these users:" msgstr "Du tingar allereie oppdatering frå desse brukarane:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2142,7 +2140,7 @@ msgstr "%s blei medlem av gruppe %s" msgid "You must be logged in to leave a group." msgstr "Du må være innlogga for å melde deg ut av ei gruppe." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "Du er ikkje medlem av den gruppa." @@ -2261,12 +2259,12 @@ msgstr "Bruk dette skjemaet for å lage ein ny gruppe." msgid "New message" msgstr "Ny melding" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Du kan ikkje sende melding til denne brukaren." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Ingen innhald." @@ -2274,7 +2272,7 @@ msgstr "Ingen innhald." msgid "No recipient specified." msgstr "Ingen mottakar spesifisert." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2291,7 +2289,7 @@ msgstr "Melding" msgid "Direct message to %s sent." msgstr "Direkte melding til %s sendt" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax feil" @@ -2423,8 +2421,8 @@ msgstr "Kopla til" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Ikkje eit støtta dataformat." @@ -2562,7 +2560,7 @@ msgstr "Det gamle passordet stemmer ikkje" msgid "Error saving user; invalid." msgstr "Feil ved lagring av brukar; fungerer ikkje." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Klarar ikkje lagra nytt passord." @@ -3066,7 +3064,7 @@ msgstr "Tilbakestill passord" msgid "Recover password" msgstr "Hent fram passord" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Passord opphenting etterspurt" @@ -3086,19 +3084,19 @@ msgstr "Avbryt" msgid "Enter a nickname or email address." msgstr "Skriv inn kallenamn eller epostadresse." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Ingen brukar med den epostadressa eller det brukarnamnet." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Ingen registrert epostadresse for den brukaren." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Feil med lagring av adressestadfesting." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3106,23 +3104,23 @@ msgstr "" "Instruksjonar for å få att passordet ditt er send til epostadressa som er " "lagra i kontoen din." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Uventa passordnullstilling." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Passord må vera 6 tekn eller meir." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Passord og stadfesting stemmer ikkje." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Feil ved å setja brukar." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Lagra det nye passordet. Du er logga inn." @@ -3331,7 +3329,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:674 +#: actions/repeat.php:114 lib/noticelist.php:676 #, fuzzy msgid "Repeated" msgstr "Lag" @@ -4570,19 +4568,19 @@ msgstr "Personleg" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4666,7 +4664,7 @@ msgstr "Eit problem oppstod ved lagring av notis." msgid "Problem saving group inbox." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4699,29 +4697,29 @@ msgstr "Kan ikkje sletta tinging." msgid "Couldn't delete subscription OMB token." msgstr "Kan ikkje sletta tinging." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Kan ikkje sletta tinging." -#: classes/User.php:373 +#: classes/User.php:378 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Melding til %1$s på %2$s" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Kunne ikkje laga gruppa." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Kunne ikkje bli med i gruppa." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Kunne ikkje bli med i gruppa." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Kunne ikkje lagra abonnement." @@ -4945,7 +4943,7 @@ msgstr "Dult" msgid "StatusNet software license" msgstr "StatusNets programvarelisens" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4954,12 +4952,12 @@ msgstr "" "**%%site.name%%** er ei mikrobloggingteneste av [%%site.broughtby%%](%%site." "broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** er ei mikrobloggingteneste. " -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4970,42 +4968,42 @@ msgstr "" "%s, tilgjengeleg under [GNU Affero General Public License](http://www.fsf." "org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 #, fuzzy msgid "Site content license" msgstr "StatusNets programvarelisens" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "Alle" -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "lisens." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Paginering" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "« Etter" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Før »" @@ -5122,7 +5120,7 @@ msgstr "SMS bekreftelse" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5228,37 +5226,51 @@ msgstr "Endra passord" msgid "Password changing is not allowed" msgstr "Endra passord" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Resultat frå kommandoen" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Kommandoen utførd" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Kommandoen feila" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Orsak, men kommandoen er ikkje laga enno." +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "Fann ingen profil med den IDen." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "Brukaren har ikkje siste notis" + +#: lib/command.php:125 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse." -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse." + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Orsak, men kommandoen er ikkje laga enno." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Dytta!" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5266,203 +5278,201 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "Fann ingen profil med den IDen." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Brukaren har ikkje siste notis" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Notis markert som favoritt." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "Du er allereie medlem av den gruppa" -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s blei medlem av gruppe %s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "Kunne ikkje fjerne %s fra %s gruppa " -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s forlot %s gruppa" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Fullt namn: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Stad: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Heimeside: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "Om: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Direkte melding til %s sendt" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Ein feil oppstod ved sending av direkte melding." -#: lib/command.php:413 +#: lib/command.php:490 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Kan ikkje slå på notifikasjon." -#: lib/command.php:418 +#: lib/command.php:495 #, fuzzy msgid "Already repeated that notice" msgstr "Slett denne notisen" -#: lib/command.php:426 +#: lib/command.php:503 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Melding lagra" -#: lib/command.php:428 +#: lib/command.php:505 #, fuzzy msgid "Error repeating notice." msgstr "Eit problem oppstod ved lagring av notis." -#: lib/command.php:482 +#: lib/command.php:536 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" -#: lib/command.php:491 +#: lib/command.php:545 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Svar på denne notisen" -#: lib/command.php:493 +#: lib/command.php:547 #, fuzzy msgid "Error saving notice." msgstr "Eit problem oppstod ved lagring av notis." -#: lib/command.php:547 +#: lib/command.php:594 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:589 -msgid "No such user" -msgstr "Brukaren finst ikkje." +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Du tingar ikkje oppdateringar til den profilen." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Tingar %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "Spesifer namnet til brukar du vil fjerne tinging på" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Tingar ikkje %s lengre" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Kommando ikkje implementert." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Notifikasjon av." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "Kan ikkje skru av notifikasjon." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Notifikasjon på." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "Kan ikkje slå på notifikasjon." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Tingar ikkje %s lengre" -#: lib/command.php:709 +#: lib/command.php:752 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Du tingar ikkje oppdateringar til den profilen." -#: lib/command.php:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 #, fuzzy msgid "No one is subscribed to you." msgstr "Kan ikkje tinga andre til deg." -#: lib/command.php:733 +#: lib/command.php:776 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:753 +#: lib/command.php:796 #, fuzzy msgid "You are not a member of any groups." msgstr "Du er ikkje medlem av den gruppa." -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5698,49 +5708,49 @@ msgstr "Merkelappar i %s gruppa sine notisar" msgid "This page is not available in a media type you accept" msgstr "Denne sida er ikkje tilgjengeleg i nokon mediatype du aksepterer." -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Støttar ikkje bileteformatet." + +#: lib/imagefile.php:90 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Du kan lasta opp ein logo for gruppa." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Hallvegs opplasta." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Systemfeil ved opplasting av fil." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Korrupt bilete." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Støttar ikkje bileteformatet." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Mista fila vår." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Ukjend fil type" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5950,7 +5960,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 #, fuzzy msgid "from" msgstr " frå " @@ -6106,25 +6116,25 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 #, fuzzy msgid "in context" msgstr "Ingen innhald." -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 #, fuzzy msgid "Repeated by" msgstr "Lag" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Svar på denne notisen" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Svar" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 #, fuzzy msgid "Notice repeated" msgstr "Melding lagra" @@ -6453,47 +6463,47 @@ msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "eit par sekund sidan" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "omtrent eitt minutt sidan" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "~%d minutt sidan" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "omtrent ein time sidan" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "~%d timar sidan" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "omtrent ein dag sidan" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "~%d dagar sidan" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "omtrent ein månad sidan" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "~%d månadar sidan" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "omtrent eitt år sidan" @@ -6507,7 +6517,7 @@ msgstr "Heimesida er ikkje ei gyldig internettadresse." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 3a0bd39c3..d7120fab9 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:36+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:43:49+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \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.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -97,7 +97,7 @@ msgstr "Nie ma takiej strony" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -106,10 +106,8 @@ msgstr "Nie ma takiej strony" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Brak takiego użytkownika." @@ -211,12 +209,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:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "Nie odnaleziono metody API." @@ -348,7 +346,7 @@ msgstr "Nie odnaleziono stanów z tym identyfikatorem." msgid "This status is already a favorite." msgstr "Ten stan jest już ulubiony." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Nie można utworzyć ulubionego wpisu." @@ -466,7 +464,7 @@ msgstr "Nie odnaleziono grupy." msgid "You are already a member of that group." msgstr "Jesteś już członkiem tej grupy." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "Zostałeś zablokowany w tej grupie przez administratora." @@ -516,7 +514,7 @@ msgstr "Nieprawidłowy token." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -655,12 +653,12 @@ msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika msgid "Unsupported format." msgstr "Nieobsługiwany format." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s/ulubione wpisy od %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, 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." @@ -670,7 +668,7 @@ msgstr "Użytkownik %1$s aktualizuje ulubione według %2$s/%2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s/aktualizacje wspominające %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format 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." @@ -680,7 +678,7 @@ msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s." msgid "%s public timeline" msgstr "Publiczna oś czasu użytkownika %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Użytkownik %s aktualizuje od każdego." @@ -695,12 +693,12 @@ msgstr "Powtórzone dla %s" msgid "Repeats of %s" msgstr "Powtórzenia %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Wpisy ze znacznikiem %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Aktualizacje ze znacznikiem %1$s na %2$s." @@ -760,7 +758,7 @@ msgid "Preview" msgstr "Podgląd" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Usuń" @@ -843,8 +841,8 @@ msgstr "Zapisanie informacji o blokadzie nie powiodło się." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "Nie ma takiej grupy." @@ -945,7 +943,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:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "Wystąpił problem z tokenem sesji." @@ -1005,7 +1003,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:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Usuń ten wpis" @@ -1256,7 +1254,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:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Nie można utworzyć aliasów." @@ -1955,7 +1953,7 @@ msgstr "Zaproś nowych użytkowników" msgid "You are already subscribed to these users:" msgstr "Jesteś już subskrybowany do tych użytkowników:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2086,7 +2084,7 @@ msgstr "Użytkownik %1$s dołączył do grupy %2$s" msgid "You must be logged in to leave a group." msgstr "Musisz być zalogowany, aby opuścić grupę." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "Nie jesteś członkiem tej grupy." @@ -2201,12 +2199,12 @@ msgstr "Użyj tego formularza, aby utworzyć nową grupę." msgid "New message" msgstr "Nowa wiadomość" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Nie można wysłać wiadomości do tego użytkownika." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Brak treści." @@ -2214,7 +2212,7 @@ msgstr "Brak treści." msgid "No recipient specified." msgstr "Nie podano odbiorcy." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu." @@ -2228,7 +2226,7 @@ msgstr "Wysłano wiadomość" msgid "Direct message to %s sent." msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Błąd AJAX" @@ -2361,8 +2359,8 @@ msgstr "typ zawartości " msgid "Only " msgstr "Tylko " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "To nie jest obsługiwany format danych." @@ -2493,7 +2491,7 @@ msgstr "Niepoprawne poprzednie hasło" msgid "Error saving user; invalid." msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Nie można zapisać nowego hasła." @@ -2995,7 +2993,7 @@ msgstr "Przywróć hasło" msgid "Recover password" msgstr "Przywróć hasło" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Zażądano przywracania hasła" @@ -3015,19 +3013,19 @@ msgstr "Przywróć" msgid "Enter a nickname or email address." msgstr "Podaj pseudonim lub adres e-mail." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Brak użytkownika z tym adresem e-mail lub nazwą użytkownika." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Brak zarejestrowanych adresów e-mail dla tego użytkownika." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Błąd podczas zapisywania potwierdzenia adresu." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3035,23 +3033,23 @@ msgstr "" "Instrukcje przywracania hasła zostały wysłane na adres e-mail zarejestrowany " "z twoim kontem." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Nieoczekiwane przywrócenie hasła." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Hasło musi mieć sześć lub więcej znaków." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Hasło i potwierdzenie nie pasują do siebie." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Błąd podczas ustawiania użytkownika." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany." @@ -3254,7 +3252,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:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Powtórzono" @@ -4507,7 +4505,7 @@ msgstr "Wersja" msgid "Author(s)" msgstr "Autorzy" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4516,13 +4514,13 @@ msgstr "" "Żaden plik nie może być większy niż %d bajty, a wysłany plik miał %d bajty. " "Spróbuj wysłać mniejszą wersję." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Plik tej wielkości przekroczyłby przydział użytkownika wynoszący %d bajty." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4602,7 +4600,7 @@ msgstr "Problem podczas zapisywania wpisu." msgid "Problem saving group inbox." msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4631,28 +4629,28 @@ msgstr "Nie można usunąć autosubskrypcji." msgid "Couldn't delete subscription OMB token." msgstr "Nie można usunąć tokenu subskrypcji OMB." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Nie można usunąć subskrypcji." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Witaj w %1$s, @%2$s." -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Nie można utworzyć grupy." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "Nie można ustawić adresu URI grupy." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Nie można ustawić członkostwa w grupie." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "Nie można zapisać informacji o lokalnej grupie." @@ -4856,7 +4854,7 @@ msgstr "Odznaka" msgid "StatusNet software license" msgstr "Licencja oprogramowania StatusNet" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4865,12 +4863,12 @@ msgstr "" "**%%site.name%%** jest usługą mikroblogowania prowadzoną przez [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** jest usługą mikroblogowania. " -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4881,45 +4879,45 @@ msgstr "" "status.net/) w wersji %s, dostępnego na [Powszechnej Licencji Publicznej GNU " "Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "Licencja zawartości witryny" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "Treść i dane %1$s są prywatne i poufne." -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" "Prawa autorskie do treści i danych są własnością %1$s. Wszystkie prawa " "zastrzeżone." -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "Prawa autorskie do treści i danych są własnością współtwórców. Wszystkie " "prawa zastrzeżone." -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "Wszystko " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "licencja." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Paginacja" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "Później" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Wcześniej" @@ -5023,7 +5021,7 @@ msgstr "" "Zasób API wymaga dostępu do zapisu i do odczytu, ale powiadasz dostęp tylko " "do odczytu." -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5124,37 +5122,50 @@ msgstr "Zmiana hasła nie powiodła się" msgid "Password changing is not allowed" msgstr "Zmiana hasła nie jest dozwolona" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Wyniki polecenia" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Zakończono polecenie" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Polecenie nie powiodło się" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Te polecenie nie zostało jeszcze zaimplementowane." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Wpis z tym identyfikatorem nie istnieje." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "Użytkownik nie posiada ostatniego wpisu." + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "Nie można odnaleźć użytkownika z pseudonimem %s." -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Nie można odnaleźć użytkownika z pseudonimem %s." + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Te polecenie nie zostało jeszcze zaimplementowane." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Szturchanie samego siebie nie ma zbyt wiele sensu." -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "Wysłano szturchnięcie do użytkownika %s." -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5165,200 +5176,199 @@ msgstr "" "Subskrybenci: %2$s\n" "Wpisy: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Wpis z tym identyfikatorem nie istnieje." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Użytkownik nie posiada ostatniego wpisu." - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Zaznaczono wpis jako ulubiony." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "Jesteś już członkiem tej grupy." -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s." -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "Użytkownik %1$s dołączył do grupy %2$s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s." -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "Użytkownik %1$s opuścił grupę %2$s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Imię i nazwisko: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Położenie: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Strona domowa: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "O mnie: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d." -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s." -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Błąd podczas wysyłania bezpośredniej wiadomości." -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "Nie można powtórzyć własnego wpisu" -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "Już powtórzono ten wpis" -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "Powtórzono wpis od użytkownika %s" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "Błąd podczas powtarzania wpisu." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Wpis jest za długi - maksymalnie %1$d znaków, wysłano %2$d." -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "Wysłano odpowiedź do %s." -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "Błąd podczas zapisywania wpisu." -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "Podaj nazwę użytkownika do subskrybowania." -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Brak takiego użytkownika." +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Nie jesteś subskrybowany do tego profilu." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Subskrybowano użytkownika %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji." -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Usunięto subskrypcję użytkownika %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Nie zaimplementowano polecenia." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Wyłączono powiadomienia." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "Nie można wyłączyć powiadomień." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Włączono powiadomienia." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "Nie można włączyć powiadomień." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "Polecenie logowania jest wyłączone" -#: lib/command.php:665 +#: lib/command.php:708 #, 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:692 +#: lib/command.php:735 #, php-format msgid "Unsubscribed %s" msgstr "Usunięto subskrypcję użytkownika %s" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "Nie subskrybujesz nikogo." -#: lib/command.php:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "Nikt cię nie subskrybuje." -#: lib/command.php:733 +#: lib/command.php:776 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:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "Nie jesteś członkiem żadnej grupy." -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5630,49 +5640,49 @@ msgstr "Znaczniki we wpisach grupy %s" msgid "This page is not available in a media type you accept" msgstr "Ta strona jest niedostępna dla akceptowanego typu medium" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Nieobsługiwany format pliku obrazu." + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Ten plik jest za duży. Maksymalny rozmiar pliku to %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Częściowo wysłano." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Błąd systemu podczas wysyłania pliku." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "To nie jest obraz lub lub plik jest uszkodzony." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Nieobsługiwany format pliku obrazu." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Utracono plik." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Nieznany typ pliku" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "KB" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "Nieznane źródło skrzynki odbiorczej %d." @@ -5954,7 +5964,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:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "z" @@ -6107,23 +6117,23 @@ msgstr "Zachód" msgid "at" msgstr "w" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "w rozmowie" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "Powtórzone przez" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Odpowiedz na ten wpis" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Odpowiedz" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "Powtórzono wpis" @@ -6434,47 +6444,47 @@ msgctxt "role" msgid "Moderator" msgstr "Moderator" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "kilka sekund temu" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "około minutę temu" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "około %d minut temu" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "około godzinę temu" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "około %d godzin temu" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "blisko dzień temu" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "około %d dni temu" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "około miesiąc temu" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "około %d miesięcy temu" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "około rok temu" @@ -6490,7 +6500,7 @@ msgstr "" "%s nie jest prawidłowym kolorem. Użyj trzech lub sześciu znaków " "szesnastkowych." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d." diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 7041bea81..368e38c69 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:48+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:43:52+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -98,7 +98,7 @@ msgstr "Página não encontrada." #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -107,10 +107,8 @@ msgstr "Página não encontrada." #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Utilizador não encontrado." @@ -210,12 +208,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:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "Método da API não encontrado." @@ -346,7 +344,7 @@ msgstr "Nenhum estado encontrado com esse ID." msgid "This status is already a favorite." msgstr "Este estado já é um favorito." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Não foi possível criar o favorito." @@ -464,7 +462,7 @@ msgstr "Grupo não foi encontrado!" msgid "You are already a member of that group." msgstr "Já é membro desse grupo." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "Foi bloqueado desse grupo pelo gestor." @@ -515,7 +513,7 @@ msgstr "Tamanho inválido." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -655,12 +653,12 @@ msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo." msgid "Unsupported format." msgstr "Formato não suportado." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoritas de %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s actualizações preferidas por %2$s / %2$s." @@ -670,7 +668,7 @@ msgstr "%1$s actualizações preferidas por %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Actualizações que mencionam %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format 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." @@ -680,7 +678,7 @@ msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s." msgid "%s public timeline" msgstr "Notas públicas de %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s actualizações de todos!" @@ -695,12 +693,12 @@ msgstr "Repetida para %s" msgid "Repeats of %s" msgstr "Repetências de %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notas categorizadas com %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Actualizações categorizadas com %1$s em %2$s!" @@ -760,7 +758,7 @@ msgid "Preview" msgstr "Antevisão" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Apagar" @@ -843,8 +841,8 @@ msgstr "Não foi possível gravar informação do bloqueio." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "Grupo não foi encontrado." @@ -949,7 +947,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:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "Ocorreu um problema com a sua sessão." @@ -1013,7 +1011,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:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Apagar esta nota" @@ -1278,7 +1276,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:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Não foi possível criar sinónimos." @@ -1989,7 +1987,7 @@ msgstr "Convidar novos utilizadores" msgid "You are already subscribed to these users:" msgstr "Já subscreveu estes utilizadores:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2120,7 +2118,7 @@ msgstr "%1$s juntou-se ao grupo %2$s" msgid "You must be logged in to leave a group." msgstr "Precisa de iniciar uma sessão para deixar um grupo." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "Não é um membro desse grupo." @@ -2239,12 +2237,12 @@ msgstr "Use este formulário para criar um grupo novo." msgid "New message" msgstr "Mensagem nova" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Não pode enviar uma mensagem a este utilizador." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Sem conteúdo!" @@ -2252,7 +2250,7 @@ msgstr "Sem conteúdo!" msgid "No recipient specified." msgstr "Não especificou um destinatário." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio." @@ -2266,7 +2264,7 @@ msgstr "Mensagem enviada" msgid "Direct message to %s sent." msgstr "Mensagem directa para %s foi enviada." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Erro do Ajax" @@ -2401,8 +2399,8 @@ msgstr "tipo de conteúdo " msgid "Only " msgstr "Apenas " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Formato de dados não suportado." @@ -2540,7 +2538,7 @@ msgstr "Senha antiga incorrecta." msgid "Error saving user; invalid." msgstr "Erro ao guardar utilizador; inválido." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Não é possível guardar a nova senha." @@ -3043,7 +3041,7 @@ msgstr "Reiniciar senha" msgid "Recover password" msgstr "Recuperar senha" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Solicitada recuperação da senha" @@ -3063,20 +3061,20 @@ msgstr "Reiniciar" msgid "Enter a nickname or email address." msgstr "Introduza uma utilizador ou um endereço de correio electrónico." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" "Não existe nenhum utilizador com esse correio electrónico nem com esse nome." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Nenhum endereço de email registado para esse utilizador." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Erro ao guardar confirmação do endereço." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3084,23 +3082,23 @@ msgstr "" "Instruções para recuperação da sua senha foram enviadas para o correio " "electrónico registado na sua conta." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Reinício inesperado da senha." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Senha tem de ter 6 ou mais caracteres." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "A senha e a confirmação não coincidem." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Erro ao configurar utilizador." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "A senha nova foi gravada com sucesso. Iniciou uma sessão." @@ -3302,7 +3300,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:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Repetida" @@ -4567,7 +4565,7 @@ msgstr "Versão" msgid "Author(s)" msgstr "Autores" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4576,13 +4574,13 @@ msgstr "" "Nenhum ficheiro pode ter mais de %d bytes e o que enviou tinha %d bytes. " "Tente carregar uma versão menor." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" "Um ficheiro desta dimensão excederia a sua quota de utilizador de %d bytes." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Um ficheiro desta dimensão excederia a sua quota mensal de %d bytes." @@ -4665,7 +4663,7 @@ msgstr "Problema na gravação da nota." msgid "Problem saving group inbox." msgstr "Problema na gravação da nota." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4695,29 +4693,29 @@ msgstr "Não foi possível apagar a auto-subscrição." msgid "Couldn't delete subscription OMB token." msgstr "Não foi possível apagar a subscrição." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Não foi possível apagar a subscrição." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%1$s dá-lhe as boas-vindas, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Não foi possível criar o grupo." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Não foi possível configurar membros do grupo." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Não foi possível configurar membros do grupo." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Não foi possível gravar a subscrição." @@ -4939,7 +4937,7 @@ msgstr "Emblema" msgid "StatusNet software license" msgstr "Licença de software do StatusNet" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4948,12 +4946,12 @@ msgstr "" "**%%site.name%%** é um serviço de microblogues disponibilizado por [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** é um serviço de microblogues. " -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4964,41 +4962,41 @@ msgstr "" "disponibilizado nos termos da [GNU Affero General Public License](http://www." "fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "Licença de conteúdos do site" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "Tudo " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "licença." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Paginação" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "Posteriores" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Anteriores" @@ -5107,7 +5105,7 @@ msgstr "Configuração das localizações" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5210,37 +5208,50 @@ msgstr "Não foi possível mudar a palavra-chave" msgid "Password changing is not allowed" msgstr "Não é permitido mudar a palavra-chave" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Resultados do comando" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Comando terminado" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Comando falhou" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Desculpe, este comando ainda não foi implementado." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Não existe nenhuma nota com essa identificação" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "Utilizador não tem nenhuma última nota" + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "Não foi encontrado um utilizador com a alcunha %s" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Não foi encontrado um utilizador com a alcunha %s" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Desculpe, este comando ainda não foi implementado." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Não faz muito sentido tocar-nos a nós mesmos!" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "Cotovelada enviada a %s" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5251,198 +5262,196 @@ msgstr "" "Subscritores: %2$s\n" "Notas: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Não existe nenhuma nota com essa identificação" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Utilizador não tem nenhuma última nota" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Nota marcada como favorita." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "Já é membro desse grupo" -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "Não foi possível juntar o utilizador %s ao grupo %s" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s juntou-se ao grupo %s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "Não foi possível remover o utilizador %s do grupo %s" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s deixou o grupo %s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Localidade: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Página pessoal: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Mensagem demasiado extensa - máx. %d caracteres, enviou %d" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Mensagem directa para %s enviada" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Erro no envio da mensagem directa." -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "Não pode repetir a sua própria nota" -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "Já repetiu essa nota" -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "Nota de %s repetida" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "Erro ao repetir nota." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Nota demasiado extensa - máx. %d caracteres, enviou %d" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "Resposta a %s enviada" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "Erro ao gravar nota." -#: lib/command.php:547 +#: lib/command.php:594 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:589 +#: lib/command.php:602 #, fuzzy -msgid "No such user" -msgstr "Utilizador não encontrado." +msgid "Can't subscribe to OMB profiles by command." +msgstr "Não subscreveu esse perfil." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Subscreveu %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "Introduza o nome do utilizador para deixar de subscrever" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Deixou de subscrever %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Comando ainda não implementado." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Notificação desligada." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "Não foi possível desligar a notificação." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Notificação ligada." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "Não foi possível ligar a notificação." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "Comando para iniciar sessão foi desactivado" -#: lib/command.php:665 +#: lib/command.php:708 #, 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:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Deixou de subscrever %s" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "Não subscreveu ninguém." -#: lib/command.php:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "Ninguém subscreve as suas notas." -#: lib/command.php:733 +#: lib/command.php:776 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:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "Não está em nenhum grupo." -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 #, fuzzy msgid "" "Commands:\n" @@ -5712,49 +5721,49 @@ msgstr "Categorias nas notas do grupo %s" msgid "This page is not available in a media type you accept" msgstr "Esta página não está disponível num formato que você aceite" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Formato do ficheiro da imagem não é suportado." + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Esse ficheiro é demasiado grande. O tamanho máximo de ficheiro é %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Transferência parcial." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Ocorreu um erro de sistema ao transferir o ficheiro." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Ficheiro não é uma imagem ou está corrompido." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Formato do ficheiro da imagem não é suportado." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Perdi o nosso ficheiro." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Tipo do ficheiro é desconhecido" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, fuzzy, php-format msgid "Unknown inbox source %d." msgstr "Língua desconhecida \"%s\"." @@ -6035,7 +6044,7 @@ msgstr "" "conversa com outros utilizadores. Outros podem enviar-lhe mensagens, a que " "só você terá acesso." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "de" @@ -6191,23 +6200,23 @@ msgstr "O" msgid "at" msgstr "coords." -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "no contexto" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "Repetida por" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Responder a esta nota" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "Nota repetida" @@ -6520,47 +6529,47 @@ msgctxt "role" msgid "Moderator" msgstr "Moderar" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "há alguns segundos" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "há cerca de um minuto" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "há cerca de %d minutos" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "há cerca de uma hora" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "há cerca de %d horas" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "há cerca de um dia" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "há cerca de %d dias" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "há cerca de um mês" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "há cerca de %d meses" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "há cerca de um ano" @@ -6574,7 +6583,7 @@ msgstr "%s não é uma cor válida!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s não é uma cor válida! Use 3 ou 6 caracteres hexadecimais." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d." diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 51d926eba..5bf084134 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -2,6 +2,7 @@ # # Author@translatewiki.net: Aracnus # Author@translatewiki.net: Ewout +# Author@translatewiki.net: Luckas Blade # Author@translatewiki.net: McDutchie # Author@translatewiki.net: Vuln # -- @@ -11,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:51+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:43:55+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -76,7 +77,6 @@ msgid "Save access settings" msgstr "Salvar as configurações de acesso" #: actions/accessadminpanel.php:203 -#, fuzzy msgctxt "BUTTON" msgid "Save" msgstr "Salvar" @@ -97,7 +97,7 @@ msgstr "Esta página não existe." #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -106,10 +106,8 @@ msgstr "Esta página não existe." #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Este usuário não existe." @@ -211,12 +209,12 @@ msgstr "Atualizações de %1$s e amigos no %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "O método da API não foi encontrado!" @@ -349,7 +347,7 @@ msgstr "Não foi encontrado nenhum status com esse ID." msgid "This status is already a favorite." msgstr "Esta mensagem já é favorita!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Não foi possível criar a favorita." @@ -468,7 +466,7 @@ msgstr "O grupo não foi encontrado!" msgid "You are already a member of that group." msgstr "Você já é membro desse grupo." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "O administrador desse grupo bloqueou sua inscrição." @@ -518,7 +516,7 @@ msgstr "Token inválido." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -662,12 +660,12 @@ msgstr "O tamanho máximo da mensagem é de %s caracteres" msgid "Unsupported format." msgstr "Formato não suportado." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoritas de %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s marcadas como favoritas por %2$s / %2$s." @@ -677,7 +675,7 @@ msgstr "%1$s marcadas como favoritas por %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Mensagens mencionando %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s mensagens em resposta a mensagens de %2$s / %3$s." @@ -687,7 +685,7 @@ msgstr "%1$s mensagens em resposta a mensagens de %2$s / %3$s." msgid "%s public timeline" msgstr "Mensagens públicas de %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s mensagens de todo mundo!" @@ -702,12 +700,12 @@ msgstr "Repetida para %s" msgid "Repeats of %s" msgstr "Repetições de %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Mensagens etiquetadas como %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Mensagens etiquetadas como %1$s no %2$s!" @@ -768,7 +766,7 @@ msgid "Preview" msgstr "Visualização" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Excluir" @@ -852,8 +850,8 @@ msgstr "Não foi possível salvar a informação de bloqueio." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "Esse grupo não existe." @@ -954,7 +952,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:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "Ocorreu um problema com o seu token de sessão." @@ -1015,7 +1013,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:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Excluir esta mensagem" @@ -1268,7 +1266,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:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Não foi possível criar os apelidos." @@ -1982,7 +1980,7 @@ msgstr "Convidar novos usuários" msgid "You are already subscribed to these users:" msgstr "Você já está assinando esses usuários:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2029,7 +2027,6 @@ msgstr "Você pode, opcionalmente, adicionar uma mensagem pessoal ao convite." #. TRANS: Send button for inviting friends #: actions/invite.php:198 -#, fuzzy msgctxt "BUTTON" msgid "Send" msgstr "Enviar" @@ -2114,7 +2111,7 @@ msgstr "%1$s associou-se ao grupo %2$s" msgid "You must be logged in to leave a group." msgstr "Você deve estar autenticado para sair de um grupo." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "Você não é um membro desse grupo." @@ -2232,12 +2229,12 @@ msgstr "Utilize este formulário para criar um novo grupo." msgid "New message" msgstr "Nova mensagem" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Você não pode enviar mensagens para este usuário." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Nenhum conteúdo!" @@ -2245,7 +2242,7 @@ msgstr "Nenhum conteúdo!" msgid "No recipient specified." msgstr "Não foi especificado nenhum destinatário." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2261,7 +2258,7 @@ msgstr "A mensagem foi enviada" msgid "Direct message to %s sent." msgstr "A mensagem direta para %s foi enviada." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Erro no Ajax" @@ -2396,8 +2393,8 @@ msgstr "tipo de conteúdo " msgid "Only " msgstr "Apenas " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Não é um formato de dados suportado." @@ -2530,7 +2527,7 @@ msgstr "A senha anterior está errada" msgid "Error saving user; invalid." msgstr "Erro ao salvar usuário; inválido." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Não é possível salvar a nova senha." @@ -3032,7 +3029,7 @@ msgstr "Restaurar a senha" msgid "Recover password" msgstr "Recuperar a senha" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Foi solicitada a recuperação da senha" @@ -3052,21 +3049,21 @@ msgstr "Restaurar" msgid "Enter a nickname or email address." msgstr "Digite a identificação ou endereço de e-mail." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" "Não foi encontrado nenhum usuário com essa identificação ou endereço de " "email." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Nenhum endereço de e-mail registrado para esse usuário." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Erro ao salvar o endereço de confirmação." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3074,23 +3071,23 @@ msgstr "" "As instruções para recuperar a sua senha foram enviadas para o endereço de e-" "mail informado no seu cadastro." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Restauração inesperada da senha." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "A senha deve ter 6 ou mais caracteres." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "A senha e a confirmação não coincidem." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Erro na configuração do usuário." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" "A nova senha foi salva com sucesso. A partir de agora você já está " @@ -3293,7 +3290,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:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Repetida" @@ -3843,9 +3840,8 @@ msgid "Default timezone for the site; usually UTC." msgstr "Fuso horário padrão para o seu site; geralmente UTC." #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Idioma padrão do site" +msgstr "Idioma padrão" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" @@ -4283,7 +4279,6 @@ msgstr "" #. TRANS: User admin panel title #: actions/useradminpanel.php:59 -#, fuzzy msgctxt "TITLE" msgid "User" msgstr "Usuário" @@ -4559,7 +4554,7 @@ msgstr "Versão" msgid "Author(s)" msgstr "Autor(es)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4568,12 +4563,12 @@ msgstr "" "Nenhum arquivo pode ser maior que %d bytes e o arquivo que você enviou " "possui %d bytes. Experimente enviar uma versão menor." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Um arquivo deste tamanho excederá a sua conta de %d bytes." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Um arquivo deste tamanho excederá a sua conta mensal de %d bytes." @@ -4652,7 +4647,7 @@ msgstr "Problema no salvamento da mensagem." msgid "Problem saving group inbox." msgstr "Problema no salvamento das mensagens recebidas do grupo." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4682,29 +4677,29 @@ msgstr "Não foi possível excluir a auto-assinatura." msgid "Couldn't delete subscription OMB token." msgstr "Não foi possível excluir a assinatura." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Não foi possível excluir a assinatura." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Bem vindo(a) a %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Não foi possível criar o grupo." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Não foi possível configurar a associação ao grupo." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Não foi possível configurar a associação ao grupo." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Não foi possível salvar a assinatura." @@ -4802,33 +4797,28 @@ msgid "Invite friends and colleagues to join you on %s" msgstr "Convide seus amigos e colegas para unir-se a você no %s" #: lib/action.php:456 -#, fuzzy msgctxt "MENU" msgid "Invite" msgstr "Convidar" #. TRANS: Tooltip for main menu option "Logout" #: lib/action.php:462 -#, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" -msgstr "Sai do site" +msgstr "Sair do site" #: lib/action.php:465 -#, fuzzy msgctxt "MENU" msgid "Logout" msgstr "Sair" #. TRANS: Tooltip for main menu option "Register" #: lib/action.php:470 -#, fuzzy msgctxt "TOOLTIP" msgid "Create an account" -msgstr "Cria uma conta" +msgstr "Criar uma conta" #: lib/action.php:473 -#, fuzzy msgctxt "MENU" msgid "Register" msgstr "Registrar-se" @@ -4854,7 +4844,6 @@ msgid "Help me!" msgstr "Ajudem-me!" #: lib/action.php:485 -#, fuzzy msgctxt "MENU" msgid "Help" msgstr "Ajuda" @@ -4867,10 +4856,9 @@ msgid "Search for people or text" msgstr "Procura por pessoas ou textos" #: lib/action.php:491 -#, fuzzy msgctxt "MENU" msgid "Search" -msgstr "Procurar" +msgstr "Pesquisar" #. TRANS: DT element for site notice. String is hidden in default CSS. #. TRANS: Menu item for site administration @@ -4926,7 +4914,7 @@ msgstr "Mini-aplicativo" msgid "StatusNet software license" msgstr "Licença do software StatusNet" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4935,12 +4923,12 @@ msgstr "" "**%%site.name%%** é um serviço de microblog disponibilizado por [%%site." "broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** é um serviço de microblog. " -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4951,43 +4939,43 @@ msgstr "" "versão %s, disponível sob a [GNU Affero General Public License] (http://www." "fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "Licença do conteúdo do site" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "O conteúdo e os dados de %1$s são privados e confidenciais." -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "Conteúdo e dados licenciados sob %1$s. Todos os direitos reservados." -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "Conteúdo e dados licenciados pelos colaboradores. Todos os direitos " "reservados." -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "Todas " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "licença." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Paginação" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "Próximo" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Anterior" @@ -5095,7 +5083,7 @@ msgstr "" "Os recursos de API exigem acesso de leitura e escrita, mas você possui " "somente acesso de leitura." -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5196,37 +5184,50 @@ msgstr "Não foi possível alterar a senha" msgid "Password changing is not allowed" msgstr "Não é permitido alterar a senha" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Resultados do comando" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "O comando foi completado" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "O comando falhou" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Desculpe, mas esse comando ainda não foi implementado." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Não existe uma mensagem com essa id" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "O usuário não tem uma \"última mensagem\"" + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "Não foi possível encontrar um usuário com a identificação %s" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Não foi possível encontrar um usuário com a identificação %s" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Desculpe, mas esse comando ainda não foi implementado." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Não faz muito sentido chamar a sua própria atenção!" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "Foi enviada a chamada de atenção para %s" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5237,199 +5238,198 @@ msgstr "" "Assinantes: %2$s\n" "Mensagens: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Não existe uma mensagem com essa id" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "O usuário não tem uma \"última mensagem\"" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Mensagem marcada como favorita." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "Você já é um membro desse grupo." -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "Não foi possível associar o usuário %s ao grupo %s" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s associou-se ao grupo %s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "Não foi possível remover o usuário %s do grupo %s" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s deixou o grupo %s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Localização: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Site: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" "A mensagem é muito extensa - o máximo são %d caracteres e você enviou %d" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "A mensagem direta para %s foi enviada" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Ocorreu um erro durante o envio da mensagem direta." -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "Você não pode repetir sua própria mensagem" -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "Você já repetiu essa mensagem" -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "Mensagem de %s repetida" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "Erro na repetição da mensagem." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "A mensagem é muito extensa - o máximo são %d caracteres e você enviou %d" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "A resposta a %s foi enviada" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "Erro no salvamento da mensagem." -#: lib/command.php:547 +#: lib/command.php:594 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:589 -msgid "No such user" -msgstr "Este usuário não existe." +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Você não está assinando esse perfil." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Efetuada a assinatura de %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "Especifique o nome do usuário cuja assinatura será cancelada" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Cancelada a assinatura de %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "O comando não foi implementado ainda." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Notificação desligada." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "Não é possível desligar a notificação." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Notificação ligada." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "Não é possível ligar a notificação." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "O comando para autenticação está desabilitado" -#: lib/command.php:665 +#: lib/command.php:708 #, 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:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Cancelada a assinatura de %s" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "Você não está assinando ninguém." -#: lib/command.php:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "Ninguém o assinou ainda." -#: lib/command.php:733 +#: lib/command.php:776 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:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "Você não é membro de nenhum grupo." -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 #, fuzzy msgid "" "Commands:\n" @@ -5700,49 +5700,49 @@ msgstr "Etiquetas nas mensagens do grupo %s" msgid "This page is not available in a media type you accept" msgstr "Esta página não está disponível em um tipo de mídia que você aceita" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Formato de imagem não suportado." + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "O arquivo é muito grande. O tamanho máximo é de %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Envio parcial." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Erro no sistema durante o envio do arquivo." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Imagem inválida ou arquivo corrompido." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Formato de imagem não suportado." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Nosso arquivo foi perdido." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Tipo de arquivo desconhecido" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "Mb" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "Kb" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "Fonte da caixa de entrada desconhecida %d." @@ -6022,7 +6022,7 @@ msgstr "" "privadas para envolver outras pessoas em uma conversa. Você também pode " "receber mensagens privadas." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "de" @@ -6118,7 +6118,6 @@ msgid "Available characters" msgstr "Caracteres disponíveis" #: lib/messageform.php:178 lib/noticeform.php:236 -#, fuzzy msgctxt "Send button for sending notice" msgid "Send" msgstr "Enviar" @@ -6181,23 +6180,23 @@ msgstr "O" msgid "at" msgstr "em" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "no contexto" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "Repetida por" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Responder a esta mensagem" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "Mensagem repetida" @@ -6499,10 +6498,9 @@ msgid "User role" msgstr "Perfil do usuário" #: lib/userprofile.php:354 -#, fuzzy msgctxt "role" msgid "Administrator" -msgstr "Administradores" +msgstr "Administrador" #: lib/userprofile.php:355 #, fuzzy @@ -6510,47 +6508,47 @@ msgctxt "role" msgid "Moderator" msgstr "Moderar" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "alguns segundos atrás" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "cerca de 1 minuto atrás" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "cerca de %d minutos atrás" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "cerca de 1 hora atrás" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "cerca de %d horas atrás" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "cerca de 1 dia atrás" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "cerca de %d dias atrás" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "cerca de 1 mês atrás" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "cerca de %d meses atrás" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "cerca de 1 ano atrás" @@ -6564,7 +6562,7 @@ msgstr "%s não é uma cor válida!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s não é uma cor válida! Utilize 3 ou 6 caracteres hexadecimais." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 03aaa074a..2f5df9f69 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:54+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:43:59+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -98,7 +98,7 @@ msgstr "Нет такой страницы" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -107,10 +107,8 @@ msgstr "Нет такой страницы" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Нет такого пользователя." @@ -210,12 +208,12 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "Метод API не найден." @@ -346,7 +344,7 @@ msgstr "Нет статуса с таким ID." msgid "This status is already a favorite." msgstr "Этот статус уже входит в число любимых." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Не удаётся создать любимую запись." @@ -468,7 +466,7 @@ msgstr "Группа не найдена!" msgid "You are already a member of that group." msgstr "Вы уже являетесь членом этой группы." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "Вы заблокированы из этой группы администратором." @@ -518,7 +516,7 @@ msgstr "Неправильный токен" #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -658,12 +656,12 @@ msgstr "Максимальная длина записи — %d символов msgid "Unsupported format." msgstr "Неподдерживаемый формат." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Любимое от %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "Обновления %1$s, отмеченные как любимые %2$s / %2$s." @@ -673,7 +671,7 @@ msgstr "Обновления %1$s, отмеченные как любимые %2 msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Обновления, упоминающие %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s обновил этот ответ на сообщение: %2$s / %3$s." @@ -683,7 +681,7 @@ msgstr "%1$s обновил этот ответ на сообщение: %2$s / msgid "%s public timeline" msgstr "Общая лента %s" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "Обновления %s от всех!" @@ -698,12 +696,12 @@ msgstr "Повторено для %s" msgid "Repeats of %s" msgstr "Повторы за %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Записи с тегом %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Обновления с тегом %1$s на %2$s!" @@ -764,7 +762,7 @@ msgid "Preview" msgstr "Просмотр" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Удалить" @@ -847,8 +845,8 @@ msgstr "Не удаётся сохранить информацию о блок #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "Нет такой группы." @@ -949,7 +947,7 @@ msgstr "Вы не являетесь владельцем этого прило #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста." @@ -1010,7 +1008,7 @@ msgstr "Вы уверены, что хотите удалить эту запи msgid "Do not delete this notice" msgstr "Не удалять эту запись" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Удалить эту запись" @@ -1263,7 +1261,7 @@ msgstr "Слишком длинное описание (максимум %d си msgid "Could not update group." msgstr "Не удаётся обновить информацию о группе." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Не удаётся создать алиасы." @@ -1978,7 +1976,7 @@ msgstr "Пригласить новых пользователей" msgid "You are already subscribed to these users:" msgstr "Вы уже подписаны на пользователя:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2108,7 +2106,7 @@ msgstr "%1$s вступил в группу %2$s" msgid "You must be logged in to leave a group." msgstr "Вы должны авторизоваться, чтобы покинуть группу." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "Вы не являетесь членом этой группы." @@ -2222,12 +2220,12 @@ msgstr "Используйте эту форму для создания нов msgid "New message" msgstr "Новое сообщение" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Вы не можете послать сообщение этому пользователю." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Нет контента!" @@ -2235,7 +2233,7 @@ msgstr "Нет контента!" msgid "No recipient specified." msgstr "Нет адресата." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Не посылайте сообщения сами себе; просто потихоньку скажите это себе." @@ -2249,7 +2247,7 @@ msgstr "Сообщение отправлено" msgid "Direct message to %s sent." msgstr "Прямое сообщение для %s послано." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Ошибка AJAX" @@ -2381,8 +2379,8 @@ msgstr "тип содержимого " msgid "Only " msgstr "Только " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Неподдерживаемый формат данных." @@ -2515,7 +2513,7 @@ msgstr "Некорректный старый пароль" msgid "Error saving user; invalid." msgstr "Ошибка сохранения пользователя; неверное имя." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Не удаётся сохранить новый пароль." @@ -3012,7 +3010,7 @@ msgstr "Переустановить пароль" msgid "Recover password" msgstr "Восстановление пароля" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Запрошено восстановление пароля" @@ -3032,19 +3030,19 @@ msgstr "Сбросить" msgid "Enter a nickname or email address." msgstr "Введите имя или электронный адрес." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Нет пользователя с таким электронным адресом или именем." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Нет зарегистрированных электронных адресов для этого пользователя." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Ошибка сохранения подтверждённого адреса." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3052,23 +3050,23 @@ msgstr "" "Инструкции по восстановлению пароля посланы на электронный адрес, который Вы " "указали при регистрации вашего аккаунта." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Нетиповая переустановка пароля." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Пароль должен быть длиной не менее 6 символов." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Пароль и его подтверждение не совпадают." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Ошибка в установках пользователя." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Новый пароль успешно сохранён. Вы авторизовались." @@ -3271,7 +3269,7 @@ msgstr "Вы не можете повторить собственную зап msgid "You already repeated that notice." msgstr "Вы уже повторили эту запись." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Повторено" @@ -4528,7 +4526,7 @@ msgstr "Версия" msgid "Author(s)" msgstr "Автор(ы)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4537,12 +4535,12 @@ msgstr "" "Файл не может быть больше %d байт, тогда как отправленный вами файл содержал " "%d байт. Попробуйте загрузить меньшую версию." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Файл такого размера превысит вашу пользовательскую квоту в %d байта." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Файл такого размера превысит вашу месячную квоту в %d байта." @@ -4620,7 +4618,7 @@ msgstr "Проблемы с сохранением записи." msgid "Problem saving group inbox." msgstr "Проблемы с сохранением входящих сообщений группы." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4649,28 +4647,28 @@ msgstr "Невозможно удалить самоподписку." msgid "Couldn't delete subscription OMB token." msgstr "Не удаётся удалить подписочный жетон OMB." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Не удаётся удалить подписку." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добро пожаловать на %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Не удаётся создать группу." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "Не удаётся назначить URI группы." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Не удаётся назначить членство в группе." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "Не удаётся сохранить информацию о локальной группе." @@ -4874,7 +4872,7 @@ msgstr "Бедж" msgid "StatusNet software license" msgstr "StatusNet лицензия" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4883,12 +4881,12 @@ msgstr "" "**%%site.name%%** — это сервис микроблогинга, созданный для вас при помощи [%" "%site.broughtby%%](%%site.broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** — сервис микроблогинга. " -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4900,44 +4898,44 @@ msgstr "" "лицензией [GNU Affero General Public License](http://www.fsf.org/licensing/" "licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "Лицензия содержимого сайта" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "Содержание и данные %1$s являются личными и конфиденциальными." -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" "Авторские права на содержание и данные принадлежат %1$s. Все права защищены." -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "Авторские права на содержание и данные принадлежат разработчикам. Все права " "защищены." -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "All " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "license." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Разбиение на страницы" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "Сюда" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Туда" @@ -5041,7 +5039,7 @@ msgstr "" "API ресурса требует доступ для чтения и записи, но у вас есть только доступ " "для чтения." -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5142,37 +5140,50 @@ msgstr "Изменение пароля не удалось" msgid "Password changing is not allowed" msgstr "Смена пароля не разрешена" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Команда исполнена" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Команда завершена" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Команда неудачна" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Простите, эта команда ещё не выполнена." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Записи с таким id не существует" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "У пользователя нет последней записи." + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "Не удаётся найти пользователя с именем %s" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Не удаётся найти пользователя с именем %s" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Простите, эта команда ещё не выполнена." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Нет смысла «подталкивать» самого себя!" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "«Подталкивание» послано %s" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5183,198 +5194,197 @@ msgstr "" "Подписчиков: %2$s\n" "Записей: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Записи с таким id не существует" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "У пользователя нет последней записи." - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Запись помечена как любимая." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "Вы уже являетесь членом этой группы." -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "Не удаётся присоединить пользователя %s к группе %s" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%1$s вступил в группу %2$s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "Не удаётся удалить пользователя %1$s из группы %2$s." -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%1$s покинул группу %2$s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Полное имя: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Месторасположение: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Домашняя страница: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "О пользователе: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Сообщение слишком длинное — не больше %d символов, вы посылаете %d" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Прямое сообщение для %s послано." -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Ошибка при отправке прямого сообщения." -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "Невозможно повторить собственную запись." -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "Эта запись уже повторена" -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "Запись %s повторена" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "Ошибка при повторении записи." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Запись слишком длинная — не больше %d символов, вы посылаете %d" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "Ответ %s отправлен" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "Проблемы с сохранением записи." -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "Укажите имя пользователя для подписки." -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Нет такого пользователя." +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Вы не подписаны на этот профиль." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Подписано на %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "Укажите имя пользователя для отмены подписки." -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Отписано от %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Команда ещё не выполнена." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Оповещение отсутствует." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "Нет оповещения." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Есть оповещение." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "Есть оповещение." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "Команда входа отключена" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "Эта ссылка действительна только один раз в течение 2 минут: %s" -#: lib/command.php:692 +#: lib/command.php:735 #, php-format msgid "Unsubscribed %s" msgstr "Отписано %s" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "Вы ни на кого не подписаны." -#: lib/command.php:711 +#: lib/command.php:754 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Вы подписаны на этих людей:" msgstr[1] "Вы подписаны на этих людей:" msgstr[2] "Вы подписаны на этих людей:" -#: lib/command.php:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "Никто не подписан на вас." -#: lib/command.php:733 +#: lib/command.php:776 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Эти люди подписались на вас:" msgstr[1] "Эти люди подписались на вас:" msgstr[2] "Эти люди подписались на вас:" -#: lib/command.php:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "Вы не состоите ни в одной группе." -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5644,49 +5654,49 @@ msgstr "Теги записей группы %s" msgid "This page is not available in a media type you accept" msgstr "Страница недоступна для того типа, который Вы задействовали." -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Неподдерживаемый формат файла изображения." + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Этот файл слишком большой. Максимальный размер файла составляет %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Частичная загрузка." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Системная ошибка при загрузке файла." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Не является изображением или повреждённый файл." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Неподдерживаемый формат файла изображения." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Потерян файл." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Неподдерживаемый тип файла" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "МБ" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "КБ" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "Неизвестный источник входящих сообщений %d." @@ -5967,7 +5977,7 @@ msgstr "" "вовлечения других пользователей в разговор. Сообщения, получаемые от других " "людей, видите только вы." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "от " @@ -6122,23 +6132,23 @@ msgstr "з. д." msgid "at" msgstr "на" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "в контексте" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "Повторено" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Ответить на эту запись" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Ответить" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "Запись повторена" @@ -6448,47 +6458,47 @@ msgctxt "role" msgid "Moderator" msgstr "Модератор" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "пару секунд назад" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "около минуты назад" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "около %d минут(ы) назад" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "около часа назад" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "около %d часа(ов) назад" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "около дня назад" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "около %d дня(ей) назад" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "около месяца назад" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "около %d месяца(ев) назад" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "около года назад" @@ -6504,7 +6514,7 @@ msgstr "" "%s не является допустимым цветом! Используйте 3 или 6 шестнадцатеричных " "символов." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/statusnet.po b/locale/statusnet.po index 61d902a1a..5e59df581 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-03-08 21:09+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -90,7 +90,7 @@ msgstr "" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -99,10 +99,8 @@ msgstr "" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "" @@ -195,12 +193,12 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "" @@ -327,7 +325,7 @@ msgstr "" msgid "This status is already a favorite." msgstr "" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "" @@ -444,7 +442,7 @@ msgstr "" msgid "You are already a member of that group." msgstr "" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "" @@ -494,7 +492,7 @@ msgstr "" #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -629,12 +627,12 @@ msgstr "" msgid "Unsupported format." msgstr "" -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" @@ -644,7 +642,7 @@ msgstr "" msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" @@ -654,7 +652,7 @@ msgstr "" msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -669,12 +667,12 @@ msgstr "" msgid "Repeats of %s" msgstr "" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "" @@ -734,7 +732,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "" @@ -814,8 +812,8 @@ msgstr "" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "" @@ -916,7 +914,7 @@ msgstr "" #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "" @@ -972,7 +970,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "" @@ -1221,7 +1219,7 @@ msgstr "" msgid "Could not update group." msgstr "" -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "" @@ -1882,7 +1880,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1982,7 +1980,7 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "" @@ -2091,12 +2089,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "" @@ -2104,7 +2102,7 @@ msgstr "" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2118,7 +2116,7 @@ msgstr "" msgid "Direct message to %s sent." msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "" @@ -2242,8 +2240,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "" @@ -2374,7 +2372,7 @@ msgstr "" msgid "Error saving user; invalid." msgstr "" -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "" @@ -2851,7 +2849,7 @@ msgstr "" msgid "Recover password" msgstr "" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "" @@ -2871,41 +2869,41 @@ msgstr "" msgid "Enter a nickname or email address." msgstr "" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "" -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "" -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "" -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "" -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "" @@ -3080,7 +3078,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "" -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "" @@ -4241,19 +4239,19 @@ msgstr "" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4327,7 +4325,7 @@ msgstr "" msgid "Problem saving group inbox." msgstr "" -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4356,28 +4354,28 @@ msgstr "" msgid "Couldn't delete subscription OMB token." msgstr "" -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "" -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "" -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "" -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "" -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "" @@ -4581,19 +4579,19 @@ msgstr "" msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." "broughtby%%](%%site.broughtbyurl%%). " msgstr "" -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "" -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4601,41 +4599,41 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "" -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "" -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "" @@ -4737,7 +4735,7 @@ msgstr "" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4835,37 +4833,50 @@ msgstr "" msgid "Password changing is not allowed" msgstr "" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "" + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "" -#: lib/command.php:92 +#: lib/command.php:143 +#, php-format +msgid "Could not find a local user with nickname %s" +msgstr "" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -4873,195 +4884,193 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "" -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "" -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "" -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "" -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" +#: lib/command.php:602 +msgid "Can't subscribe to OMB profiles by command." msgstr "" -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, php-format msgid "Unsubscribed %s" msgstr "" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:711 +#: lib/command.php:754 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:733 +#: lib/command.php:776 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:755 +#: lib/command.php:798 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5289,49 +5298,49 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "" - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "" -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5526,7 +5535,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "" @@ -5676,23 +5685,23 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "" @@ -6002,47 +6011,47 @@ msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "" @@ -6056,7 +6065,7 @@ msgstr "" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 2a508849f..a1ca8cdf8 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:50:58+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:44:04+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -94,7 +94,7 @@ msgstr "Ingen sådan sida" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -103,10 +103,8 @@ msgstr "Ingen sådan sida" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Ingen sådan användare." @@ -206,12 +204,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:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "API-metod hittades inte." @@ -340,7 +338,7 @@ msgstr "Ingen status hittad med det ID:t." msgid "This status is already a favorite." msgstr "Denna status är redan en favorit." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Kunde inte skapa favorit." @@ -458,7 +456,7 @@ msgstr "Grupp hittades inte!" msgid "You are already a member of that group." msgstr "Du är redan en medlem i denna grupp." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "Du har blivit blockerad från denna grupp av administratören." @@ -508,7 +506,7 @@ msgstr "Ogiltig token." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -646,12 +644,12 @@ msgstr "Maximal notisstorlek är %d tecken, inklusive URL för bilaga." msgid "Unsupported format." msgstr "Format som inte stödjs." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Favoriter från %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s uppdateringar markerade som favorit av %2$s / %2$s." @@ -661,7 +659,7 @@ msgstr "%1$s uppdateringar markerade som favorit av %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Uppdateringar som nämner %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format 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." @@ -671,7 +669,7 @@ msgstr "%1$s uppdateringar med svar på uppdatering från %2$s / %3$s." msgid "%s public timeline" msgstr "%s publika tidslinje" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s uppdateringar från alla!" @@ -686,12 +684,12 @@ msgstr "Upprepat till %s" msgid "Repeats of %s" msgstr "Upprepningar av %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Notiser taggade med %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Uppdateringar taggade med %1$s på %2$s!" @@ -752,7 +750,7 @@ msgid "Preview" msgstr "Förhandsgranska" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Ta bort" @@ -835,8 +833,8 @@ msgstr "Misslyckades att spara blockeringsinformation." #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "Ingen sådan grupp." @@ -938,7 +936,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:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "Det var ett problem med din sessions-token." @@ -999,7 +997,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:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Ta bort denna notis" @@ -1252,7 +1250,7 @@ msgstr "beskrivning är för lång (max %d tecken)." msgid "Could not update group." msgstr "Kunde inte uppdatera grupp." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Kunde inte skapa alias." @@ -1954,7 +1952,7 @@ msgstr "Bjud in nya användare" msgid "You are already subscribed to these users:" msgstr "Du prenumererar redan på dessa användare:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2086,7 +2084,7 @@ msgstr "%1$s gick med i grupp %2$s" msgid "You must be logged in to leave a group." msgstr "Du måste vara inloggad för att lämna en grupp." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "Du är inte en medlem i den gruppen." @@ -2199,12 +2197,12 @@ msgstr "Använd detta formulär för att skapa en ny grupp." msgid "New message" msgstr "Nytt meddelande" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Du kan inte skicka ett meddelande till den användaren." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Inget innehåll!" @@ -2212,7 +2210,7 @@ msgstr "Inget innehåll!" msgid "No recipient specified." msgstr "Ingen mottagare angiven." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2228,7 +2226,7 @@ msgstr "Meddelande skickat" msgid "Direct message to %s sent." msgstr "Direktmeddelande till %s skickat." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "AJAX-fel" @@ -2361,8 +2359,8 @@ msgstr "innehållstyp " msgid "Only " msgstr "Bara " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Ett dataformat som inte stödjs" @@ -2493,7 +2491,7 @@ msgstr "Felaktigt gammalt lösenord" msgid "Error saving user; invalid." msgstr "Fel vid sparande av användare; ogiltig." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Kan inte spara nytt lösenord." @@ -2995,7 +2993,7 @@ msgstr "Återställ lösenord" msgid "Recover password" msgstr "Återskapa lösenord" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Återskapande av lösenord begärd" @@ -3015,19 +3013,19 @@ msgstr "Återställ" msgid "Enter a nickname or email address." msgstr "Skriv in ett smeknamn eller en e-postadress." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Ingen användare med den e-postadressen eller användarnamn." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Ingen registrerad e-postadress för den användaren." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Fel vid sparande av adressbekräftelse." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3035,23 +3033,23 @@ msgstr "" "Instruktioner för att återställa ditt lösenord har skickats till e-" "postadressen som är registrerat till ditt konto " -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Oväntad återställning av lösenord." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Lösenordet måste vara minst 6 tecken." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Lösenord och bekräftelse matchar inte." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Fel uppstog i användarens inställning" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Nya lösenordet sparat. Du är nu inloggad." @@ -3256,7 +3254,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:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Upprepad" @@ -4514,7 +4512,7 @@ msgstr "Version" msgid "Author(s)" msgstr "Författare" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4523,12 +4521,12 @@ msgstr "" "Inga filer får vara större än %d byte och filen du skickade var %d byte. " "Prova att ladda upp en mindre version." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "En så här stor fil skulle överskrida din användarkvot på %d byte." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "En sådan här stor fil skulle överskrida din månatliga kvot på %d byte." @@ -4606,7 +4604,7 @@ msgstr "Problem med att spara notis." msgid "Problem saving group inbox." msgstr "Problem med att spara gruppinkorg." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4636,28 +4634,28 @@ msgstr "Kunde inte ta bort själv-prenumeration." msgid "Couldn't delete subscription OMB token." msgstr "Kunde inte ta bort prenumeration." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Kunde inte ta bort prenumeration." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Välkommen till %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Kunde inte skapa grupp." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "Kunde inte ställa in grupp-URI." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Kunde inte ställa in gruppmedlemskap." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "Kunde inte spara lokal gruppinformation." @@ -4861,7 +4859,7 @@ msgstr "Emblem" msgid "StatusNet software license" msgstr "Programvarulicens för StatusNet" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4870,12 +4868,12 @@ msgstr "" "**%%site.name%%** är en mikrobloggtjänst tillhandahållen av [%%site.broughtby" "%%](%%site.broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** är en mikrobloggtjänst. " -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4886,42 +4884,42 @@ msgstr "" "version %s, tillgänglig under [GNU Affero General Public License](http://www." "fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "Licens för webbplatsinnehåll" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "Innehåll och data av %1$s är privat och konfidensiell." -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "Innehåll och data copyright av %1$s. Alla rättigheter reserverade." -#: lib/action.php:834 +#: lib/action.php:837 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:847 +#: lib/action.php:850 msgid "All " msgstr "Alla " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "licens." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Numrering av sidor" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "Senare" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Tidigare" @@ -5026,7 +5024,7 @@ msgid "API resource requires read-write access, but you only have read access." msgstr "" "API-resursen kräver läs- och skrivrättigheter, men du har bara läsrättighet." -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5127,37 +5125,50 @@ msgstr "Byte av lösenord misslyckades" msgid "Password changing is not allowed" msgstr "Byte av lösenord är inte tillåtet" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Resultat av kommando" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Kommando komplett" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Kommando misslyckades" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Tyvärr, detta kommando är inte implementerat än." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Notis med den ID:n finns inte" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "Användare har ingen sista notis" + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "Kunde inte hitta en användare med smeknamnet %s" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Kunde inte hitta en användare med smeknamnet %s" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Tyvärr, detta kommando är inte implementerat än." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Det verkar inte vara särskilt meningsfullt att knuffa dig själv!" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "Knuff skickad till %s" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5168,196 +5179,195 @@ msgstr "" "Prenumeranter: %2$s\n" "Notiser: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Notis med den ID:n finns inte" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Användare har ingen sista notis" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Notis markerad som favorit." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "Du är redan en medlem i denna grupp" -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "Kunde inte ansluta användare %s till groupp %s" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s gick med i grupp %s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "Kunde inte ta bort användare %s från grupp %s" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s lämnade grupp %s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Fullständigt namn: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Plats: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Hemsida: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "Om: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Meddelande för långt - maximum är %d tecken, du skickade %d" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Direktmeddelande till %s skickat" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Fel vid sändning av direktmeddelande." -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "Kan inte upprepa din egen notis" -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "Redan upprepat denna notis" -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "Notis fron %s upprepad" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "Fel vid upprepning av notis." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Notis för långt - maximum är %d tecken, du skickade %d" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "Svar på %s skickat" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "Fel vid sparande av notis." -#: lib/command.php:547 +#: lib/command.php:594 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:589 -msgid "No such user" -msgstr "Ingen sådan användare." +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Du är inte prenumerat hos den profilen." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Prenumerar på %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "Ange namnet på användaren att avsluta prenumeration på" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Prenumeration hos %s avslutad" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Kommando inte implementerat än." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Notifikation av." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "Kan inte sätta på notifikation." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Notifikation på." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "Kan inte stänga av notifikation." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "Inloggningskommando är inaktiverat" -#: lib/command.php:665 +#: lib/command.php:708 #, 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:692 +#: lib/command.php:735 #, php-format msgid "Unsubscribed %s" msgstr "Prenumeration avslutad %s" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "Du prenumererar inte på någon." -#: lib/command.php:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "Ingen prenumerar på dig." -#: lib/command.php:733 +#: lib/command.php:776 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:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "Du är inte medlem i några grupper." -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5625,49 +5635,49 @@ msgstr "Taggar i %s grupps notiser" msgid "This page is not available in a media type you accept" msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Bildfilens format stödjs inte." + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Denna fil är för stor. Den maximala filstorleken är %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Bitvis uppladdad." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Systemfel vid uppladdning av fil." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Inte en bildfil eller så är filen korrupt." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Bildfilens format stödjs inte." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Förlorade vår fil." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Okänd filtyp" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "MB" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "kB" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "Okänd källa för inkorg %d." @@ -5947,7 +5957,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:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "från" @@ -6103,23 +6113,23 @@ msgstr "V" msgid "at" msgstr "på" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "i sammanhang" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "Upprepad av" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Svara på denna notis" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Svara" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "Notis upprepad" @@ -6432,47 +6442,47 @@ msgctxt "role" msgid "Moderator" msgstr "Moderera" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "ett par sekunder sedan" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "för nån minut sedan" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "för %d minuter sedan" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "för en timma sedan" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "för %d timmar sedan" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "för en dag sedan" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "för %d dagar sedan" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "för en månad sedan" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "för %d månader sedan" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "för ett år sedan" @@ -6486,7 +6496,7 @@ msgstr "%s är inte en giltig färg!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s är inte en giltig färg! Använd 3 eller 6 hexadecimala tecken." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d." diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index c8a2f5c1a..1449adf15 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:51:01+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:44:07+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -23,9 +23,8 @@ msgstr "" #. TRANS: Page title #. TRANS: Menu item for site administration #: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374 -#, fuzzy msgid "Access" -msgstr "అంగీకరించు" +msgstr "అందుబాటు" #. TRANS: Page notice #: actions/accessadminpanel.php:67 @@ -44,7 +43,6 @@ msgstr "అజ్ఞాత (ప్రవేశించని) వాడుక #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" msgstr "అంతరంగికం" @@ -66,18 +64,15 @@ msgstr "కొత్త నమోదులను అచేతనంచేయి. #. TRANS: Checkbox label for disabling new user registrations. #: actions/accessadminpanel.php:185 -#, fuzzy msgid "Closed" -msgstr "అటువంటి వాడుకరి లేరు." +msgstr "మూసివేయబడింది" #. TRANS: Title / tooltip for button to save access settings in site admin panel #: actions/accessadminpanel.php:202 -#, fuzzy msgid "Save access settings" -msgstr "సైటు అమరికలను భద్రపరచు" +msgstr "అందుబాటు అమరికలను భద్రపరచు" #: actions/accessadminpanel.php:203 -#, fuzzy msgctxt "BUTTON" msgid "Save" msgstr "భద్రపరచు" @@ -98,7 +93,7 @@ msgstr "అటువంటి పేజీ లేదు" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -107,10 +102,8 @@ msgstr "అటువంటి పేజీ లేదు" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "అటువంటి వాడుకరి లేరు." @@ -203,12 +196,12 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "నిర్ధారణ సంకేతం కనబడలేదు." @@ -273,7 +266,7 @@ msgstr "" #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." -msgstr "" +msgstr "మీ రూపురేఖల అమరికలని భద్రపరచలేకున్నాం." #: actions/apiaccountupdateprofilebackgroundimage.php:187 #: actions/apiaccountupdateprofilecolors.php:142 @@ -339,7 +332,7 @@ msgstr "" msgid "This status is already a favorite." msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టాంశం." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "ఇష్టాంశాన్ని సృష్టించలేకపోయాం." @@ -459,7 +452,7 @@ msgstr "గుంపు దొరకలేదు!" msgid "You are already a member of that group." msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "నిర్వాహకులు ఆ గుంపు నుండి మిమ్మల్ని నిరోధించారు." @@ -510,7 +503,7 @@ msgstr "తప్పుడు పరిమాణం." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -556,11 +549,11 @@ msgstr "" #: actions/apioauthauthorize.php:259 msgid "An application would like to connect to your account" -msgstr "" +msgstr "ఒక ఉపకరణం మీ ఖాతాకి అనుసంధానమవ్వాలనుకుంటూంది." #: actions/apioauthauthorize.php:276 msgid "Allow or deny access" -msgstr "" +msgstr "అనుమతిని ఇవ్వండి లేదా తిరస్కరించండి" #: actions/apioauthauthorize.php:292 #, php-format @@ -597,7 +590,7 @@ msgstr "అనుమతించు" #: actions/apioauthauthorize.php:351 msgid "Allow or deny access to your account information." -msgstr "" +msgstr "మీ ఖాతా సమాచారాన్ని సంప్రాపించడానికి అనుమతించండి లేదా నిరాకరించండి." #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." @@ -626,7 +619,7 @@ msgstr "స్థితిని తొలగించాం." #: actions/apistatusesshow.php:144 msgid "No status with that ID found." -msgstr "" +msgstr "ఆ IDతో ఏ నోటీసు కనబడలేదు." #: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 @@ -647,12 +640,12 @@ msgstr "గరిష్ఠ నోటీసు పొడవు %d అక్షర msgid "Unsupported format." msgstr "" -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s యొక్క మైక్రోబ్లాగు" @@ -662,7 +655,7 @@ msgstr "%s యొక్క మైక్రోబ్లాగు" msgid "%1$s / Updates mentioning %2$s" msgstr "" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" @@ -672,7 +665,7 @@ msgstr "" msgid "%s public timeline" msgstr "%s బహిరంగ కాలరేఖ" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "అందరి నుండి %s తాజాకరణలు!" @@ -687,12 +680,12 @@ msgstr "%sకి స్పందనలు" msgid "Repeats of %s" msgstr "%s యొక్క పునరావృతాలు" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%s యొక్క మైక్రోబ్లాగు" @@ -753,7 +746,7 @@ msgid "Preview" msgstr "మునుజూపు" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "తొలగించు" @@ -799,6 +792,8 @@ msgid "" "unsubscribed from you, unable to subscribe to you in the future, and you " "will not be notified of any @-replies from them." msgstr "" +"మీరు ఈ వాడుకరిని నిజంగానే నిరోధించాలనుకుంటున్నారా? ఆ తర్వాత, వారు మీ నుండి చందా విరమింపబడతారు, " +"భవిష్యత్తులో మీకు చందా చేరలేరు, మరియు వారి నుండి @-స్పందనలని మీకు తెలియజేయము." #: actions/block.php:143 actions/deleteapplication.php:153 #: actions/deletenotice.php:145 actions/deleteuser.php:150 @@ -833,8 +828,8 @@ msgstr "నిరోధపు సమాచారాన్ని భద్రప #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "అటువంటి గుంపు లేదు." @@ -937,7 +932,7 @@ msgstr "మీరు ఈ ఉపకరణం యొక్క యజమాని #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "" @@ -995,7 +990,7 @@ msgstr "మీరు నిజంగానే ఈ నోటీసుని త msgid "Do not delete this notice" msgstr "ఈ నోటీసుని తొలగించకు" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "ఈ నోటీసుని తొలగించు" @@ -1115,7 +1110,7 @@ msgstr "లంకెలు" #: actions/designadminpanel.php:577 lib/designsettings.php:247 msgid "Use defaults" -msgstr "" +msgstr "అప్రమేయాలని ఉపయోగించు" #: actions/designadminpanel.php:578 lib/designsettings.php:248 msgid "Restore default designs" @@ -1155,7 +1150,6 @@ msgid "No such document \"%s\"" msgstr "అటువంటి పత్రమేమీ లేదు." #: actions/editapplication.php:54 -#, fuzzy msgid "Edit Application" msgstr "ఉపకరణాన్ని మార్చు" @@ -1181,7 +1175,6 @@ msgid "Name is too long (max 255 chars)." msgstr "పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)." #: actions/editapplication.php:183 actions/newapplication.php:162 -#, fuzzy msgid "Name already in use. Try another one." msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి." @@ -1250,7 +1243,7 @@ msgstr "వివరణ చాలా పెద్దదిగా ఉంది (1 msgid "Could not update group." msgstr "గుంపుని తాజాకరించలేకున్నాం." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "మారుపేర్లని సృష్టించలేకపోయాం." @@ -1265,7 +1258,7 @@ msgstr "ఈమెయిల్ అమరికలు" #: actions/emailsettings.php:71 #, php-format msgid "Manage how you get email from %%site.name%%." -msgstr "" +msgstr "%%site.name%% నుండి మీకు ఎలా మెయిల్ వస్తూంతో సంభాళించుకోండి." #: actions/emailsettings.php:100 actions/imsettings.php:100 #: actions/smssettings.php:104 @@ -1287,6 +1280,8 @@ msgid "" "Awaiting confirmation on this address. Check your inbox (and spam box!) for " "a message with further instructions." msgstr "" +"ఈ చిరునామా నిర్ధారణకై వేచివున్నాం. తదుపరి సూచనలతో ఉన్న సందేశానికై మీ ఇన్‌బాక్స్‌లో (స్పామ్ బాక్సులో కూడా!) " +"చూడండి." #: actions/emailsettings.php:117 actions/imsettings.php:120 #: actions/smssettings.php:126 lib/applicationeditform.php:331 @@ -1556,23 +1551,20 @@ msgid "Cannot read file." msgstr "ఫైలుని చదవలేకపోతున్నాం." #: actions/grantrole.php:62 actions/revokerole.php:62 -#, fuzzy msgid "Invalid role." -msgstr "తప్పుడు పరిమాణం." +msgstr "తప్పుడు పాత్ర." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." msgstr "" #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" +msgstr "ఈ సైటులో మీరు వాడుకరలకి పాత్రలను ఇవ్వలేరు." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు." +msgstr "వాడుకరికి ఇప్పటికే ఈ పాత్ర ఉంది." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1646,7 +1638,7 @@ msgstr "గుంపు అలంకారం" msgid "" "Customize the way your group looks with a background image and a colour " "palette of your choice." -msgstr "" +msgstr "నేపథ్య చిత్రం మరియు రంగుల ఎంపికతో మీ గుంపు ఎలా కనిపించాలో మలచుకోండి." #: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186 #: lib/designsettings.php:391 lib/designsettings.php:413 @@ -1701,7 +1693,7 @@ msgstr "ఈ గుంపులో వాడుకరులు జాబితా #: actions/groupmembers.php:182 lib/groupnav.php:107 msgid "Admin" -msgstr "" +msgstr "నిర్వాహకులు" #: actions/groupmembers.php:355 lib/blockform.php:69 msgid "Block" @@ -1890,9 +1882,9 @@ msgid "That is not your Jabber ID." msgstr "ఇది మీ Jabber ID కాదు" #: actions/inbox.php:59 -#, fuzzy, php-format +#, php-format msgid "Inbox for %1$s - page %2$d" -msgstr "%sకి వచ్చినవి" +msgstr "%1$sకి వచ్చినవి - %2$dవ పేజీ" #: actions/inbox.php:62 #, php-format @@ -1929,7 +1921,7 @@ msgstr "కొత్త వాడుకరులని ఆహ్వానిం msgid "You are already subscribed to these users:" msgstr "మీరు ఇప్పటికే ఈ వాడుకరులకు చందాచేరి ఉన్నారు:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1972,7 +1964,6 @@ msgstr "ఐచ్ఛికంగా ఆహ్వానానికి వ్య #. TRANS: Send button for inviting friends #: actions/invite.php:198 -#, fuzzy msgctxt "BUTTON" msgid "Send" msgstr "పంపించు" @@ -2031,7 +2022,7 @@ msgstr "%1$s %2$s గుంపులో చేరారు" msgid "You must be logged in to leave a group." msgstr "గుంపుని వదిలివెళ్ళడానికి మీరు ప్రవేశించి ఉండాలి." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "మీరు ఆ గుంపులో సభ్యులు కాదు." @@ -2050,7 +2041,7 @@ msgstr "వాడుకరిపేరు లేదా సంకేతపదం #: actions/login.php:132 actions/otp.php:120 msgid "Error setting user. You are probably not authorized." -msgstr "" +msgstr "వాడుకరిని అమర్చడంలో పొరపాటు. బహుశా మీకు అధీకరణ లేకపోవచ్చు." #: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79 msgid "Login" @@ -2144,12 +2135,12 @@ msgstr "కొత్త గుంపుని సృష్టిండాని msgid "New message" msgstr "కొత్త సందేశం" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "ఈ వాడుకరికి మీరు సందేశాన్ని పంపించలేరు." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "విషయం లేదు!" @@ -2157,7 +2148,7 @@ msgstr "విషయం లేదు!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "మీకు మీరే సందేశాన్ని పంపుకోకండి; దాని బదులు మీలో మీరే మెల్లగా చెప్పుకోండి." @@ -2171,7 +2162,7 @@ msgstr "సందేశాన్ని పంపించాం" msgid "Direct message to %s sent." msgstr "%sకి నేరు సందేశాన్ని పంపించాం" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "అజాక్స్ పొరపాటు" @@ -2290,7 +2281,7 @@ msgstr "" #: actions/oembed.php:86 actions/shownotice.php:180 #, php-format msgid "%1$s's status on %2$s" -msgstr "" +msgstr "%2$sలో %1$s యొక్క స్థితి" #: actions/oembed.php:157 msgid "content type " @@ -2300,8 +2291,8 @@ msgstr "విషయ రకం " msgid "Only " msgstr "మాత్రమే " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "" @@ -2437,7 +2428,7 @@ msgstr "పాత సంకేతపదం తప్పు" msgid "Error saving user; invalid." msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము." @@ -2448,7 +2439,7 @@ msgstr "సంకేతపదం భద్రమయ్యింది." #. TRANS: Menu item for site administration #: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382 msgid "Paths" -msgstr "" +msgstr "త్రోవలు" #: actions/pathsadminpanel.php:70 msgid "Path and server settings for this StatusNet site." @@ -2789,19 +2780,16 @@ msgid "Public timeline" msgstr "ప్రజా కాలరేఖ" #: actions/public.php:160 -#, fuzzy msgid "Public Stream Feed (RSS 1.0)" -msgstr "ప్రజా వాహిని ఫీడు" +msgstr "ప్రజా వాహిని ఫీడు (RSS 1.0)" #: actions/public.php:164 -#, fuzzy msgid "Public Stream Feed (RSS 2.0)" -msgstr "ప్రజా వాహిని ఫీడు" +msgstr "ప్రజా వాహిని ఫీడు (RSS 2.0)" #: actions/public.php:168 -#, fuzzy msgid "Public Stream Feed (Atom)" -msgstr "ప్రజా వాహిని ఫీడు" +msgstr "ప్రజా వాహిని ఫీడు (ఆటమ్)" #: actions/public.php:188 #, php-format @@ -2818,7 +2806,7 @@ msgstr "" #, php-format msgid "" "Why not [register an account](%%action.register%%) and be the first to post!" -msgstr "" +msgstr "[ఖాతా నమోదు చేసుకుని](%%action.register%%) మొదటగా వ్రాసేది మీరే ఎందుకు కాకూడదు!" #: actions/public.php:242 #, php-format @@ -2895,7 +2883,7 @@ msgstr "ఈ నిర్ధారణ సంకేతం చాలా పాత #: actions/recoverpassword.php:111 msgid "Could not update user with confirmed email address." -msgstr "" +msgstr "నిర్ధారిత ఈమెయిలు చిరునామాతో వాడుకరిని తాజాకరించలేకపోయాం." #: actions/recoverpassword.php:152 msgid "" @@ -2932,7 +2920,7 @@ msgstr "" msgid "Recover password" msgstr "" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "" @@ -2952,41 +2940,41 @@ msgstr "" msgid "Enter a nickname or email address." msgstr "పేరు లేదా ఈమెయిల్ చిరునామా ఇవ్వండి." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "ఈ వాడుకరికై నమోదైన ఈమెయిల్ చిరునామాలు ఏమీ లేవు." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "చిరునామా నిర్ధారణని భద్రపరచడంలో పొరపాటు." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "మీ సంకేతపదాన్ని తిరిగి పొందడానికై అవసరమైన సూచనలని మీ ఖాతాతో నమోదైన ఈమెయిల్ చిరునామాకి పంపించాం." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక్కవ అక్షరాలుండాలి." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "సంకేతపదం మరియు నిర్ధారణ సరిపోలేదు." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "మీ కొత్త సంకేతపదం భద్రమైంది. మీరు ఇప్పుడు లోనికి ప్రవేశించారు." @@ -3103,6 +3091,8 @@ msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" msgstr "" +"(మీ ఈమెయిలు చిరునామాని ఎలా నిర్ధారించాలో తెలిపే సూచనలతో ఒక సందేశం మీరు ఈమెయిలు ద్వారా మరి కొద్దిసేపట్లోనే " +"అందుతుంది.)" #: actions/remotesubscribe.php:98 #, php-format @@ -3111,6 +3101,9 @@ msgid "" "register%%) a new account. If you already have an account on a [compatible " "microblogging site](%%doc.openmublog%%), enter your profile URL below." msgstr "" +"చందా చేరడానికి, మీరు [ప్రవేశించవచ్చు](%%action.login%%), లేదా కొత్త ఖాతాని [నమోదుచేసుకోవచ్చు](%%" +"action.register%%). ఒకవేళ మీకు ఇప్పటికే ఏదైనా [పొసగే మైక్రోబ్లాగింగు సైటులో](%%doc.openmublog%" +"%) ఖాతా ఉంటే, మీ ప్రొఫైలు చిరునామాని క్రింద ఇవ్వండి." #: actions/remotesubscribe.php:112 msgid "Remote subscribe" @@ -3160,7 +3153,7 @@ msgstr "" #: actions/repeat.php:57 msgid "Only logged-in users can repeat notices." -msgstr "" +msgstr "కేవలం ప్రవేశించిన వాడుకరులు మాత్రమే నోటీసులని పునరావృతించగలరు." #: actions/repeat.php:64 actions/repeat.php:71 #, fuzzy @@ -3168,16 +3161,14 @@ msgid "No notice specified." msgstr "కొత్త సందేశం" #: actions/repeat.php:76 -#, fuzzy msgid "You can't repeat your own notice." -msgstr "ఈ లైసెన్సుకి అంగీకరించకపోతే మీరు నమోదుచేసుకోలేరు." +msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు." #: actions/repeat.php:90 -#, fuzzy msgid "You already repeated that notice." -msgstr "మీరు ఇప్పటికే ఆ వాడుకరిని నిరోధించారు." +msgstr "మీరు ఇప్పటికే ఆ నోటీసుని పునరావృతించారు." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 #, fuzzy msgid "Repeated" msgstr "సృష్టితం" @@ -3194,24 +3185,24 @@ msgid "Replies to %s" msgstr "%sకి స్పందనలు" #: actions/replies.php:128 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s, page %2$d" -msgstr "%sకి స్పందనలు" +msgstr "%1$sకి స్పందనలు, %2$dవ పేజీ" #: actions/replies.php:145 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 1.0)" -msgstr "%s యొక్క సందేశముల ఫీడు" +msgstr "%s కొరకు స్పందనల ఫీడు (RSS 1.0)" #: actions/replies.php:152 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (RSS 2.0)" -msgstr "%s యొక్క సందేశముల ఫీడు" +msgstr "%s కొరకు స్పందనల ఫీడు (RSS 2.0)" #: actions/replies.php:159 -#, fuzzy, php-format +#, php-format msgid "Replies feed for %s (Atom)" -msgstr "%s యొక్క సందేశముల ఫీడు" +msgstr "%s కొరకు స్పందనల ఫీడు (ఆటమ్)" #: actions/replies.php:199 #, fuzzy, php-format @@ -3237,9 +3228,9 @@ msgid "" msgstr "" #: actions/repliesrss.php:72 -#, fuzzy, php-format +#, php-format msgid "Replies to %1$s on %2$s!" -msgstr "%sకి స్పందనలు" +msgstr "%2$sలో %1$sకి స్పందనలు!" #: actions/revokerole.php:75 #, fuzzy @@ -3304,7 +3295,7 @@ msgstr "గుంపుని వదిలివెళ్ళడానికి #: actions/showapplication.php:157 msgid "Application profile" -msgstr "" +msgstr "ఉపకరణ ప్రవర" #: actions/showapplication.php:159 lib/applicationeditform.php:180 msgid "Icon" @@ -3433,9 +3424,9 @@ msgid "%s group" msgstr "%s గుంపు" #: actions/showgroup.php:84 -#, fuzzy, php-format +#, php-format msgid "%1$s group, page %2$d" -msgstr "%1$s గుంపు సభ్యులు, పేజీ %2$d" +msgstr "%1$s గుంపు , %2$dవ పేజీ" #: actions/showgroup.php:226 msgid "Group profile" @@ -3548,9 +3539,9 @@ msgid " tagged %s" msgstr "" #: actions/showstream.php:79 -#, fuzzy, php-format +#, php-format msgid "%1$s, page %2$d" -msgstr "%1$s మరియు మిత్రులు, పేజీ %2$d" +msgstr "%1$s, %2$dవ పేజీ" #: actions/showstream.php:122 #, fuzzy, php-format @@ -3699,9 +3690,8 @@ msgid "Default timezone for the site; usually UTC." msgstr "" #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "అప్రమేయ సైటు భాష" +msgstr "అప్రమేయ భాష" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" @@ -3744,7 +3734,7 @@ msgstr "సందేశాన్ని భద్రపరచడంలో పొ #: actions/sitenoticeadminpanel.php:113 msgid "Max length for the site-wide notice is 255 chars" -msgstr "" +msgstr "సైటు-వారీ నోటీసుకి గరిష్ఠ పొడవు 255 అక్షరాలు" #: actions/sitenoticeadminpanel.php:176 #, fuzzy @@ -3753,7 +3743,7 @@ msgstr "సైటు గమనిక" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" -msgstr "" +msgstr "సైటు-వారీ నోటీసు పాఠ్యం (255 అక్షరాలు గరిష్ఠం; HTML పర్లేదు)" #: actions/sitenoticeadminpanel.php:198 #, fuzzy @@ -4012,7 +4002,7 @@ msgstr "" #: actions/subscriptions.php:128 actions/subscriptions.php:132 #, php-format msgid "%s is not listening to anyone." -msgstr "" +msgstr "%s ప్రస్తుతం ఎవరినీ వినడంలేదు." #: actions/subscriptions.php:199 msgid "Jabber" @@ -4123,7 +4113,6 @@ msgstr "" #. TRANS: User admin panel title #: actions/useradminpanel.php:59 -#, fuzzy msgctxt "TITLE" msgid "User" msgstr "వాడుకరి" @@ -4225,11 +4214,11 @@ msgstr "ఈ చందాని తిరస్కరించు" #: actions/userauthorization.php:232 msgid "No authorization request!" -msgstr "" +msgstr "అధీకరణ అభ్యర్థన లేదు!" #: actions/userauthorization.php:254 msgid "Subscription authorized" -msgstr "" +msgstr "చందాని అధీకరించారు" #: actions/userauthorization.php:256 msgid "" @@ -4299,9 +4288,9 @@ msgid "Enjoy your hotdog!" msgstr "" #: actions/usergroups.php:64 -#, fuzzy, php-format +#, php-format msgid "%1$s groups, page %2$d" -msgstr "%1$s గుంపు సభ్యులు, పేజీ %2$d" +msgstr "%1$s గుంపులు, %2$dవ పేజీ" #: actions/usergroups.php:130 msgid "Search for more groups" @@ -4374,19 +4363,19 @@ msgstr "సంచిక" msgid "Author(s)" msgstr "రచయిత(లు)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4404,9 +4393,8 @@ msgid "Group leave failed." msgstr "గుంపు నుండి వైదొలగడం విఫలమైంది." #: classes/Local_group.php:41 -#, fuzzy msgid "Could not update local group." -msgstr "గుంపుని తాజాకరించలేకున్నాం." +msgstr "స్థానిక గుంపుని తాజాకరించలేకున్నాం." #: classes/Login_token.php:76 #, fuzzy, php-format @@ -4464,7 +4452,7 @@ msgstr "సందేశాన్ని భద్రపరచడంలో పొ msgid "Problem saving group inbox." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4496,29 +4484,29 @@ msgstr "చందాని తొలగించలేకపోయాం." msgid "Couldn't delete subscription OMB token." msgstr "చందాని తొలగించలేకపోయాం." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "చందాని తొలగించలేకపోయాం." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "@%2$s, %1$sకి స్వాగతం!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "గుంపుని సృష్టించలేకపోయాం." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "గుంపు సభ్యత్వాన్ని అమర్చలేకపోయాం." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "గుంపు సభ్యత్వాన్ని అమర్చలేకపోయాం." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "చందాని సృష్టించలేకపోయాం." @@ -4559,7 +4547,7 @@ msgstr "%1$s - %2$s" #: lib/action.php:159 msgid "Untitled page" -msgstr "" +msgstr "శీర్షికలేని పేజీ" #: lib/action.php:424 msgid "Primary site navigation" @@ -4572,7 +4560,6 @@ msgid "Personal profile and friends timeline" msgstr "" #: lib/action.php:433 -#, fuzzy msgctxt "MENU" msgid "Personal" msgstr "వ్యక్తిగత" @@ -4597,13 +4584,11 @@ msgstr "అనుసంధానించు" #. TRANS: Tooltip for menu option "Admin" #: lib/action.php:446 -#, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" -msgstr "చందాలు" +msgstr "సైటు స్వరూపణాన్ని మార్చండి" #: lib/action.php:449 -#, fuzzy msgctxt "MENU" msgid "Admin" msgstr "నిర్వాహకులు" @@ -4616,72 +4601,61 @@ msgid "Invite friends and colleagues to join you on %s" msgstr "ఈ ఫారాన్ని ఉపయోగించి మీ స్నేహితులను మరియు సహోద్యోగులను ఈ సేవను వినియోగించుకోమని ఆహ్వానించండి." #: lib/action.php:456 -#, fuzzy msgctxt "MENU" msgid "Invite" msgstr "ఆహ్వానించు" #. TRANS: Tooltip for main menu option "Logout" #: lib/action.php:462 -#, fuzzy msgctxt "TOOLTIP" msgid "Logout from the site" msgstr "సైటు నుండి నిష్క్రమించు" #: lib/action.php:465 -#, fuzzy msgctxt "MENU" msgid "Logout" msgstr "నిష్క్రమించు" #. TRANS: Tooltip for main menu option "Register" #: lib/action.php:470 -#, fuzzy msgctxt "TOOLTIP" msgid "Create an account" -msgstr "కొత్త ఖాతా సృష్టించు" +msgstr "ఖాతాని సృష్టించుకోండి" #: lib/action.php:473 -#, fuzzy msgctxt "MENU" msgid "Register" msgstr "నమోదు" #. TRANS: Tooltip for main menu option "Login" #: lib/action.php:476 -#, fuzzy msgctxt "TOOLTIP" msgid "Login to the site" -msgstr "సైటులోని ప్రవేశించు" +msgstr "సైటు లోనికి ప్రవేశించండి" #: lib/action.php:479 -#, fuzzy msgctxt "MENU" msgid "Login" -msgstr "ప్రవేశించండి" +msgstr "ప్రవేశించు" #. TRANS: Tooltip for main menu option "Help" #: lib/action.php:482 -#, fuzzy msgctxt "TOOLTIP" msgid "Help me!" msgstr "సహాయం కావాలి!" #: lib/action.php:485 -#, fuzzy msgctxt "MENU" msgid "Help" msgstr "సహాయం" #. TRANS: Tooltip for main menu option "Search" #: lib/action.php:488 -#, fuzzy msgctxt "TOOLTIP" msgid "Search for people or text" -msgstr "మరిన్ని గుంపులకై వెతుకు" +msgstr "ప్రజలు లేదా పాఠ్యం కొరకు వెతకండి" #: lib/action.php:491 -#, fuzzy msgctxt "MENU" msgid "Search" msgstr "వెతుకు" @@ -4741,7 +4715,7 @@ msgstr "బాడ్జి" msgid "StatusNet software license" msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైసెన్సు" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4750,12 +4724,12 @@ msgstr "" "**%%site.name%%** అనేది [%%site.broughtby%%](%%site.broughtbyurl%%) వారు " "అందిస్తున్న మైక్రో బ్లాగింగు సదుపాయం. " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగింగు సదుపాయం." -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4766,42 +4740,42 @@ msgstr "" "html) కింద లభ్యమయ్యే [స్టేటస్‌నెట్](http://status.net/) మైక్రోబ్లాగింగ్ ఉపకరణం సంచిక %s " "పై నడుస్తుంది." -#: lib/action.php:821 +#: lib/action.php:824 #, fuzzy msgid "Site content license" msgstr "కొత్త సందేశం" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "అన్నీ " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." -msgstr "" +msgstr "లైసెన్సు." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "పేజీకరణ" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "తర్వాత" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "ఇంతక్రితం" @@ -4849,7 +4823,6 @@ msgstr "ప్రాథమిక సైటు స్వరూపణం" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:350 -#, fuzzy msgctxt "MENU" msgid "Site" msgstr "సైటు" @@ -4861,7 +4834,6 @@ msgstr "రూపకల్పన స్వరూపణం" #. TRANS: Menu item for site administration #: lib/adminpanelaction.php:358 -#, fuzzy msgctxt "MENU" msgid "Design" msgstr "రూపురేఖలు" @@ -4910,7 +4882,7 @@ msgstr "SMS నిర్ధారణ" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4960,11 +4932,11 @@ msgstr "విహారిణి" #: lib/applicationeditform.php:274 msgid "Desktop" -msgstr "" +msgstr "మేజోపరి" #: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" -msgstr "" +msgstr "ఉపకరణ రకం, విహారిణి లేదా మేజోపరి" #: lib/applicationeditform.php:297 msgid "Read-only" @@ -5014,37 +4986,52 @@ msgstr "సంకేతపదం మార్పు" msgid "Password changing is not allowed" msgstr "సంకేతపదం మార్పు" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "ఆదేశ ఫలితాలు" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "ఆదేశం పూర్తయ్యింది" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "ఆదేశం విఫలమైంది" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "" +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు." + +#: lib/command.php:99 lib/command.php:570 +#, fuzzy +msgid "User has no last notice" +msgstr "వాడుకరికి ప్రొఫైలు లేదు." -#: lib/command.php:88 +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "వాడుకరిని తాజాకరించలేకున్నాం." -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "వాడుకరిని తాజాకరించలేకున్నాం." + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "క్షమించండి, ఈ ఆదేశం ఇంకా అమలుపరచబడలేదు." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "%sకి స్పందనలు" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5055,199 +5042,195 @@ msgstr "" "చందాదార్లు: %2$s\n" "నోటీసులు: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -#, fuzzy -msgid "User has no last notice" -msgstr "వాడుకరికి ప్రొఫైలు లేదు." - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు" -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "వాడుకరి %sని %s గుంపులో చేర్చలేకపోయాం" -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%s %s గుంపులో చేరారు" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "వాడుకరి %sని %s గుంపు నుండి తొలగించలేకపోయాం" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "పూర్తిపేరు: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "ప్రాంతం: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "హోంపేజీ: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "గురించి: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "%sకి నేరు సందేశాన్ని పంపించాం" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "మీ నోటిసుని మీరే పునరావృతించలేరు" -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "ఇప్పటికే ఈ నోటీసుని పునరావృతించారు" -#: lib/command.php:426 +#: lib/command.php:503 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "సందేశాలు" -#: lib/command.php:428 +#: lib/command.php:505 #, fuzzy msgid "Error repeating notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు" -#: lib/command.php:491 +#: lib/command.php:545 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "%sకి స్పందనలు" -#: lib/command.php:493 +#: lib/command.php:547 #, fuzzy msgid "Error saving notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "ఏవరికి చందా చేరాలనుకుంటున్నారో ఆ వాడుకరి పేరు తెలియజేయండి" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "అటువంటి వాడుకరి లేరు" +#: lib/command.php:602 +msgid "Can't subscribe to OMB profiles by command." +msgstr "" -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "%sకి చందా చేరారు" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "ఎవరి నుండి చందా విరమించాలనుకుంటున్నారో ఆ వాడుకరి పేరు తెలియజేయండి" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "%s నుండి చందా విరమించారు" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "ఈ లంకెని ఒకే సారి ఉపయోగించగలరు, మరియు అది పనిచేసేది 2 నిమిషాలు మాత్రమే: %s" -#: lib/command.php:692 -#, fuzzy, php-format +#: lib/command.php:735 +#, php-format msgid "Unsubscribed %s" msgstr "%s నుండి చందా విరమించారు" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "మీరు ఎవరికీ చందాచేరలేదు." -#: lib/command.php:711 +#: lib/command.php:754 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "%sకి స్పందనలు" msgstr[1] "%sకి స్పందనలు" -#: lib/command.php:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "మీకు చందాదార్లు ఎవరూ లేరు." -#: lib/command.php:733 +#: lib/command.php:776 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "%sకి స్పందనలు" msgstr[1] "%sకి స్పందనలు" -#: lib/command.php:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "మీరు ఏ గుంపులోనూ సభ్యులు కాదు." -#: lib/command.php:755 +#: lib/command.php:798 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" -#: lib/command.php:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5324,7 +5307,7 @@ msgstr "అనుసంధానాలు" #: lib/connectsettingsaction.php:121 msgid "Authorized connected applications" -msgstr "" +msgstr "అధీకృత అనుసంధాన ఉపకరణాలు" #: lib/dberroraction.php:60 msgid "Database error" @@ -5480,50 +5463,50 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:90 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం 140 అక్షరాలు." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "పాక్షిక ఎగుమతి." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "బొమ్మ కాదు లేదా పాడైపోయిన ఫైలు." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "" - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 #, fuzzy msgid "Lost our file." msgstr "అటువంటి సందేశమేమీ లేదు." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "తెలియని ఫైలు రకం" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "మెబై" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "కిబై" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, fuzzy, php-format msgid "Unknown inbox source %d." msgstr "గుర్తు తెలియని భాష \"%s\"" @@ -5672,6 +5655,20 @@ msgid "" "With kind regards,\n" "%5$s\n" msgstr "" +"%1$s (%2$s) మీకు ఒక అంతరంగిక సందేశాన్ని పంపించారు:\n" +"\n" +"------------------------------------------------------\n" +"%3$s\n" +"------------------------------------------------------\n" +"\n" +"వారి సందేశానికి మీరు ఇక్కడ జవాబివ్వవచ్చు:\n" +"\n" +"%4$s\n" +"\n" +"ఈ ఈమెయిలుకి స్పందించకండి; ఇది వారికి వెళ్ళదు.\n" +"\n" +"శుభాకాంక్షలతో,\n" +"%5$s\n" #: lib/mail.php:568 #, php-format @@ -5739,7 +5736,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "నుండి" @@ -5780,11 +5777,11 @@ msgstr "" #: lib/mediafile.php:152 msgid "The uploaded file was only partially uploaded." -msgstr "" +msgstr "ఎక్కించిన ఫైలు కేవలం పాక్షికంగా మాత్రమే ఎక్కింది." #: lib/mediafile.php:159 msgid "Missing a temporary folder." -msgstr "" +msgstr "తాత్కాలిక సంచయం కనబడటంలేదు." #: lib/mediafile.php:162 msgid "Failed to write file to disk." @@ -5830,7 +5827,6 @@ msgid "Available characters" msgstr "అందుబాటులో ఉన్న అక్షరాలు" #: lib/messageform.php:178 lib/noticeform.php:236 -#, fuzzy msgctxt "Send button for sending notice" msgid "Send" msgstr "పంపించు" @@ -5868,6 +5864,8 @@ msgid "" "Sorry, retrieving your geo location is taking longer than expected, please " "try again later" msgstr "" +"క్షమించండి, మీ భౌగోళిక ప్రాంతాన్ని తెలుసుకోవడం అనుకున్నదానికంటే ఎక్కవ సమయం తీసుకుంటూంది, దయచేసి " +"కాసేపాగి ప్రయత్నించండి" #: lib/noticelist.php:429 #, php-format @@ -5894,24 +5892,24 @@ msgstr "ప" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "సందర్భంలో" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 #, fuzzy msgid "Repeated by" msgstr "సృష్టితం" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "ఈ నోటీసుపై స్పందించండి" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "స్పందించండి" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 #, fuzzy msgid "Notice repeated" msgstr "నోటీసుని తొలగించాం." @@ -5948,7 +5946,7 @@ msgstr "కొత్త సందేశం" #: lib/oauthstore.php:490 msgid "Couldn't insert new subscription." -msgstr "" +msgstr "కొత్త చందాని చేర్చలేకపోయాం." #: lib/personalgroupnav.php:99 msgid "Personal" @@ -6092,7 +6090,7 @@ msgstr "ప్రజలు" #: lib/searchgroupnav.php:81 msgid "Find people on this site" -msgstr "" +msgstr "ఈ సైటులోని వ్యక్తులని కనుగొనండి" #: lib/searchgroupnav.php:83 msgid "Find content of notices" @@ -6100,11 +6098,11 @@ msgstr "" #: lib/searchgroupnav.php:85 msgid "Find groups on this site" -msgstr "" +msgstr "ఈ సైటులోని గుంపులని కనుగొనండి" #: lib/section.php:89 msgid "Untitled section" -msgstr "" +msgstr "శీర్షికలేని విభాగం" #: lib/section.php:106 msgid "More..." @@ -6142,7 +6140,7 @@ msgstr "ఆహ్వానించు" #: lib/subgroupnav.php:106 #, php-format msgid "Invite friends and colleagues to join you on %s" -msgstr "" +msgstr "%sలో తోడుకై మీ స్నేహితులని మరియు సహోద్యోగులని ఆహ్వానించండి" #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 @@ -6218,12 +6216,10 @@ msgid "Moderate" msgstr "" #: lib/userprofile.php:352 -#, fuzzy msgid "User role" -msgstr "వాడుకరి ప్రొఫైలు" +msgstr "వాడుకరి పాత్ర" #: lib/userprofile.php:354 -#, fuzzy msgctxt "role" msgid "Administrator" msgstr "నిర్వాహకులు" @@ -6231,49 +6227,49 @@ msgstr "నిర్వాహకులు" #: lib/userprofile.php:355 msgctxt "role" msgid "Moderator" -msgstr "" +msgstr "సమన్వయకర్త" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "కొన్ని క్షణాల క్రితం" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "ఓ నిమిషం క్రితం" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "%d నిమిషాల క్రితం" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "ఒక గంట క్రితం" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "%d గంటల క్రితం" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "ఓ రోజు క్రితం" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "%d రోజుల క్రితం" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "ఓ నెల క్రితం" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "%d నెలల క్రితం" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "ఒక సంవత్సరం క్రితం" @@ -6287,7 +6283,7 @@ msgstr "%s అనేది సరైన రంగు కాదు!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s అనేది సరైన రంగు కాదు! 3 లేదా 6 హెక్స్ అక్షరాలను వాడండి." -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు." diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 805e55268..07b518790 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:51:04+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:44:10+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -101,7 +101,7 @@ msgstr "Böyle bir durum mesajı yok." #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -110,10 +110,8 @@ msgstr "Böyle bir durum mesajı yok." #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Böyle bir kullanıcı yok." @@ -207,12 +205,12 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Onay kodu bulunamadı." @@ -346,7 +344,7 @@ msgstr "" msgid "This status is already a favorite." msgstr "Bu zaten sizin Jabber ID'niz." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "" @@ -471,7 +469,7 @@ msgstr "İstek bulunamadı!" msgid "You are already a member of that group." msgstr "Zaten giriş yapmış durumdasıznız!" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "" @@ -523,7 +521,7 @@ msgstr "Geçersiz büyüklük." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -667,12 +665,12 @@ msgstr "" msgid "Unsupported format." msgstr "Desteklenmeyen görüntü dosyası biçemi." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s'in %2$s'deki durum mesajları " -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s adli kullanicinin durum mesajlari" @@ -682,7 +680,7 @@ msgstr "%s adli kullanicinin durum mesajlari" msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s'in %2$s'deki durum mesajları " -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" @@ -692,7 +690,7 @@ msgstr "" msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -707,12 +705,12 @@ msgstr "%s için cevaplar" msgid "Repeats of %s" msgstr "%s için cevaplar" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%s adli kullanicinin durum mesajlari" @@ -775,7 +773,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "" @@ -860,8 +858,8 @@ msgstr "" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 #, fuzzy msgid "No such group." msgstr "Böyle bir durum mesajı yok." @@ -970,7 +968,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:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "" @@ -1030,7 +1028,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "Böyle bir durum mesajı yok." -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "" @@ -1301,7 +1299,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:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "Avatar bilgisi kaydedilemedi" @@ -2009,7 +2007,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -2111,7 +2109,7 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 #, fuzzy msgid "You are not a member of that group." msgstr "Bize o profili yollamadınız" @@ -2230,12 +2228,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "İçerik yok!" @@ -2243,7 +2241,7 @@ msgstr "İçerik yok!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2257,7 +2255,7 @@ msgstr "" msgid "Direct message to %s sent." msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "" @@ -2386,8 +2384,8 @@ msgstr "Bağlan" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "" @@ -2527,7 +2525,7 @@ msgstr "Eski parola yanlış" msgid "Error saving user; invalid." msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Yeni parola kaydedilemedi." @@ -3029,7 +3027,7 @@ msgstr "Parolayı sıfırla" msgid "Recover password" msgstr "Parolanı geri al" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Parola geri alma isteği" @@ -3049,19 +3047,19 @@ msgstr "Sıfırla" msgid "Enter a nickname or email address." msgstr "Bir takma ad veya eposta adresi girin." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Kullanıcı için kaydedilmiş eposta adresi yok." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Adres onayını kaydetmede hata." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3069,23 +3067,23 @@ msgstr "" "Hesabınıza eklemiş olduğunuz eposta adresine parolanızı geri getirmek için " "gerekli olan talimatlar yollanmıştır." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Beklemeğen parola sıfırlaması." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Parola ve onaylaması birbirini tutmuyor." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Kullanıcı ayarlamada hata oluştu." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız." @@ -3270,7 +3268,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:674 +#: actions/repeat.php:114 lib/noticelist.php:676 #, fuzzy msgid "Repeated" msgstr "Yarat" @@ -4488,19 +4486,19 @@ msgstr "Kişisel" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4581,7 +4579,7 @@ msgstr "Durum mesajını kaydederken hata oluştu." msgid "Problem saving group inbox." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4614,31 +4612,31 @@ msgstr "Abonelik silinemedi." msgid "Couldn't delete subscription OMB token." msgstr "Abonelik silinemedi." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Abonelik silinemedi." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: classes/User_group.php:477 +#: classes/User_group.php:480 #, fuzzy msgid "Could not create group." msgstr "Avatar bilgisi kaydedilemedi" -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Abonelik oluşturulamadı." -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "Abonelik oluşturulamadı." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Abonelik oluşturulamadı." @@ -4860,7 +4858,7 @@ msgstr "" msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4869,12 +4867,12 @@ msgstr "" "**%%site.name%%** [%%site.broughtby%%](%%site.broughtbyurl%%)\" tarafından " "hazırlanan anında mesajlaşma ağıdır. " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır." -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4885,43 +4883,43 @@ msgstr "" "licenses/agpl-3.0.html) lisansı ile korunan [StatusNet](http://status.net/) " "microbloglama yazılımının %s. versiyonunu kullanmaktadır." -#: lib/action.php:821 +#: lib/action.php:824 #, fuzzy msgid "Site content license" msgstr "Yeni durum mesajı" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "" -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "" -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#: lib/action.php:1164 #, fuzzy msgid "After" msgstr "« Sonra" -#: lib/action.php:1169 +#: lib/action.php:1172 #, fuzzy msgid "Before" msgstr "Önce »" @@ -5034,7 +5032,7 @@ msgstr "Eposta adresi onayı" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5142,37 +5140,51 @@ msgstr "Parola kaydedildi." msgid "Password changing is not allowed" msgstr "Parola kaydedildi." -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +#, fuzzy +msgid "User has no last notice" +msgstr "Kullanıcının profili yok." + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "Kullanıcı güncellenemedi." -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Kullanıcı güncellenemedi." + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "%s için cevaplar" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5180,202 +5192,199 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -#, fuzzy -msgid "User has no last notice" -msgstr "Kullanıcının profili yok." - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:317 #, fuzzy msgid "You are already a member of that group" msgstr "Zaten giriş yapmış durumdasıznız!" -#: lib/command.php:231 +#: lib/command.php:331 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "Sunucuya yönlendirme yapılamadı: %s" -#: lib/command.php:236 +#: lib/command.php:336 #, fuzzy, php-format msgid "%s joined group %s" msgstr "%1$s'in %2$s'deki durum mesajları " -#: lib/command.php:275 +#: lib/command.php:373 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "OpenID formu yaratılamadı: %s" -#: lib/command.php:280 +#: lib/command.php:378 #, fuzzy, php-format msgid "%s left group %s" msgstr "%1$s'in %2$s'deki durum mesajları " -#: lib/command.php:309 +#: lib/command.php:401 #, fuzzy, php-format msgid "Fullname: %s" msgstr "Tam İsim" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:490 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız." -#: lib/command.php:418 +#: lib/command.php:495 #, fuzzy msgid "Already repeated that notice" msgstr "Zaten giriş yapmış durumdasıznız!" -#: lib/command.php:426 +#: lib/command.php:503 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Durum mesajları" -#: lib/command.php:428 +#: lib/command.php:505 #, fuzzy msgid "Error repeating notice." msgstr "Durum mesajını kaydederken hata oluştu." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:545 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "%s için cevaplar" -#: lib/command.php:493 +#: lib/command.php:547 #, fuzzy msgid "Error saving notice." msgstr "Durum mesajını kaydederken hata oluştu." -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 +#: lib/command.php:602 #, fuzzy -msgid "No such user" -msgstr "Böyle bir kullanıcı yok." +msgid "Can't subscribe to OMB profiles by command." +msgstr "Bize o profili yollamadınız" -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Aboneliği sonlandır" -#: lib/command.php:709 +#: lib/command.php:752 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Bize o profili yollamadınız" -#: lib/command.php:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 #, fuzzy msgid "No one is subscribed to you." msgstr "Uzaktan abonelik" -#: lib/command.php:733 +#: lib/command.php:776 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Uzaktan abonelik" -#: lib/command.php:753 +#: lib/command.php:796 #, fuzzy msgid "You are not a member of any groups." msgstr "Bize o profili yollamadınız" -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5615,51 +5624,51 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Desteklenmeyen görüntü dosyası biçemi." + +#: lib/imagefile.php:90 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?" -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Kısmi yükleme." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Dosya yüklemede sistem hatası." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Bu bir resim dosyası değil ya da dosyada hata var" -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Desteklenmeyen görüntü dosyası biçemi." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 #, fuzzy msgid "Lost our file." msgstr "Böyle bir durum mesajı yok." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5864,7 +5873,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "" @@ -6020,26 +6029,26 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 #, fuzzy msgid "in context" msgstr "İçerik yok!" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 #, fuzzy msgid "Repeated by" msgstr "Yarat" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 #, fuzzy msgid "Reply" msgstr "cevapla" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 #, fuzzy msgid "Notice repeated" msgstr "Durum mesajları" @@ -6366,47 +6375,47 @@ msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "birkaç saniye önce" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "yaklaşık bir dakika önce" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "yaklaşık %d dakika önce" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "yaklaşık bir saat önce" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "yaklaşık %d saat önce" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "yaklaşık bir gün önce" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "yaklaşık %d gün önce" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "yaklaşık bir ay önce" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "yaklaşık %d ay önce" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "yaklaşık bir yıl önce" @@ -6420,7 +6429,7 @@ msgstr "Başlangıç sayfası adresi geçerli bir URL değil." msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 78aa5dc23..ab9a9bad1 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:51:07+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:44:13+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -97,7 +97,7 @@ msgstr "Немає такої сторінки" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -106,10 +106,8 @@ msgstr "Немає такої сторінки" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Такого користувача немає." @@ -208,12 +206,12 @@ msgstr "Оновлення від %1$s та друзів на %2$s!" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 msgid "API method not found." msgstr "API метод не знайдено." @@ -344,7 +342,7 @@ msgstr "Жодних статусів з таким ID." msgid "This status is already a favorite." msgstr "Цей статус вже є обраним." -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Не можна позначити як обране." @@ -463,7 +461,7 @@ msgstr "Групу не знайдено!" msgid "You are already a member of that group." msgstr "Ви вже є учасником цієї групи." -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "Адмін цієї групи заблокував Вашу присутність в ній." @@ -513,7 +511,7 @@ msgstr "Невірний токен." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -657,12 +655,12 @@ msgstr "" msgid "Unsupported format." msgstr "Формат не підтримується." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s / Обрані від %2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%1$s оновлення обраних від %2$s / %2$s." @@ -672,7 +670,7 @@ msgstr "%1$s оновлення обраних від %2$s / %2$s." msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Оновленні відповіді %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "%1$s оновив цю відповідь на допис від %2$s / %3$s." @@ -682,7 +680,7 @@ msgstr "%1$s оновив цю відповідь на допис від %2$s / msgid "%s public timeline" msgstr "%s загальна стрічка" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "%s оновлення від усіх!" @@ -697,12 +695,12 @@ msgstr "Повторено для %s" msgid "Repeats of %s" msgstr "Повторення %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Дописи позначені з %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Оновлення позначені з %1$s на %2$s!" @@ -762,7 +760,7 @@ msgid "Preview" msgstr "Перегляд" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "Видалити" @@ -845,8 +843,8 @@ msgstr "Збереження інформації про блокування з #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "Такої групи немає." @@ -947,7 +945,7 @@ msgstr "Ви не є власником цього додатку." #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "Виникли певні проблеми з токеном поточної сесії." @@ -1006,7 +1004,7 @@ msgstr "Ви впевненні, що бажаєте видалити цей д msgid "Do not delete this notice" msgstr "Не видаляти цей допис" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "Видалити допис" @@ -1259,7 +1257,7 @@ msgstr "опис надто довгий (%d знаків максимум)." msgid "Could not update group." msgstr "Не вдалося оновити групу." -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 msgid "Could not create aliases." msgstr "Неможна призначити додаткові імена." @@ -1961,7 +1959,7 @@ msgstr "Запросити нових користувачів" msgid "You are already subscribed to these users:" msgstr "Ви вже підписані до цих користувачів:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2093,7 +2091,7 @@ msgstr "%1$s приєднався до групи %2$s" msgid "You must be logged in to leave a group." msgstr "Ви повинні спочатку увійти на сайт, аби залишити групу." -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "Ви не є учасником цієї групи." @@ -2209,12 +2207,12 @@ msgstr "Скористайтесь цією формою для створенн msgid "New message" msgstr "Нове повідомлення" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "Ви не можете надіслати повідомлення цьому користувачеві." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Немає змісту!" @@ -2222,7 +2220,7 @@ msgstr "Немає змісту!" msgid "No recipient specified." msgstr "Жодного отримувача не визначено." -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2237,7 +2235,7 @@ msgstr "Повідомлення надіслано" msgid "Direct message to %s sent." msgstr "Пряме повідомлення для %s надіслано." -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Помилка в Ajax" @@ -2370,8 +2368,8 @@ msgstr "тип змісту " msgid "Only " msgstr "Лише " -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Такий формат даних не підтримується." @@ -2504,7 +2502,7 @@ msgstr "Старий пароль є неточним" msgid "Error saving user; invalid." msgstr "Помилка при збереженні користувача; недійсний." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Неможна зберегти новий пароль." @@ -2846,7 +2844,7 @@ msgstr "Не вдається відновити загальну стрічку #: actions/public.php:130 #, php-format msgid "Public timeline, page %d" -msgstr "Загальний стрічка, сторінка %d" +msgstr "Загальна стрічка, сторінка %d" #: actions/public.php:132 lib/publicgroupnav.php:79 msgid "Public timeline" @@ -3005,7 +3003,7 @@ msgstr "Скинути пароль" msgid "Recover password" msgstr "Відновити пароль" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Запит на відновлення паролю відправлено" @@ -3025,19 +3023,19 @@ msgstr "Скинути" msgid "Enter a nickname or email address." msgstr "Введіть ім’я або електронну адресу." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "Користувача з такою електронною адресою або ім’ям немає." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Для цього користувача немає зареєстрованої електронної адреси." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Помилка при збереженні підтвердження адреси." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3045,23 +3043,23 @@ msgstr "" "Інструкції з відновлення паролю було надіслано на електронну адресу, яку Ви " "вказали у налаштуваннях Вашого профілю." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Несподіване скидання паролю." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Пароль має складатись з 6-ти або більше знаків." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Пароль та підтвердження не співпадають." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Помилка в налаштуваннях користувача." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Новий пароль успішно збережено. Тепер Ви увійшли." @@ -3263,7 +3261,7 @@ msgstr "Ви не можете повторювати свої власні до msgid "You already repeated that notice." msgstr "Ви вже повторили цей допис." -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 msgid "Repeated" msgstr "Повторено" @@ -4513,7 +4511,7 @@ msgstr "Версія" msgid "Author(s)" msgstr "Автор(и)" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " @@ -4522,12 +4520,12 @@ msgstr "" "Ні, файл не може бути більшим за %d байтів, а те, що Ви хочете надіслати, " "важить %d байтів. Спробуйте меншу версію." -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "Розміри цього файлу перевищують Вашу квоту на %d байтів." -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Розміри цього файлу перевищують Вашу місячну квоту на %d байтів." @@ -4605,7 +4603,7 @@ msgstr "Проблема при збереженні допису." msgid "Problem saving group inbox." msgstr "Проблема при збереженні вхідних дописів для групи." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" @@ -4634,28 +4632,28 @@ msgstr "Не можу видалити самопідписку." msgid "Couldn't delete subscription OMB token." msgstr "Не вдається видалити токен підписки OMB." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Не вдалося видалити підписку." -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Вітаємо на %1$s, @%2$s!" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "Не вдалося створити нову групу." -#: classes/User_group.php:486 +#: classes/User_group.php:489 msgid "Could not set group URI." msgstr "Не вдалося встановити URI групи." -#: classes/User_group.php:507 +#: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Не вдалося встановити членство." -#: classes/User_group.php:521 +#: classes/User_group.php:524 msgid "Could not save local group info." msgstr "Не вдалося зберегти інформацію про локальну групу." @@ -4859,7 +4857,7 @@ msgstr "Бедж" msgid "StatusNet software license" msgstr "Ліцензія програмного забезпечення StatusNet" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4868,12 +4866,12 @@ msgstr "" "**%%site.name%%** — це сервіс мікроблоґів наданий вам [%%site.broughtby%%](%%" "site.broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** — це сервіс мікроблоґів. " -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4884,42 +4882,42 @@ msgstr "" "для мікроблоґів, версія %s, доступному під [GNU Affero General Public " "License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 msgid "Site content license" msgstr "Ліцензія змісту сайту" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "Зміст і дані %1$s є приватними і конфіденційними." -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "Авторські права на зміст і дані належать %1$s. Всі права захищено." -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" "Авторські права на зміст і дані належать розробникам. Всі права захищено." -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "Всі " -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "ліцензія." -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "Нумерація сторінок" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "Вперед" -#: lib/action.php:1169 +#: lib/action.php:1172 msgid "Before" msgstr "Назад" @@ -5023,7 +5021,7 @@ msgstr "" "API-ресурс вимагає дозвіл типу «читання-запис», але у вас є лише доступ для " "читання." -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5123,37 +5121,50 @@ msgstr "Не вдалося змінити пароль" msgid "Password changing is not allowed" msgstr "Змінювати пароль не дозволено" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "Результати команди" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "Команду виконано" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "Команду не виконано" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "Даруйте, але виконання команди ще не завершено." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" +msgstr "Такого допису не існує" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "Користувач не має останнього допису" + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "Не вдалося знайти користувача з іменем %s" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Не вдалося знайти користувача з іменем %s" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "Даруйте, але виконання команди ще не завершено." + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Гадаємо, користі від «розштовхування» самого себе небагато, чи не так?!" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "Спробу «розштовхати» %s зараховано" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5164,199 +5175,198 @@ msgstr "" "Підписчики: %2$s\n" "Дописи: %3$s" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "Такого допису не існує" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "Користувач не має останнього допису" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "Допис позначено як обраний." -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "Ви вже є учасником цієї групи." -#: lib/command.php:231 +#: lib/command.php:331 #, php-format msgid "Could not join user %s to group %s" msgstr "Не вдалось долучити користувача %1$s до групи %2$s." -#: lib/command.php:236 +#: lib/command.php:336 #, php-format msgid "%s joined group %s" msgstr "%1$s приєднався до групи %2$s" -#: lib/command.php:275 +#: lib/command.php:373 #, php-format msgid "Could not remove user %s to group %s" msgstr "Не вдалося видалити користувача %1$s з групи %2$s." -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%1$s залишив групу %2$s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "Повне ім’я: %s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "Локація: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "Веб-сторінка: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "Про мене: %s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "Повідомлення надто довге — максимум %d знаків, а ви надсилаєте %d" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "Пряме повідомлення для %s надіслано." -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "Помилка при відправці прямого повідомлення." -#: lib/command.php:413 +#: lib/command.php:490 msgid "Cannot repeat your own notice" msgstr "Не можу повторити Ваш власний допис" -#: lib/command.php:418 +#: lib/command.php:495 msgid "Already repeated that notice" msgstr "Цей допис вже повторили" -#: lib/command.php:426 +#: lib/command.php:503 #, php-format msgid "Notice from %s repeated" msgstr "Допис %s повторили" -#: lib/command.php:428 +#: lib/command.php:505 msgid "Error repeating notice." msgstr "Помилка при повторенні допису." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Допис надто довгий — максимум %d знаків, а ви надсилаєте %d" -#: lib/command.php:491 +#: lib/command.php:545 #, php-format msgid "Reply to %s sent" msgstr "Відповідь до %s надіслано" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "Проблема при збереженні допису." -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "Зазначте ім’я користувача, до якого бажаєте підписатись" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "Такого користувача немає." +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "Ви не підписані до цього профілю." -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "Підписано до %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "Зазначте ім’я користувача, від якого бажаєте відписатись" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "Відписано від %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "Виконання команди ще не завершено." -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "Сповіщення вимкнуто." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "Не можна вимкнути сповіщення." -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "Сповіщення увімкнуто." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "Не можна увімкнути сповіщення." -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "Команду входу відключено" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" "Це посилання можна використати лише раз, воно дійсне протягом 2 хвилин: %s" -#: lib/command.php:692 +#: lib/command.php:735 #, php-format msgid "Unsubscribed %s" msgstr "Відписано %s" -#: lib/command.php:709 +#: lib/command.php:752 msgid "You are not subscribed to anyone." msgstr "Ви не маєте жодних підписок." -#: lib/command.php:711 +#: lib/command.php:754 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ви підписані до цієї особи:" msgstr[1] "Ви підписані до цих людей:" msgstr[2] "Ви підписані до цих людей:" -#: lib/command.php:731 +#: lib/command.php:774 msgid "No one is subscribed to you." msgstr "До Вас ніхто не підписаний." -#: lib/command.php:733 +#: lib/command.php:776 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Ця особа є підписаною до Вас:" msgstr[1] "Ці люди підписані до Вас:" msgstr[2] "Ці люди підписані до Вас:" -#: lib/command.php:753 +#: lib/command.php:796 msgid "You are not a member of any groups." msgstr "Ви не є учасником жодної групи." -#: lib/command.php:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5622,49 +5632,49 @@ msgstr "Теґи у дописах групи %s" msgid "This page is not available in a media type you accept" msgstr "Ця сторінка не доступна для того типу медіа, з яким ви погодились" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Формат зображення не підтримується." + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Цей файл завеликий. Максимальний розмір %s." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Часткове завантаження." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Система відповіла помилкою при завантаженні цього файла." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "Це не зображення, або файл зіпсовано." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Формат зображення не підтримується." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 msgid "Lost our file." msgstr "Файл втрачено." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "Тип файлу не підтримується" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "Мб" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "кб" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "[%s]" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "Невідоме джерело вхідного повідомлення %d." @@ -5945,7 +5955,7 @@ msgstr "" "повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите " "лише Ви." -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "від" @@ -6100,23 +6110,23 @@ msgstr "Зах." msgid "at" msgstr "в" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 msgid "in context" msgstr "в контексті" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 msgid "Repeated by" msgstr "Повторено" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "Відповісти на цей допис" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Відповісти" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 msgid "Notice repeated" msgstr "Допис повторили" @@ -6426,47 +6436,47 @@ msgctxt "role" msgid "Moderator" msgstr "Модератор" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "мить тому" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "хвилину тому" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "близько %d хвилин тому" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "годину тому" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "близько %d годин тому" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "день тому" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "близько %d днів тому" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "місяць тому" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "близько %d місяців тому" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "рік тому" @@ -6480,7 +6490,7 @@ msgstr "%s є неприпустимим кольором!" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s неприпустимий колір! Використайте 3 або 6 знаків (HEX-формат)" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 59751aa5d..3848e101c 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:51:10+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:44:16+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -100,7 +100,7 @@ msgstr "Không có tin nhắn nào." #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -109,10 +109,8 @@ msgstr "Không có tin nhắn nào." #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "Không có user nào." @@ -206,12 +204,12 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "Phương thức API không tìm thấy!" @@ -347,7 +345,7 @@ msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó." msgid "This status is already a favorite." msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "Không thể tạo favorite." @@ -473,7 +471,7 @@ msgstr "Phương thức API không tìm thấy!" msgid "You are already a member of that group." msgstr "Bạn đã theo những người này:" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "" @@ -525,7 +523,7 @@ msgstr "Kích thước không hợp lệ." #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -668,12 +666,12 @@ msgstr "" msgid "Unsupported format." msgstr "Không hỗ trợ kiểu file ảnh này." -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "Tìm kiếm các tin nhắn ưa thích của %s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, 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" @@ -683,7 +681,7 @@ msgstr "Tất cả các cập nhật của %s" msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / Các cập nhật đang trả lời tới %2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" @@ -693,7 +691,7 @@ msgstr "" msgid "%s public timeline" msgstr "Dòng tin công cộng" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 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!" @@ -708,12 +706,12 @@ msgstr "Trả lời cho %s" msgid "Repeats of %s" msgstr "Trả lời cho %s" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "Thông báo được gắn thẻ %s" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "Dòng tin nhắn cho %s" @@ -778,7 +776,7 @@ msgid "Preview" msgstr "Xem trước" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 #, fuzzy msgid "Delete" msgstr "Xóa tin nhắn" @@ -865,8 +863,8 @@ msgstr "" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 #, fuzzy msgid "No such group." msgstr "Không có tin nhắn nào." @@ -974,7 +972,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:1217 +#: lib/action.php:1220 #, 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." @@ -1036,7 +1034,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:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 #, fuzzy msgid "Delete this notice" msgstr "Xóa tin nhắn" @@ -1320,7 +1318,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:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "Không thể tạo favorite." @@ -2055,7 +2053,7 @@ msgstr "Gửi thư mời đến những người chưa có tài khoản" msgid "You are already subscribed to these users:" msgstr "Bạn đã theo những người này:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, fuzzy, php-format msgid "%1$s (%2$s)" msgstr "%s (%s)" @@ -2192,7 +2190,7 @@ msgstr "%s và nhóm" msgid "You must be logged in to leave a group." msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những " -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 #, fuzzy msgid "You are not a member of that group." msgstr "Bạn chưa cập nhật thông tin riêng" @@ -2313,13 +2311,13 @@ msgstr "" msgid "New message" msgstr "Tin mới nhất" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 #, fuzzy msgid "You can't send a message to this user." msgstr "Bạn đã theo những người này:" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "Không có nội dung!" @@ -2327,7 +2325,7 @@ msgstr "Không có nội dung!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2342,7 +2340,7 @@ msgstr "Tin mới nhất" msgid "Direct message to %s sent." msgstr "Tin nhắn riêng" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 #, fuzzy msgid "Ajax Error" msgstr "Lỗi" @@ -2475,8 +2473,8 @@ msgstr "Kết nối" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "Không hỗ trợ định dạng dữ liệu này." @@ -2620,7 +2618,7 @@ msgstr "Mật khẩu cũ sai" msgid "Error saving user; invalid." msgstr "Lỗi xảy ra khi lưu thành viên; không hợp lệ." -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "Không thể lưu mật khẩu mới" @@ -3128,7 +3126,7 @@ msgstr "Khởi tạo lại mật khẩu" msgid "Recover password" msgstr "Khôi phục mật khẩu" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "Yêu cầu khôi phục lại mật khẩu đã được gửi" @@ -3148,20 +3146,20 @@ msgstr "Khởi tạo" msgid "Enter a nickname or email address." msgstr "Nhập biệt hiệu hoặc email." -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" "Không tìm thấy người dùng nào tương ứng với địa chỉ email hoặc username đó." -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "Thành viên này đã không đăng ký địa chỉ email." -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "Lỗi xảy ra khi lưu địa chỉ đã được xác nhận." -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." @@ -3169,23 +3167,23 @@ msgstr "" "Hướng dẫn cách khôi phục mật khẩu đã được gửi đến địa chỉ email đăng ký " "trong tài khoản của bạn." -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "Bất ngờ reset mật khẩu." -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "Mật khẩu phải nhiều hơn 6 ký tự." -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "Mật khẩu và mật khẩu xác nhận không khớp nhau." -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "Lỗi xảy ra khi tạo thành viên." -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "Mật khẩu mới đã được lưu. Bạn có thể đăng nhập ngay bây giờ." @@ -3389,7 +3387,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:674 +#: actions/repeat.php:114 lib/noticelist.php:676 #, fuzzy msgid "Repeated" msgstr "Tạo" @@ -4638,19 +4636,19 @@ msgstr "Cá nhân" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4734,7 +4732,7 @@ msgstr "Có lỗi xảy ra khi lưu tin nhắn." msgid "Problem saving group inbox." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%s (%s)" @@ -4767,31 +4765,31 @@ msgstr "Không thể xóa đăng nhận." msgid "Couldn't delete subscription OMB token." msgstr "Không thể xóa đăng nhận." -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "Không thể xóa đăng nhận." -#: classes/User.php:373 +#: classes/User.php:378 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%s chào mừng bạn " -#: classes/User_group.php:477 +#: classes/User_group.php:480 #, fuzzy msgid "Could not create group." msgstr "Không thể tạo favorite." -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "Không thể tạo đăng nhận." -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "Không thể tạo đăng nhận." -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "Không thể tạo đăng nhận." @@ -5017,7 +5015,7 @@ msgstr "Tin đã gửi" msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -5026,12 +5024,12 @@ msgstr "" "**%%site.name%%** là dịch vụ gửi tin nhắn được cung cấp từ [%%site.broughtby%" "%](%%site.broughtbyurl%%). " -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn. " -#: lib/action.php:806 +#: lib/action.php:809 #, fuzzy, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -5042,43 +5040,43 @@ msgstr "" "quyền [GNU Affero General Public License](http://www.fsf.org/licensing/" "licenses/agpl-3.0.html)." -#: lib/action.php:821 +#: lib/action.php:824 #, fuzzy msgid "Site content license" msgstr "Tìm theo nội dung của tin nhắn" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "" -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "" -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#: lib/action.php:1164 #, fuzzy msgid "After" msgstr "Sau" -#: lib/action.php:1169 +#: lib/action.php:1172 #, fuzzy msgid "Before" msgstr "Trước" @@ -5194,7 +5192,7 @@ msgstr "Xác nhận SMS" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5300,39 +5298,54 @@ msgstr "Đã lưu mật khẩu." msgid "Password changing is not allowed" msgstr "Đã lưu mật khẩu." -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 #, fuzzy msgid "Command results" msgstr "Không có kết quả nào" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "" -#: lib/channel.php:221 +#: lib/channel.php:240 #, fuzzy msgid "Command failed" msgstr " và bạn bè" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "" +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó." -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +#, fuzzy +msgid "User has no last notice" +msgstr "Người dùng không có thông tin." + +#: lib/command.php:125 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận." -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận." + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "Tin đã gửi" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5340,207 +5353,203 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó." - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -#, fuzzy -msgid "User has no last notice" -msgstr "Người dùng không có thông tin." - -#: lib/command.php:190 +#: lib/command.php:296 #, fuzzy msgid "Notice marked as fave." msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!" -#: lib/command.php:217 +#: lib/command.php:317 #, fuzzy msgid "You are already a member of that group" msgstr "Bạn đã theo những người này:" -#: lib/command.php:231 +#: lib/command.php:331 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi." -#: lib/command.php:236 +#: lib/command.php:336 #, fuzzy, php-format msgid "%s joined group %s" msgstr "%s và nhóm" -#: lib/command.php:275 +#: lib/command.php:373 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi." -#: lib/command.php:280 +#: lib/command.php:378 #, fuzzy, php-format msgid "%s left group %s" msgstr "%s và nhóm" -#: lib/command.php:309 +#: lib/command.php:401 #, fuzzy, php-format msgid "Fullname: %s" msgstr "Tên đầy đủ" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, fuzzy, php-format msgid "Location: %s" msgstr "Thành phố: %s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, fuzzy, php-format msgid "Homepage: %s" msgstr "Trang chủ hoặc Blog: %s" -#: lib/command.php:318 +#: lib/command.php:410 #, fuzzy, php-format msgid "About: %s" msgstr "Giới thiệu" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:367 +#: lib/command.php:468 #, fuzzy, php-format msgid "Direct message to %s sent" msgstr "Tin nhắn riêng" -#: lib/command.php:369 +#: lib/command.php:470 #, fuzzy msgid "Error sending direct message." msgstr "Thư bạn đã gửi" -#: lib/command.php:413 +#: lib/command.php:490 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Bạn không thể đăng ký nếu không đồng ý các điều khoản." -#: lib/command.php:418 +#: lib/command.php:495 #, fuzzy msgid "Already repeated that notice" msgstr "Xóa tin nhắn" -#: lib/command.php:426 +#: lib/command.php:503 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Tin đã gửi" -#: lib/command.php:428 +#: lib/command.php:505 #, fuzzy msgid "Error repeating notice." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:545 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Trả lời tin nhắn này" -#: lib/command.php:493 +#: lib/command.php:547 #, fuzzy msgid "Error saving notice." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 +#: lib/command.php:602 #, fuzzy -msgid "No such user" -msgstr "Không có user nào." +msgid "Can't subscribe to OMB profiles by command." +msgstr "Bạn chưa cập nhật thông tin riêng" -#: lib/command.php:561 +#: lib/command.php:608 #, fuzzy, php-format msgid "Subscribed to %s" msgstr "Theo nhóm này" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:638 #, fuzzy, php-format msgid "Unsubscribed from %s" msgstr "Hết theo" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:659 #, fuzzy msgid "Notification off." msgstr "Không có mã số xác nhận." -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:682 #, fuzzy msgid "Notification on." msgstr "Không có mã số xác nhận." -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "Hết theo" -#: lib/command.php:709 +#: lib/command.php:752 #, 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:711 +#: lib/command.php:754 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:731 +#: lib/command.php:774 #, fuzzy msgid "No one is subscribed to you." msgstr "Không thể tạo favorite." -#: lib/command.php:733 +#: lib/command.php:776 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:753 +#: lib/command.php:796 #, 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:755 +#: lib/command.php:798 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:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5785,53 +5794,53 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận." -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "Không hỗ trợ kiểu file ảnh này." + +#: lib/imagefile.php:90 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" "Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin " "về bạn." -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "Upload từng phần." -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Hệ thống xảy ra lỗi trong khi tải file." -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "File hỏng hoặc không phải là file ảnh." -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "Không hỗ trợ kiểu file ảnh này." - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 #, fuzzy msgid "Lost our file." msgstr "Không có tin nhắn nào." -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 #, fuzzy msgid "Unknown file type" msgstr "Không hỗ trợ kiểu file ảnh này." -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -6086,7 +6095,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 #, fuzzy msgid "from" msgstr " từ " @@ -6246,26 +6255,26 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 #, fuzzy msgid "in context" msgstr "Không có nội dung!" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 #, fuzzy msgid "Repeated by" msgstr "Tạo" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 #, fuzzy msgid "Reply to this notice" msgstr "Trả lời tin nhắn này" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "Trả lời" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 #, fuzzy msgid "Notice repeated" msgstr "Tin đã gửi" @@ -6608,47 +6617,47 @@ msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "vài giây trước" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "1 phút trước" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "%d phút trước" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "1 giờ trước" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "%d giờ trước" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "1 ngày trước" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "%d ngày trước" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "1 tháng trước" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "%d tháng trước" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "1 năm trước" @@ -6662,7 +6671,7 @@ msgstr "Trang chủ không phải là URL" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index cc1761616..e6542c3a7 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:51:13+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:44:18+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -102,7 +102,7 @@ msgstr "没有该页面" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -111,10 +111,8 @@ msgstr "没有该页面" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "没有这个用户。" @@ -208,12 +206,12 @@ msgstr "来自%2$s 上 %1$s 和好友的更新！" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "API 方法未实现！" @@ -347,7 +345,7 @@ msgstr "没有找到此ID的信息。" msgid "This status is already a favorite." msgstr "已收藏此通告！" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "无法创建收藏。" @@ -471,7 +469,7 @@ msgstr "API 方法未实现！" msgid "You are already a member of that group." msgstr "您已经是该组成员" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "" @@ -523,7 +521,7 @@ msgstr "大小不正确。" #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -666,12 +664,12 @@ msgstr "" msgid "Unsupported format." msgstr "不支持这种图像格式。" -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%s 的收藏 / %s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "%s 收藏了 %s 的 %s 通告。" @@ -681,7 +679,7 @@ msgstr "%s 收藏了 %s 的 %s 通告。" msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s / 回复 %2$s 的消息" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "回复 %2$s / %3$s 的 %1$s 更新。" @@ -691,7 +689,7 @@ msgstr "回复 %2$s / %3$s 的 %1$s 更新。" msgid "%s public timeline" msgstr "%s 公众时间表" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "来自所有人的 %s 消息！" @@ -706,12 +704,12 @@ msgstr "%s 的回复" msgid "Repeats of %s" msgstr "%s 的回复" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "带 %s 标签的通告" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%2$s 上 %1$s 的更新！" @@ -773,7 +771,7 @@ msgid "Preview" msgstr "预览" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 #, fuzzy msgid "Delete" msgstr "删除" @@ -859,8 +857,8 @@ msgstr "保存阻止信息失败。" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 msgid "No such group." msgstr "没有这个组。" @@ -970,7 +968,7 @@ msgstr "您未告知此个人信息" #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1220 #, fuzzy msgid "There was a problem with your session token." msgstr "会话标识有问题，请重试。" @@ -1032,7 +1030,7 @@ msgstr "确定要删除这条消息吗？" msgid "Do not delete this notice" msgstr "无法删除通告。" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 #, fuzzy msgid "Delete this notice" msgstr "删除通告" @@ -1308,7 +1306,7 @@ msgstr "描述过长(不能超过140字符)。" msgid "Could not update group." msgstr "无法更新组" -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "无法创建收藏。" @@ -2026,7 +2024,7 @@ msgstr "邀请新用户" msgid "You are already subscribed to these users:" msgstr "您已订阅这些用户：" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -2150,7 +2148,7 @@ msgstr "%s 加入 %s 组" msgid "You must be logged in to leave a group." msgstr "您必须登录才能邀请其他人使用 %s" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 #, fuzzy msgid "You are not a member of that group." msgstr "您未告知此个人信息" @@ -2267,12 +2265,12 @@ msgstr "使用此表格创建组。" msgid "New message" msgstr "新消息" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "无法向此用户发送消息。" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "没有内容！" @@ -2280,7 +2278,7 @@ msgstr "没有内容！" msgid "No recipient specified." msgstr "没有收件人。" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "不要向自己发送消息；跟自己悄悄说就得了。" @@ -2295,7 +2293,7 @@ msgstr "新消息" msgid "Direct message to %s sent." msgstr "已向 %s 发送消息" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "Ajax错误" @@ -2425,8 +2423,8 @@ msgstr "连接" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "不支持的数据格式。" @@ -2567,7 +2565,7 @@ msgstr "旧密码不正确" msgid "Error saving user; invalid." msgstr "保存用户时出错；不正确。" -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "无法保存新密码。" @@ -3069,7 +3067,7 @@ msgstr "重置密码" msgid "Recover password" msgstr "恢复密码" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "请求恢复密码" @@ -3089,41 +3087,41 @@ msgstr "重置" msgid "Enter a nickname or email address." msgstr "输入昵称或电子邮件。" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "没有拥有这个用户名或电子邮件的用户。" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "用户没有注册电子邮件。" -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "保存地址确认时出错。" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "恢复密码的指示已被发送到您的注册邮箱。" -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "未预料的密码重置。" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "密码必须是 6 个字符或更多。" -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "密码和确认不匹配。" -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "保存用户设置时出错。" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "新密码已保存，您现在已登录。" @@ -3323,7 +3321,7 @@ msgstr "您必须同意此授权方可注册。" msgid "You already repeated that notice." msgstr "您已成功阻止该用户：" -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 #, fuzzy msgid "Repeated" msgstr "创建" @@ -4566,19 +4564,19 @@ msgstr "个人" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4661,7 +4659,7 @@ msgstr "保存通告时出错。" msgid "Problem saving group inbox." msgstr "保存通告时出错。" -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" @@ -4695,30 +4693,30 @@ msgstr "无法删除订阅。" msgid "Couldn't delete subscription OMB token." msgstr "无法删除订阅。" -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "无法删除订阅。" -#: classes/User.php:373 +#: classes/User.php:378 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "发送给 %1$s 的 %2$s 消息" -#: classes/User_group.php:477 +#: classes/User_group.php:480 msgid "Could not create group." msgstr "无法创建组。" -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "无法删除订阅。" -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "无法删除订阅。" -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "无法删除订阅。" @@ -4945,7 +4943,7 @@ msgstr "呼叫" msgid "StatusNet software license" msgstr "StatusNet软件注册证" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4954,12 +4952,12 @@ msgstr "" "**%%site.name%%** 是一个微博客服务，提供者为 [%%site.broughtby%%](%%site." "broughtbyurl%%)。" -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** 是一个微博客服务。" -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4970,43 +4968,43 @@ msgstr "" "General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)" "授权。" -#: lib/action.php:821 +#: lib/action.php:824 #, fuzzy msgid "Site content license" msgstr "StatusNet软件注册证" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "全部" -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "注册证" -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "分页" -#: lib/action.php:1161 +#: lib/action.php:1164 #, fuzzy msgid "After" msgstr "« 之后" -#: lib/action.php:1169 +#: lib/action.php:1172 #, fuzzy msgid "Before" msgstr "之前 »" @@ -5124,7 +5122,7 @@ msgstr "SMS短信确认" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5230,37 +5228,51 @@ msgstr "密码已保存。" msgid "Password changing is not allowed" msgstr "密码已保存。" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "执行结果" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "执行完毕" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "执行失败" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." -msgstr "对不起，这个命令还没有实现。" +#: lib/command.php:83 lib/command.php:105 +#, fuzzy +msgid "Notice with that id does not exist" +msgstr "没有找到此ID的信息。" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +msgid "User has no last notice" +msgstr "用户没有通告。" + +#: lib/command.php:125 #, fuzzy, php-format msgid "Could not find a user with nickname %s" msgstr "无法更新已确认的电子邮件。" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "无法更新已确认的电子邮件。" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "对不起，这个命令还没有实现。" + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, fuzzy, php-format msgid "Nudge sent to %s" msgstr "振铃呼叫发出。" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5268,200 +5280,198 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -#, fuzzy -msgid "Notice with that id does not exist" -msgstr "没有找到此ID的信息。" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -msgid "User has no last notice" -msgstr "用户没有通告。" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "通告被标记为收藏。" -#: lib/command.php:217 +#: lib/command.php:317 msgid "You are already a member of that group" msgstr "您已经是该组成员" -#: lib/command.php:231 +#: lib/command.php:331 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "无法把 %s 用户添加到 %s 组" -#: lib/command.php:236 +#: lib/command.php:336 #, fuzzy, php-format msgid "%s joined group %s" msgstr "%s 加入 %s 组" -#: lib/command.php:275 +#: lib/command.php:373 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "无法订阅用户：未找到。" -#: lib/command.php:280 +#: lib/command.php:378 #, php-format msgid "%s left group %s" msgstr "%s 离开群 %s" -#: lib/command.php:309 +#: lib/command.php:401 #, php-format msgid "Fullname: %s" msgstr "全名：%s" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "位置：%s" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "主页：%s" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "关于：%s" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "已向 %s 发送消息" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "发送消息出错。" -#: lib/command.php:413 +#: lib/command.php:490 #, fuzzy msgid "Cannot repeat your own notice" msgstr "无法开启通告。" -#: lib/command.php:418 +#: lib/command.php:495 #, fuzzy msgid "Already repeated that notice" msgstr "删除通告" -#: lib/command.php:426 +#: lib/command.php:503 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "消息已发布。" -#: lib/command.php:428 +#: lib/command.php:505 #, fuzzy msgid "Error repeating notice." msgstr "保存通告时出错。" -#: lib/command.php:482 +#: lib/command.php:536 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。" -#: lib/command.php:491 +#: lib/command.php:545 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "无法删除通告。" -#: lib/command.php:493 +#: lib/command.php:547 #, fuzzy msgid "Error saving notice." msgstr "保存通告时出错。" -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "指定要订阅的用户名" -#: lib/command.php:554 lib/command.php:589 -msgid "No such user" -msgstr "没有这个用户。" +#: lib/command.php:602 +#, fuzzy +msgid "Can't subscribe to OMB profiles by command." +msgstr "您未告知此个人信息" -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "订阅 %s" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "指定要取消订阅的用户名" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "取消订阅 %s" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "命令尚未实现。" -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "通告关闭。" -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "无法关闭通告。" -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "通告开启。" -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "无法开启通告。" -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "取消订阅 %s" -#: lib/command.php:709 +#: lib/command.php:752 #, fuzzy msgid "You are not subscribed to anyone." msgstr "您未告知此个人信息" -#: lib/command.php:711 +#: lib/command.php:754 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "您已订阅这些用户：" -#: lib/command.php:731 +#: lib/command.php:774 #, fuzzy msgid "No one is subscribed to you." msgstr "无法订阅他人更新。" -#: lib/command.php:733 +#: lib/command.php:776 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "无法订阅他人更新。" -#: lib/command.php:753 +#: lib/command.php:796 #, fuzzy msgid "You are not a member of any groups." msgstr "您未告知此个人信息" -#: lib/command.php:755 +#: lib/command.php:798 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "您未告知此个人信息" -#: lib/command.php:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5704,50 +5714,50 @@ msgstr "这个组所发布的消息的标签" msgid "This page is not available in a media type you accept" msgstr "这个页面不提供您想要的媒体类型" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "不支持这种图像格式。" + +#: lib/imagefile.php:90 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "你可以给你的组上载一个logo图。" -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "部分上传。" -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "上传文件时出错。" -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "不是图片文件或文件已损坏。" -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "不支持这种图像格式。" - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 #, fuzzy msgid "Lost our file." msgstr "没有这份通告。" -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "未知文件类型" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5960,7 +5970,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 #, fuzzy msgid "from" msgstr " 从 " @@ -6119,27 +6129,27 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 #, fuzzy msgid "in context" msgstr "没有内容！" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 #, fuzzy msgid "Repeated by" msgstr "创建" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 #, fuzzy msgid "Reply to this notice" msgstr "无法删除通告。" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 #, fuzzy msgid "Reply" msgstr "回复" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 #, fuzzy msgid "Notice repeated" msgstr "消息已发布。" @@ -6479,47 +6489,47 @@ msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "几秒前" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "一分钟前" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "%d 分钟前" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "一小时前" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "%d 小时前" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "一天前" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "%d 天前" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "一个月前" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "%d 个月前" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "一年前" @@ -6533,7 +6543,7 @@ msgstr "主页的URL不正确。" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, fuzzy, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 3ea887beb..ae1cd9546 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-03-06 23:49+0000\n" -"PO-Revision-Date: 2010-03-06 23:51:15+0000\n" +"POT-Creation-Date: 2010-03-12 23:41+0000\n" +"PO-Revision-Date: 2010-03-12 23:44:21+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63655); 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" @@ -97,7 +97,7 @@ msgstr "無此通知" #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 +#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 @@ -106,10 +106,8 @@ msgstr "無此通知" #: actions/remotesubscribe.php:154 actions/replies.php:73 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40 -#: actions/xrds.php:71 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 +#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59 +#: lib/mailbox.php:82 lib/profileaction.php:77 msgid "No such user." msgstr "無此使用者" @@ -203,12 +201,12 @@ msgstr "" #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 -#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184 -#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148 +#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:174 +#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173 +#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:151 #: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160 +#: actions/apitimelineuser.php:162 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "確認碼遺失" @@ -340,7 +338,7 @@ msgstr "" msgid "This status is already a favorite." msgstr "" -#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 +#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279 msgid "Could not create favorite." msgstr "" @@ -462,7 +460,7 @@ msgstr "目前無請求" msgid "You are already a member of that group." msgstr "" -#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321 msgid "You have been blocked from that group by the admin." msgstr "" @@ -514,7 +512,7 @@ msgstr "尺寸錯誤" #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135 #: actions/othersettings.php:145 actions/passwordsettings.php:138 -#: actions/profilesettings.php:194 actions/recoverpassword.php:337 +#: actions/profilesettings.php:194 actions/recoverpassword.php:350 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38 #: actions/subscribe.php:86 actions/tagother.php:166 @@ -656,12 +654,12 @@ msgstr "" msgid "Unsupported format." msgstr "" -#: actions/apitimelinefavorites.php:108 +#: actions/apitimelinefavorites.php:109 #, fuzzy, php-format msgid "%1$s / Favorites from %2$s" msgstr "%1$s的狀態是%2$s" -#: actions/apitimelinefavorites.php:117 +#: actions/apitimelinefavorites.php:118 #, fuzzy, php-format msgid "%1$s updates favorited by %2$s / %2$s." msgstr "&s的微型部落格" @@ -671,7 +669,7 @@ msgstr "&s的微型部落格" msgid "%1$s / Updates mentioning %2$s" msgstr "%1$s的狀態是%2$s" -#: actions/apitimelinementions.php:127 +#: actions/apitimelinementions.php:130 #, php-format msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "" @@ -681,7 +679,7 @@ msgstr "" msgid "%s public timeline" msgstr "" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:112 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "" @@ -696,12 +694,12 @@ msgstr "" msgid "Repeats of %s" msgstr "" -#: actions/apitimelinetag.php:102 actions/tag.php:67 +#: actions/apitimelinetag.php:104 actions/tag.php:67 #, php-format msgid "Notices tagged with %s" msgstr "" -#: actions/apitimelinetag.php:104 actions/tagrss.php:65 +#: actions/apitimelinetag.php:106 actions/tagrss.php:65 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "&s的微型部落格" @@ -764,7 +762,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:655 +#: lib/deleteuserform.php:66 lib/noticelist.php:657 msgid "Delete" msgstr "" @@ -849,8 +847,8 @@ msgstr "" #: actions/groupunblock.php:86 actions/joingroup.php:82 #: actions/joingroup.php:93 actions/leavegroup.php:82 #: actions/leavegroup.php:93 actions/makeadmin.php:86 -#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 -#: lib/command.php:260 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162 +#: lib/command.php:358 #, fuzzy msgid "No such group." msgstr "無此通知" @@ -959,7 +957,7 @@ msgstr "無法連結到伺服器:%s" #: actions/deleteapplication.php:102 actions/editapplication.php:127 #: actions/newapplication.php:110 actions/showapplication.php:118 -#: lib/action.php:1217 +#: lib/action.php:1220 msgid "There was a problem with your session token." msgstr "" @@ -1019,7 +1017,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "無此通知" -#: actions/deletenotice.php:146 lib/noticelist.php:655 +#: actions/deletenotice.php:146 lib/noticelist.php:657 msgid "Delete this notice" msgstr "" @@ -1288,7 +1286,7 @@ msgstr "自我介紹過長(共140個字元)" msgid "Could not update group." msgstr "無法更新使用者" -#: actions/editgroup.php:264 classes/User_group.php:493 +#: actions/editgroup.php:264 classes/User_group.php:496 #, fuzzy msgid "Could not create aliases." msgstr "無法存取個人圖像資料" @@ -1977,7 +1975,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -2078,7 +2076,7 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:100 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:363 msgid "You are not a member of that group." msgstr "" @@ -2189,12 +2187,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 -#: lib/command.php:475 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443 +#: lib/command.php:529 msgid "No content!" msgstr "無內容" @@ -2202,7 +2200,7 @@ msgstr "無內容" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:361 +#: actions/newmessage.php:164 lib/command.php:462 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2216,7 +2214,7 @@ msgstr "" msgid "Direct message to %s sent." msgstr "" -#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 +#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:189 msgid "Ajax Error" msgstr "" @@ -2342,8 +2340,8 @@ msgstr "連結" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042 -#: lib/apiaction.php:1070 lib/apiaction.php:1179 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069 +#: lib/apiaction.php:1097 lib/apiaction.php:1213 msgid "Not a supported data format." msgstr "" @@ -2481,7 +2479,7 @@ msgstr "舊密碼錯誤" msgid "Error saving user; invalid." msgstr "儲存使用者發生錯誤;使用者名稱無效" -#: actions/passwordsettings.php:186 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:186 actions/recoverpassword.php:381 msgid "Can't save new password." msgstr "無法存取新密碼" @@ -2969,7 +2967,7 @@ msgstr "" msgid "Recover password" msgstr "" -#: actions/recoverpassword.php:210 actions/recoverpassword.php:322 +#: actions/recoverpassword.php:210 actions/recoverpassword.php:335 msgid "Password recovery requested" msgstr "" @@ -2989,41 +2987,41 @@ msgstr "" msgid "Enter a nickname or email address." msgstr "請輸入暱稱或電子信箱" -#: actions/recoverpassword.php:272 +#: actions/recoverpassword.php:282 msgid "No user with that email address or username." msgstr "" -#: actions/recoverpassword.php:287 +#: actions/recoverpassword.php:299 msgid "No registered email address for that user." msgstr "查無此使用者所註冊的信箱" -#: actions/recoverpassword.php:301 +#: actions/recoverpassword.php:313 msgid "Error saving address confirmation." msgstr "儲存信箱確認發生錯誤" -#: actions/recoverpassword.php:325 +#: actions/recoverpassword.php:338 msgid "" "Instructions for recovering your password have been sent to the email " "address registered to your account." msgstr "我們已寄出一封信到你帳號中的信箱，告訴你如何取回你的密碼。" -#: actions/recoverpassword.php:344 +#: actions/recoverpassword.php:357 msgid "Unexpected password reset." msgstr "" -#: actions/recoverpassword.php:352 +#: actions/recoverpassword.php:365 msgid "Password must be 6 chars or more." msgstr "" -#: actions/recoverpassword.php:356 +#: actions/recoverpassword.php:369 msgid "Password and confirmation do not match." msgstr "" -#: actions/recoverpassword.php:375 actions/register.php:248 +#: actions/recoverpassword.php:388 actions/register.php:248 msgid "Error setting user." msgstr "使用者設定發生錯誤" -#: actions/recoverpassword.php:382 +#: actions/recoverpassword.php:395 msgid "New password successfully saved. You are now logged in." msgstr "新密碼已儲存成功。你已登入。" @@ -3203,7 +3201,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "無此使用者" -#: actions/repeat.php:114 lib/noticelist.php:674 +#: actions/repeat.php:114 lib/noticelist.php:676 #, fuzzy msgid "Repeated" msgstr "新增" @@ -4405,19 +4403,19 @@ msgstr "地點" msgid "Author(s)" msgstr "" -#: classes/File.php:144 +#: classes/File.php:169 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:154 +#: classes/File.php:179 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:161 +#: classes/File.php:186 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" @@ -4498,7 +4496,7 @@ msgstr "" msgid "Problem saving group inbox." msgstr "儲存使用者發生錯誤" -#: classes/Notice.php:1459 +#: classes/Notice.php:1465 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4530,31 +4528,31 @@ msgstr "無法刪除帳號" msgid "Couldn't delete subscription OMB token." msgstr "無法刪除帳號" -#: classes/Subscription.php:201 lib/subs.php:69 +#: classes/Subscription.php:201 msgid "Couldn't delete subscription." msgstr "無法刪除帳號" -#: classes/User.php:373 +#: classes/User.php:378 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: classes/User_group.php:477 +#: classes/User_group.php:480 #, fuzzy msgid "Could not create group." msgstr "無法存取個人圖像資料" -#: classes/User_group.php:486 +#: classes/User_group.php:489 #, fuzzy msgid "Could not set group URI." msgstr "註冊失敗" -#: classes/User_group.php:507 +#: classes/User_group.php:510 #, fuzzy msgid "Could not set group membership." msgstr "註冊失敗" -#: classes/User_group.php:521 +#: classes/User_group.php:524 #, fuzzy msgid "Could not save local group info." msgstr "註冊失敗" @@ -4774,7 +4772,7 @@ msgstr "" msgid "StatusNet software license" msgstr "" -#: lib/action.php:802 +#: lib/action.php:804 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4783,12 +4781,12 @@ msgstr "" "**%%site.name%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所提供的微型" "部落格服務" -#: lib/action.php:804 +#: lib/action.php:806 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%**是個微型部落格" -#: lib/action.php:806 +#: lib/action.php:809 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4796,42 +4794,42 @@ msgid "" "org/licensing/licenses/agpl-3.0.html)." msgstr "" -#: lib/action.php:821 +#: lib/action.php:824 #, fuzzy msgid "Site content license" msgstr "新訊息" -#: lib/action.php:826 +#: lib/action.php:829 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" -#: lib/action.php:831 +#: lib/action.php:834 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" -#: lib/action.php:834 +#: lib/action.php:837 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" -#: lib/action.php:847 +#: lib/action.php:850 msgid "All " msgstr "" -#: lib/action.php:853 +#: lib/action.php:856 msgid "license." msgstr "" -#: lib/action.php:1152 +#: lib/action.php:1155 msgid "Pagination" msgstr "" -#: lib/action.php:1161 +#: lib/action.php:1164 msgid "After" msgstr "" -#: lib/action.php:1169 +#: lib/action.php:1172 #, fuzzy msgid "Before" msgstr "之前的內容»" @@ -4944,7 +4942,7 @@ msgstr "確認信箱" msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:272 +#: lib/apiauth.php:276 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -5043,37 +5041,51 @@ msgstr "" msgid "Password changing is not allowed" msgstr "" -#: lib/channel.php:138 lib/channel.php:158 +#: lib/channel.php:157 lib/channel.php:177 msgid "Command results" msgstr "" -#: lib/channel.php:210 lib/mailhandler.php:142 +#: lib/channel.php:229 lib/mailhandler.php:142 msgid "Command complete" msgstr "" -#: lib/channel.php:221 +#: lib/channel.php:240 msgid "Command failed" msgstr "" -#: lib/command.php:44 -msgid "Sorry, this command is not yet implemented." +#: lib/command.php:83 lib/command.php:105 +msgid "Notice with that id does not exist" msgstr "" -#: lib/command.php:88 +#: lib/command.php:99 lib/command.php:570 +#, fuzzy +msgid "User has no last notice" +msgstr "新訊息" + +#: lib/command.php:125 #, php-format msgid "Could not find a user with nickname %s" msgstr "無法更新使用者" -#: lib/command.php:92 +#: lib/command.php:143 +#, fuzzy, php-format +msgid "Could not find a local user with nickname %s" +msgstr "無法更新使用者" + +#: lib/command.php:176 +msgid "Sorry, this command is not yet implemented." +msgstr "" + +#: lib/command.php:221 msgid "It does not make a lot of sense to nudge yourself!" msgstr "" -#: lib/command.php:99 +#: lib/command.php:228 #, php-format msgid "Nudge sent to %s" msgstr "" -#: lib/command.php:126 +#: lib/command.php:254 #, php-format msgid "" "Subscriptions: %1$s\n" @@ -5081,201 +5093,197 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:390 lib/command.php:451 -msgid "Notice with that id does not exist" -msgstr "" - -#: lib/command.php:168 lib/command.php:406 lib/command.php:467 -#: lib/command.php:523 -#, fuzzy -msgid "User has no last notice" -msgstr "新訊息" - -#: lib/command.php:190 +#: lib/command.php:296 msgid "Notice marked as fave." msgstr "" -#: lib/command.php:217 +#: lib/command.php:317 #, fuzzy msgid "You are already a member of that group" msgstr "無法連結到伺服器:%s" -#: lib/command.php:231 +#: lib/command.php:331 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "無法連結到伺服器:%s" -#: lib/command.php:236 +#: lib/command.php:336 #, fuzzy, php-format msgid "%s joined group %s" msgstr "%1$s的狀態是%2$s" -#: lib/command.php:275 +#: lib/command.php:373 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "無法從 %s 建立OpenID" -#: lib/command.php:280 +#: lib/command.php:378 #, fuzzy, php-format msgid "%s left group %s" msgstr "%1$s的狀態是%2$s" -#: lib/command.php:309 +#: lib/command.php:401 #, fuzzy, php-format msgid "Fullname: %s" msgstr "全名" -#: lib/command.php:312 lib/mail.php:258 +#: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:315 lib/mail.php:260 +#: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:318 +#: lib/command.php:410 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:349 +#: lib/command.php:437 +#, php-format +msgid "" +"%s is a remote profile; you can only send direct messages to users on the " +"same server." +msgstr "" + +#: lib/command.php:450 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:367 +#: lib/command.php:468 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:369 +#: lib/command.php:470 msgid "Error sending direct message." msgstr "" -#: lib/command.php:413 +#: lib/command.php:490 #, fuzzy msgid "Cannot repeat your own notice" msgstr "儲存使用者發生錯誤" -#: lib/command.php:418 +#: lib/command.php:495 #, fuzzy msgid "Already repeated that notice" msgstr "無此使用者" -#: lib/command.php:426 +#: lib/command.php:503 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "更新個人圖像" -#: lib/command.php:428 +#: lib/command.php:505 #, fuzzy msgid "Error repeating notice." msgstr "儲存使用者發生錯誤" -#: lib/command.php:482 +#: lib/command.php:536 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:491 +#: lib/command.php:545 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "&s的微型部落格" -#: lib/command.php:493 +#: lib/command.php:547 msgid "Error saving notice." msgstr "儲存使用者發生錯誤" -#: lib/command.php:547 +#: lib/command.php:594 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:554 lib/command.php:589 -#, fuzzy -msgid "No such user" -msgstr "無此使用者" +#: lib/command.php:602 +msgid "Can't subscribe to OMB profiles by command." +msgstr "" -#: lib/command.php:561 +#: lib/command.php:608 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:629 lib/command.php:728 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:595 +#: lib/command.php:638 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:613 lib/command.php:636 +#: lib/command.php:656 lib/command.php:679 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:616 +#: lib/command.php:659 msgid "Notification off." msgstr "" -#: lib/command.php:618 +#: lib/command.php:661 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:639 +#: lib/command.php:682 msgid "Notification on." msgstr "" -#: lib/command.php:641 +#: lib/command.php:684 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:654 +#: lib/command.php:697 msgid "Login command is disabled" msgstr "" -#: lib/command.php:665 +#: lib/command.php:708 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 +#: lib/command.php:735 #, fuzzy, php-format msgid "Unsubscribed %s" msgstr "此帳號已註冊" -#: lib/command.php:709 +#: lib/command.php:752 #, fuzzy msgid "You are not subscribed to anyone." msgstr "此帳號已註冊" -#: lib/command.php:711 +#: lib/command.php:754 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "此帳號已註冊" -#: lib/command.php:731 +#: lib/command.php:774 #, fuzzy msgid "No one is subscribed to you." msgstr "無此訂閱" -#: lib/command.php:733 +#: lib/command.php:776 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "無此訂閱" -#: lib/command.php:753 +#: lib/command.php:796 #, fuzzy msgid "You are not a member of any groups." msgstr "無法連結到伺服器:%s" -#: lib/command.php:755 +#: lib/command.php:798 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "無法連結到伺服器:%s" -#: lib/command.php:769 +#: lib/command.php:812 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5510,50 +5518,50 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:75 +#: lib/imagefile.php:74 +msgid "Unsupported image file format." +msgstr "" + +#: lib/imagefile.php:90 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:80 +#: lib/imagefile.php:95 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:88 lib/mediafile.php:170 +#: lib/imagefile.php:103 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:96 +#: lib/imagefile.php:111 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:109 -msgid "Unsupported image file format." -msgstr "" - -#: lib/imagefile.php:122 +#: lib/imagefile.php:124 #, fuzzy msgid "Lost our file." msgstr "無此通知" -#: lib/imagefile.php:166 lib/imagefile.php:231 +#: lib/imagefile.php:168 lib/imagefile.php:233 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:251 +#: lib/imagefile.php:253 msgid "MB" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:255 msgid "kB" msgstr "" -#: lib/jabber.php:220 +#: lib/jabber.php:228 #, php-format msgid "[%s]" msgstr "" -#: lib/jabber.php:400 +#: lib/jabber.php:408 #, php-format msgid "Unknown inbox source %d." msgstr "" @@ -5758,7 +5766,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:482 +#: lib/mailbox.php:227 lib/noticelist.php:484 msgid "from" msgstr "" @@ -5913,25 +5921,25 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:566 +#: lib/noticelist.php:568 #, fuzzy msgid "in context" msgstr "無內容" -#: lib/noticelist.php:601 +#: lib/noticelist.php:603 #, fuzzy msgid "Repeated by" msgstr "新增" -#: lib/noticelist.php:628 +#: lib/noticelist.php:630 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:629 +#: lib/noticelist.php:631 msgid "Reply" msgstr "" -#: lib/noticelist.php:673 +#: lib/noticelist.php:675 #, fuzzy msgid "Notice repeated" msgstr "更新個人圖像" @@ -6255,47 +6263,47 @@ msgctxt "role" msgid "Moderator" msgstr "" -#: lib/util.php:1015 +#: lib/util.php:1046 msgid "a few seconds ago" msgstr "" -#: lib/util.php:1017 +#: lib/util.php:1048 msgid "about a minute ago" msgstr "" -#: lib/util.php:1019 +#: lib/util.php:1050 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:1021 +#: lib/util.php:1052 msgid "about an hour ago" msgstr "" -#: lib/util.php:1023 +#: lib/util.php:1054 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:1025 +#: lib/util.php:1056 msgid "about a day ago" msgstr "" -#: lib/util.php:1027 +#: lib/util.php:1058 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:1029 +#: lib/util.php:1060 msgid "about a month ago" msgstr "" -#: lib/util.php:1031 +#: lib/util.php:1062 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:1033 +#: lib/util.php:1064 msgid "about a year ago" msgstr "" @@ -6309,7 +6317,7 @@ msgstr "個人首頁位址錯誤" msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" -#: lib/xmppmanager.php:402 +#: lib/xmppmanager.php:403 #, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." msgstr "" -- cgit v1.2.3-54-g00ecf From d2c4ff5f7c8f1aa0319489fcd91bc6b91bde24cb Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sat, 13 Mar 2010 11:54:04 -0800 Subject: Ticket 2239: white space before apostrophe in metadata of status of notice --- actions/shownotice.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/shownotice.php b/actions/shownotice.php index d09100f67..a1933ff63 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -172,7 +172,7 @@ class ShownoticeAction extends OwnerDesignAction function title() { if (!empty($this->profile->fullname)) { - $base = $this->profile->fullname . ' (' . $this->profile->nickname . ') '; + $base = $this->profile->fullname . ' (' . $this->profile->nickname . ')'; } else { $base = $this->profile->nickname; } -- cgit v1.2.3-54-g00ecf From 14c488ebb02a7d1ca5837453f1ffdb673db31b25 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sat, 13 Mar 2010 12:12:06 -0800 Subject: Fix for _m() usage with context in StatusNet main code. --- lib/language.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/language.php b/lib/language.php index 64b59e739..76c788025 100644 --- a/lib/language.php +++ b/lib/language.php @@ -202,16 +202,19 @@ function _mdomain($backtrace) static $cached; $path = $backtrace[0]['file']; if (!isset($cached[$path])) { + $final = 'statusnet'; // assume default domain if (DIRECTORY_SEPARATOR !== '/') { $path = strtr($path, DIRECTORY_SEPARATOR, '/'); } - $cut = strpos($path, '/plugins/') + 9; - $cut2 = strpos($path, '/', $cut); - if ($cut && $cut2) { - $cached[$path] = substr($path, $cut, $cut2 - $cut); - } else { - return null; + $cut = strpos($path, '/plugins/'); + if ($cut) { + $cut += strlen('/plugins/'); + $cut2 = strpos($path, '/', $cut); + if ($cut && $cut2) { + $final = substr($path, $cut, $cut2 - $cut); + } } + $cached[$path] = $final; } return $cached[$path]; } -- cgit v1.2.3-54-g00ecf From 56402597ddc8fbae0777ceaefc90d0473b8d31a4 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Sat, 13 Mar 2010 12:19:07 -0800 Subject: Throw a quick button label into ostatus .po file for french to test with --- plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po index f17dfa50a..0956d2f9b 100644 --- a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po +++ b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po @@ -104,3 +104,6 @@ msgstr "" #: actions/feedsubsettings.php:231 msgid "Previewing feed:" msgstr "" + +msgid "Confirm" +msgstr "Confirmer" -- cgit v1.2.3-54-g00ecf From 5b078eadd9fac008fc2f37627ba9a0b124893ccb Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 13 Mar 2010 16:48:21 -0500 Subject: Assigned an identifier for the representative user and group profile --- actions/showgroup.php | 3 ++- lib/userprofile.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/actions/showgroup.php b/actions/showgroup.php index 5704b13d1..a0d05ba37 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -221,7 +221,8 @@ class ShowgroupAction extends GroupDesignAction function showGroupProfile() { - $this->elementStart('div', 'entity_profile vcard author'); + $this->elementStart('div', array('id' => 'i', + 'class' => 'entity_profile vcard author')); $this->element('h2', null, _('Group profile')); diff --git a/lib/userprofile.php b/lib/userprofile.php index 8464c2446..1e4543a5a 100644 --- a/lib/userprofile.php +++ b/lib/userprofile.php @@ -71,7 +71,8 @@ class UserProfile extends Widget { if (Event::handle('StartProfilePageProfileSection', array(&$this->out, $this->profile))) { - $this->out->elementStart('div', 'entity_profile vcard author'); + $this->out->elementStart('div', array('id' => 'i', + 'class' => 'entity_profile vcard author')); $this->out->element('h2', null, _('User profile')); if (Event::handle('StartProfilePageProfileElements', array(&$this->out, $this->profile))) { -- cgit v1.2.3-54-g00ecf From 6e5e75f341fde6f4ef6b0ad01b38a85bd9583a30 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 14 Mar 2010 14:06:14 -0400 Subject: Updated plugin to open external links on a new window that are not attachments --- plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php b/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php index ebb0189e0..6756f1993 100644 --- a/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php +++ b/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php @@ -45,7 +45,7 @@ class OpenExternalLinkTargetPlugin extends Plugin { function onEndShowScripts($action) { - $action->inlineScript('$("a[rel~=external]").click(function(){ window.open(this.href); return false; });'); + $action->inlineScript('$("a[rel~=external]:not([class~=attachment])").live("click", function(){ window.open(this.href); return false; });'); return true; } -- cgit v1.2.3-54-g00ecf From 00cac4c8b18f8b36bda548b465bfb5ee9ad9cfff Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 14 Mar 2010 14:11:21 -0400 Subject: Added rel=external to geo location link --- lib/noticelist.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/noticelist.php b/lib/noticelist.php index 811b7e4f1..0d4cd4dd9 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -443,7 +443,8 @@ class NoticeListItem extends Widget $name); } else { $xstr = new XMLStringer(false); - $xstr->elementStart('a', array('href' => $url)); + $xstr->elementStart('a', array('href' => $url, + 'rel' => 'external')); $xstr->element('abbr', array('class' => 'geo', 'title' => $latlon), $name); -- cgit v1.2.3-54-g00ecf From 2f380f6a9a16970e3fb1b469fb2f1384aaf455a2 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 14 Mar 2010 15:01:24 -0400 Subject: Using rel=external instead of class=external for jOverlay title link --- lib/attachmentlist.php | 6 ++---- theme/base/css/display.css | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php index 51ceca857..dc6709d67 100644 --- a/lib/attachmentlist.php +++ b/lib/attachmentlist.php @@ -248,9 +248,7 @@ class Attachment extends AttachmentListItem $this->out->elementStart('div', array('id' => 'attachment_view', 'class' => 'hentry')); $this->out->elementStart('div', 'entry-title'); - $this->out->elementStart('a', $this->linkAttr()); - $this->out->element('span', null, $this->linkTitle()); - $this->out->elementEnd('a'); + $this->out->element('a', $this->linkAttr(), $this->linkTitle()); $this->out->elementEnd('div'); $this->out->elementStart('div', 'entry-content'); @@ -296,7 +294,7 @@ class Attachment extends AttachmentListItem } function linkAttr() { - return array('class' => 'external', 'href' => $this->attachment->url); + return array('rel' => 'external', 'href' => $this->attachment->url); } function linkTitle() { diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 782d3dc71..a2e4cdf2a 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1326,7 +1326,7 @@ margin-bottom:0; padding:11px; min-height:auto; } -#jOverlayContent .external span { +#jOverlayContent .entry-title { display:block; margin-bottom:11px; } -- cgit v1.2.3-54-g00ecf From fe0c010ae394de2ef2aa27d70de40d2c41f5f006 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Sun, 14 Mar 2010 23:30:19 +0100 Subject: Localisation updates for !StatusNet from !translatewiki.net !sntrans Signed-off-by: Siebrand Mazeland --- locale/ar/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/arz/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/bg/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/br/LC_MESSAGES/statusnet.po | 143 +++++++++++++++++----------------- locale/ca/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/cs/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/de/LC_MESSAGES/statusnet.po | 131 ++++++++++++++++--------------- locale/el/LC_MESSAGES/statusnet.po | 138 ++++++++++++++++---------------- locale/en_GB/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/es/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/fa/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/fi/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/fr/LC_MESSAGES/statusnet.po | 117 ++++++++++++++-------------- locale/ga/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/he/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/hsb/LC_MESSAGES/statusnet.po | 111 +++++++++++++------------- locale/ia/LC_MESSAGES/statusnet.po | 117 ++++++++++++++-------------- locale/is/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/it/LC_MESSAGES/statusnet.po | 117 ++++++++++++++-------------- locale/ja/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/ko/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/mk/LC_MESSAGES/statusnet.po | 129 +++++++++++++++--------------- locale/nb/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/nl/LC_MESSAGES/statusnet.po | 117 ++++++++++++++-------------- locale/nn/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/pl/LC_MESSAGES/statusnet.po | 117 ++++++++++++++-------------- locale/pt/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/pt_BR/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/ru/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/statusnet.po | 104 ++++++++++++------------- locale/sv/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/te/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/tr/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/uk/LC_MESSAGES/statusnet.po | 117 ++++++++++++++-------------- locale/vi/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/zh_CN/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- locale/zh_TW/LC_MESSAGES/statusnet.po | 108 ++++++++++++------------- 37 files changed, 2082 insertions(+), 2076 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 16e050cee..6a4221755 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:42:03+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:26:37+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -563,9 +563,9 @@ msgstr "الحساب" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "الاسم المستعار" @@ -707,7 +707,7 @@ msgstr "لا حجم." msgid "Invalid size." msgstr "حجم غير صالح." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "أفتار" @@ -739,7 +739,7 @@ msgid "Preview" msgstr "معاينة" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "احذف" @@ -977,7 +977,7 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟" msgid "Do not delete this notice" msgstr "لا تحذف هذا الإشعار" -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "احذف هذا الإشعار" @@ -2595,8 +2595,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "الاسم الكامل" @@ -2623,9 +2623,9 @@ msgid "Bio" msgstr "السيرة" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "الموقع" @@ -2639,7 +2639,7 @@ msgstr "شارك مكاني الحالي عند إرسال إشعارات" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "الوسوم" @@ -3063,7 +3063,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "اشترك" @@ -3099,7 +3099,7 @@ msgstr "لا يمكنك تكرار ملاحظتك الشخصية." msgid "You already repeated that notice." msgstr "أنت كررت هذه الملاحظة بالفعل." -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "مكرر" @@ -3239,7 +3239,7 @@ msgstr "المنظمة" msgid "Description" msgstr "الوصف" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "إحصاءات" @@ -3355,67 +3355,67 @@ msgstr "مجموعة %s" msgid "%1$s group, page %2$d" msgstr "%1$s أعضاء المجموعة, الصفحة %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "ملف المجموعة الشخصي" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "مسار" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "ملاحظة" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "الكنى" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "الأعضاء" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(لا شيء)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "جميع الأعضاء" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "أنشئ" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3430,7 +3430,7 @@ msgstr "" "[انضم الآن](%%%%action.register%%%%) لتصبح عضوًا في هذه المجموعة ومجموعات " "أخرى عديدة! ([اقرأ المزيد](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3442,7 +3442,7 @@ msgstr "" "en.wikipedia.org/wiki/Micro-blogging) المبنية على البرنامج الحر [StatusNet]" "(http://status.net/). يتشارك أعضاؤها رسائل قصيرة عن حياتهم واهتماماتهم. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "الإداريون" @@ -3967,12 +3967,12 @@ msgstr "لا مدخل هوية." msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "ملف المستخدم الشخصي" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "صورة" @@ -4867,11 +4867,11 @@ msgstr "اسحب" msgid "Attachments" msgstr "مرفقات" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "المؤلف" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "المزود" @@ -5668,7 +5668,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "من" @@ -5818,23 +5818,23 @@ msgstr "غ" msgid "at" msgstr "في" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "في السياق" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "مكرر بواسطة" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "رُد على هذا الإشعار" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "رُد" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "الإشعار مكرر" @@ -6102,45 +6102,45 @@ msgstr "ألغِ الاشتراك مع هذا المستخدم" msgid "Unsubscribe" msgstr "ألغِ الاشتراك" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "عدّل الأفتار" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "تصرفات المستخدم" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "عدّل إعدادات الملف الشخصي" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "عدّل" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "أرسل رسالة مباشرة إلى هذا المستخدم" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "رسالة" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "ملف المستخدم الشخصي" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "إداري" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "مراقب" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 7b6735e0e..b359f287a 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:42:07+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:26:40+0000\n" "Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -569,9 +569,9 @@ msgstr "الحساب" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "الاسم المستعار" @@ -713,7 +713,7 @@ msgstr "لا حجم." msgid "Invalid size." msgstr "حجم غير صالح." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "أفتار" @@ -745,7 +745,7 @@ msgid "Preview" msgstr "عاين" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "احذف" @@ -988,7 +988,7 @@ msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟" msgid "Do not delete this notice" msgstr "لا تحذف هذا الإشعار" -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "احذف هذا الإشعار" @@ -2606,8 +2606,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "الاسم الكامل" @@ -2634,9 +2634,9 @@ msgid "Bio" msgstr "السيرة" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "الموقع" @@ -2650,7 +2650,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "الوسوم" @@ -3073,7 +3073,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "اشترك" @@ -3109,7 +3109,7 @@ msgstr "ما ينفعش تكرر الملاحظه بتاعتك." msgid "You already repeated that notice." msgstr "انت عيدت الملاحظه دى فعلا." -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "مكرر" @@ -3249,7 +3249,7 @@ msgstr "المنظمه" msgid "Description" msgstr "الوصف" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "إحصاءات" @@ -3365,67 +3365,67 @@ msgstr "مجموعه %s" msgid "%1$s group, page %2$d" msgstr "%1$s أعضاء المجموعة, الصفحه %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "ملف المجموعه الشخصي" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "مسار" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "ملاحظة" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "الكنى" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "الأعضاء" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(لا شيء)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "جميع الأعضاء" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "أنشئ" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3435,7 +3435,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3444,7 +3444,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "الإداريون" @@ -3971,12 +3971,12 @@ msgstr "لا مدخل هويه." msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "ملف المستخدم الشخصي" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "صورة" @@ -4893,11 +4893,11 @@ msgstr "بطّل" msgid "Attachments" msgstr "مرفقات" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "المؤلف" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "المزود" @@ -5634,7 +5634,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "من" @@ -5785,23 +5785,23 @@ msgstr "غ" msgid "at" msgstr "في" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "فى السياق" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "متكرر من" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "رُد على هذا الإشعار" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "رُد" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "الإشعار مكرر" @@ -6069,46 +6069,46 @@ msgstr "ألغِ الاشتراك مع هذا المستخدم" msgid "Unsubscribe" msgstr "ألغِ الاشتراك" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "عدّل الأفتار" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "تصرفات المستخدم" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "عدّل إعدادات الملف الشخصي" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "عدّل" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "أرسل رساله مباشره إلى هذا المستخدم" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "رسالة" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "ملف المستخدم الشخصي" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "الإداريون" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 57d024979..8acc5f377 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:42:10+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:26:42+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -575,9 +575,9 @@ msgstr "Сметка" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Псевдоним" @@ -721,7 +721,7 @@ msgstr "Няма размер." msgid "Invalid size." msgstr "Неправилен размер." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Аватар" @@ -754,7 +754,7 @@ msgid "Preview" msgstr "Преглед" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Изтриване" @@ -1000,7 +1000,7 @@ msgstr "Наистина ли искате да изтриете тази бел msgid "Do not delete this notice" msgstr "Да не се изтрива бележката" -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Изтриване на бележката" @@ -2725,8 +2725,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Пълно име" @@ -2753,9 +2753,9 @@ msgid "Bio" msgstr "За мен" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Местоположение" @@ -2769,7 +2769,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Етикети" @@ -3216,7 +3216,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "Адрес на профила ви в друга, съвместима услуга за микроблогване" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Абониране" @@ -3254,7 +3254,7 @@ msgstr "Не можете да повтаряте собствена бележ msgid "You already repeated that notice." msgstr "Вече сте повторили тази бележка." -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Повторено" @@ -3398,7 +3398,7 @@ msgstr "Организация" msgid "Description" msgstr "Описание" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Статистики" @@ -3511,67 +3511,67 @@ msgstr "Група %s" msgid "%1$s group, page %2$d" msgstr "Членове на групата %s, страница %d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Профил на групата" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Бележка" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Псевдоними" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Емисия с бележки на %s" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Емисия с бележки на %s" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "Емисия с бележки на %s" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Изходяща кутия за %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Членове" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Всички членове" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Създадена на" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3581,7 +3581,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3590,7 +3590,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Администратори" @@ -4132,12 +4132,12 @@ msgstr "Няма такъв документ." msgid "Tag %s" msgstr "Етикети" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Потребителски профил" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Снимка" @@ -5099,11 +5099,11 @@ msgstr "Премахване" msgid "Attachments" msgstr "" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "Автор" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Доставчик" @@ -5851,7 +5851,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "от" @@ -6005,23 +6005,23 @@ msgstr "З" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "в контекст" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "Повторено от" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Отговаряне на тази бележка" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Отговор" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "Бележката е повторена." @@ -6299,46 +6299,46 @@ msgstr "Отписване от този потребител" msgid "Unsubscribe" msgstr "Отписване" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Редактиране на аватара" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Потребителски действия" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Редактиране на профила" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Редактиране" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Изпращате на пряко съобщение до този потребител." -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Съобщение" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "Потребителски профил" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "Администратори" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "" diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index 613ecff7b..9a5a4bc0b 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:42:13+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:26:45+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" @@ -276,11 +276,11 @@ msgstr "Ne c'helloc'h ket ho stankañ ho unan !" #: actions/apiblockcreate.php:126 msgid "Block user failed." -msgstr "N'eo ket bet stanke an implijer." +msgstr "N'eus ket bet tu da stankañ an implijer." #: actions/apiblockdestroy.php:114 msgid "Unblock user failed." -msgstr "N'eus ket bet tu distankañ an implijer." +msgstr "N'eus ket bet tu da zistankañ an implijer." #: actions/apidirectmessage.php:89 #, php-format @@ -562,9 +562,9 @@ msgstr "Kont" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Lesanv" @@ -706,7 +706,7 @@ msgstr "Ment ebet." msgid "Invalid size." msgstr "Ment direizh." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -738,7 +738,7 @@ msgid "Preview" msgstr "Rakwelet" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Diverkañ" @@ -848,7 +848,7 @@ msgstr "Distankañ" #: actions/blockedfromgroup.php:320 lib/unblockform.php:80 msgid "Unblock this user" -msgstr "Distankañ an implijer-se" +msgstr "Distankañ an implijer-mañ" #: actions/bookmarklet.php:50 msgid "Post to " @@ -977,13 +977,13 @@ msgstr "Ha sur oc'h ho peus c'hoant dilemel an ali-mañ ?" msgid "Do not delete this notice" msgstr "Arabat dilemel an ali-mañ" -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Dilemel an ali-mañ" #: actions/deleteuser.php:67 msgid "You cannot delete users." -msgstr "Ne c'helloc'h ket diverkañ implijerien" +msgstr "N'hallit ket diverkañ implijerien." #: actions/deleteuser.php:74 msgid "You can only delete local users." @@ -1001,7 +1001,7 @@ msgstr "" #: actions/deleteuser.php:151 lib/deleteuserform.php:77 msgid "Delete this user" -msgstr "Diverkañ an implijer-se" +msgstr "Diverkañ an implijer-mañ" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 #: lib/groupnav.php:119 @@ -1339,7 +1339,7 @@ msgstr "Penndibaboù enrollet" #: actions/emailsettings.php:320 msgid "No email address." -msgstr "N'eus chomlec'h postel ebet." +msgstr "Chomlec'h postel ebet." #: actions/emailsettings.php:327 msgid "Cannot normalize that email address" @@ -1879,7 +1879,7 @@ msgstr "Fall eo ar postel : %s" #: actions/invite.php:110 msgid "Invitation(s) sent" -msgstr "Kaset eo bet ar bedadenn(où)" +msgstr "Pedadenn(où) kaset" #: actions/invite.php:112 msgid "Invite new users" @@ -1926,7 +1926,7 @@ msgstr "Chomlec'hioù an implijerien da bediñ (unan dre linenn)" #: actions/invite.php:192 msgid "Personal message" -msgstr "Kemenadenn bersonel" +msgstr "Kemennadenn bersonel" #: actions/invite.php:194 msgid "Optionally add a personal message to the invitation." @@ -2130,7 +2130,7 @@ msgstr "" #: actions/newmessage.php:181 msgid "Message sent" -msgstr "Kaset eo bet ar gemenadenn" +msgstr "Kemennadenn kaset" #: actions/newmessage.php:185 #, php-format @@ -2350,7 +2350,7 @@ msgstr "Kemmañ ho ger tremen." #: actions/passwordsettings.php:96 actions/recoverpassword.php:231 msgid "Password change" -msgstr "Kemmañ ar ger-tremen" +msgstr "Kemmañ ger-tremen" #: actions/passwordsettings.php:104 msgid "Old password" @@ -2387,7 +2387,7 @@ msgstr "Ne glot ket ar gerioù-tremen." #: actions/passwordsettings.php:165 msgid "Incorrect old password" -msgstr "ger-termen kozh amreizh" +msgstr "Ger-termen kozh direizh" #: actions/passwordsettings.php:181 msgid "Error saving user; invalid." @@ -2536,7 +2536,7 @@ msgstr "Atav" #: actions/pathsadminpanel.php:329 msgid "Use SSL" -msgstr "Implij SSl" +msgstr "Implijout SSL" #: actions/pathsadminpanel.php:330 msgid "When to use SSL" @@ -2602,8 +2602,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Anv klok" @@ -2630,9 +2630,9 @@ msgid "Bio" msgstr "Buhezskrid" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Lec'hiadur" @@ -2646,7 +2646,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Balizennoù" @@ -3063,7 +3063,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "En em enskrivañ" @@ -3099,7 +3099,7 @@ msgstr "Ne c'helloc'h ket adkemer ho ali deoc'h." msgid "You already repeated that notice." msgstr "Adkemeret o peus dija an ali-mañ." -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Adlavaret" @@ -3157,7 +3157,7 @@ msgstr "" #: actions/repliesrss.php:72 #, php-format msgid "Replies to %1$s on %2$s!" -msgstr "" +msgstr "Respontoù da %1$s war %2$s !" #: actions/revokerole.php:75 #, fuzzy @@ -3166,7 +3166,7 @@ msgstr "Ne c'helloc'h ket kas kemennadennoù d'an implijer-mañ." #: actions/revokerole.php:82 msgid "User doesn't have this role." -msgstr "" +msgstr "n'en deus ket an implijer-mañ ar rol-se." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" @@ -3237,7 +3237,7 @@ msgstr "" msgid "Description" msgstr "" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Stadegoù" @@ -3348,67 +3348,67 @@ msgstr "strollad %s" msgid "%1$s group, page %2$d" msgstr "" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Profil ar strollad" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Notenn" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Aliasoù" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Oberoù ar strollad" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Izili" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(hini ebet)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "An holl izili" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Krouet" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3418,7 +3418,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3427,7 +3427,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Merourien" @@ -3526,7 +3526,7 @@ msgstr "" #: actions/showstream.php:305 #, php-format msgid "Repeat of %s" -msgstr "" +msgstr "Adkemeret eus %s" #: actions/silence.php:65 actions/unsilence.php:65 msgid "You cannot silence users on this site." @@ -3636,9 +3636,8 @@ msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" -msgstr "Ali" +msgstr "Ali al lec'hienn" #: actions/sitenoticeadminpanel.php:67 #, fuzzy @@ -3952,12 +3951,12 @@ msgstr "" msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Skeudenn" @@ -4841,11 +4840,11 @@ msgstr "" msgid "Attachments" msgstr "" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "Aozer" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Pourvezer" @@ -4932,7 +4931,7 @@ msgstr "" #: lib/command.php:336 #, php-format msgid "%s joined group %s" -msgstr "%s zo emezelet er strollad %s" +msgstr "emezelet eo %s er strollad %s" #: lib/command.php:373 #, php-format @@ -5570,7 +5569,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "eus" @@ -5720,23 +5719,23 @@ msgstr "K" msgid "at" msgstr "e" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Respont" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "" @@ -6004,46 +6003,46 @@ msgstr "" msgid "Unsubscribe" msgstr "" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Kemmañ an Avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Obererezh an implijer" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Aozañ" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Kas ur gemennadenn war-eeun d'an implijer-mañ" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Kemennadenn" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "Habaskaat" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "Strolladoù implijerien" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "Merourien" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 #, fuzzy msgctxt "role" msgid "Moderator" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 80c46e2bb..51d332093 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:42:16+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:26:48+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -591,9 +591,9 @@ msgstr "Compte" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Sobrenom" @@ -739,7 +739,7 @@ msgstr "Cap mida." msgid "Invalid size." msgstr "Mida invàlida." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -772,7 +772,7 @@ msgid "Preview" msgstr "Vista prèvia" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Suprimeix" @@ -1024,7 +1024,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:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Eliminar aquesta nota" @@ -2755,8 +2755,8 @@ msgstr "" "1-64 lletres en minúscula o números, sense signes de puntuació o espais" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nom complet" @@ -2784,9 +2784,9 @@ msgid "Bio" msgstr "Biografia" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Ubicació" @@ -2800,7 +2800,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Etiquetes" @@ -3258,7 +3258,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:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Subscriure's" @@ -3301,7 +3301,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:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Repetit" @@ -3449,7 +3449,7 @@ msgstr "Paginació" msgid "Description" msgstr "Descripció" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Estadístiques" @@ -3562,67 +3562,67 @@ msgstr "%s grup" msgid "%1$s group, page %2$d" msgstr "%s membre/s en el grup, pàgina %d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Perfil del grup" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Avisos" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Àlies" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Accions del grup" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Feed d'avisos del grup %s" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Feed d'avisos del grup %s" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "Feed d'avisos del grup %s" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Safata de sortida per %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Membres" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Cap)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Tots els membres" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "S'ha creat" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3632,7 +3632,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, fuzzy, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3643,7 +3643,7 @@ msgstr "" "**%s** és un grup d'usuaris a %%%%site.name%%%%, un servei de [microblogging]" "(http://ca.wikipedia.org/wiki/Microblogging)" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Administradors" @@ -4195,12 +4195,12 @@ msgstr "No argument de la id." msgid "Tag %s" msgstr "Etiqueta %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Perfil de l'usuari" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Foto" @@ -5160,11 +5160,11 @@ msgstr "Suprimeix" msgid "Attachments" msgstr "Adjuncions" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "Autoria" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Proveïdor" @@ -5913,7 +5913,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "de" @@ -6068,23 +6068,23 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "en context" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "Repetit per" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "respondre a aquesta nota" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Respon" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 #, fuzzy msgid "Notice repeated" msgstr "Notificació publicada" @@ -6360,46 +6360,46 @@ msgstr "Deixar d'estar subscrit des d'aquest usuari" msgid "Unsubscribe" msgstr "Cancel·lar subscripció" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Edita l'avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Accions de l'usuari" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Edita la configuració del perfil" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Edita" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Enviar un missatge directe a aquest usuari" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Missatge" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "Modera" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "Perfil de l'usuari" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "Administradors" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 #, fuzzy msgctxt "role" msgid "Moderator" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 74a2f9cc9..46f864bbc 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:42:19+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:02+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -586,9 +586,9 @@ msgstr "O nás" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Přezdívka" @@ -737,7 +737,7 @@ msgstr "Žádná velikost" msgid "Invalid size." msgstr "Neplatná velikost" -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Obrázek" @@ -770,7 +770,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Odstranit" @@ -1023,7 +1023,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "Žádné takové oznámení." -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Odstranit toto oznámení" @@ -2735,8 +2735,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Celé jméno" @@ -2763,9 +2763,9 @@ msgid "Bio" msgstr "O mě" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Umístění" @@ -2779,7 +2779,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "" @@ -3212,7 +3212,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:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Odebírat" @@ -3253,7 +3253,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:676 +#: actions/repeat.php:114 lib/noticelist.php:677 #, fuzzy msgid "Repeated" msgstr "Vytvořit" @@ -3402,7 +3402,7 @@ msgstr "Umístění" msgid "Description" msgstr "Odběry" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Statistiky" @@ -3513,70 +3513,70 @@ msgstr "" msgid "%1$s group, page %2$d" msgstr "Všechny odběry" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 #, fuzzy msgid "Group profile" msgstr "Žádné takové oznámení." -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Poznámka" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Feed sdělení pro %s" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Feed sdělení pro %s" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "Feed sdělení pro %s" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, fuzzy, php-format msgid "FOAF for %s group" msgstr "Feed sdělení pro %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Členem od" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 #, fuzzy msgid "Created" msgstr "Vytvořit" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3586,7 +3586,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3595,7 +3595,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "" @@ -4135,13 +4135,13 @@ msgstr "Žádný takový dokument." msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 #, fuzzy msgid "User profile" msgstr "Uživatel nemá profil." #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -5103,11 +5103,11 @@ msgstr "Odstranit" msgid "Attachments" msgstr "" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Poskytovatel" @@ -5864,7 +5864,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 #, fuzzy msgid "from" msgstr " od " @@ -6021,26 +6021,26 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 #, fuzzy msgid "in context" msgstr "Žádný obsah!" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 #, fuzzy msgid "Repeated by" msgstr "Vytvořit" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 #, fuzzy msgid "Reply" msgstr "odpověď" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 #, fuzzy msgid "Notice repeated" msgstr "Sdělení" @@ -6321,46 +6321,46 @@ msgstr "" msgid "Unsubscribe" msgstr "Odhlásit" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Upravit avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Akce uživatele" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 #, fuzzy msgid "Edit profile settings" msgstr "Nastavené Profilu" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Zpráva" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "Uživatel nemá profil." -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 5f98f4650..01ff74d19 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -15,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:42:22+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:05+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -534,9 +534,8 @@ msgid "Invalid nickname / password!" msgstr "Benutzername oder Passwort falsch." #: actions/apioauthauthorize.php:159 -#, fuzzy msgid "Database error deleting OAuth application user." -msgstr "Fehler bei den Nutzereinstellungen." +msgstr "Datenbank Fehler beim Löschen des OAuth Anwendungs Nutzers." #: actions/apioauthauthorize.php:185 msgid "Database error inserting OAuth application user." @@ -590,9 +589,9 @@ msgstr "Konto" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Nutzername" @@ -737,7 +736,7 @@ msgstr "Keine Größe." msgid "Invalid size." msgstr "Ungültige Größe." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -770,7 +769,7 @@ msgid "Preview" msgstr "Vorschau" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Löschen" @@ -1016,7 +1015,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:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Nachricht löschen" @@ -2183,9 +2182,9 @@ msgid "%1$s is already an admin for group \"%2$s\"." msgstr "%1$s ist bereits Administrator der Gruppe \"%2$s\"." #: actions/makeadmin.php:133 -#, fuzzy, php-format +#, php-format msgid "Can't get membership record for %1$s in group %2$s." -msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen" +msgstr "Konnte keinen Mitgliedseintrag für %1$s aus Gruppe %2$s empfangen." #: actions/makeadmin.php:146 #, php-format @@ -2743,8 +2742,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Vollständiger Name" @@ -2772,9 +2771,9 @@ msgid "Bio" msgstr "Biografie" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Aufenthaltsort" @@ -2788,7 +2787,7 @@ 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 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Stichwörter" @@ -3258,7 +3257,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:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Abonnieren" @@ -3295,7 +3294,7 @@ msgstr "Du kannst deine eigene Nachricht nicht wiederholen." msgid "You already repeated that notice." msgstr "Nachricht bereits wiederholt" -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Wiederholt" @@ -3439,7 +3438,7 @@ msgstr "Organisation" msgid "Description" msgstr "Beschreibung" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Statistiken" @@ -3555,67 +3554,67 @@ msgstr "%s Gruppe" msgid "%1$s group, page %2$d" msgstr "%1$s Gruppe, Seite %d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Gruppenprofil" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Nachricht" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Pseudonyme" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Gruppenaktionen" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Nachrichtenfeed der Gruppe %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Nachrichtenfeed der Gruppe %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Nachrichtenfeed der Gruppe %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Postausgang von %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Mitglieder" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Kein)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Alle Mitglieder" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Erstellt" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3625,7 +3624,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3638,7 +3637,7 @@ msgstr "" "Freien Software [StatusNet](http://status.net/). Seine Mitglieder erstellen " "kurze Nachrichten über Ihr Leben und Interessen. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Administratoren" @@ -4184,12 +4183,12 @@ msgstr "Kein ID Argument." msgid "Tag %s" msgstr "Tag %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Benutzerprofil" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Foto" @@ -5121,11 +5120,11 @@ msgstr "Entfernen" msgid "Attachments" msgstr "Anhänge" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "Autor" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Anbieter" @@ -5171,9 +5170,9 @@ msgid "Could not find a user with nickname %s" msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden." #: lib/command.php:143 -#, fuzzy, php-format +#, php-format msgid "Could not find a local user with nickname %s" -msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden." +msgstr "Konnte keinen lokalen Nutzer mit dem Nick %s finden" #: lib/command.php:176 msgid "Sorry, this command is not yet implemented." @@ -5253,6 +5252,8 @@ msgid "" "%s is a remote profile; you can only send direct messages to users on the " "same server." msgstr "" +"%s ist ein entferntes Profil; man kann direkte Nachrichten nur an Nutzer auf " +"dem selben Server senden." #: lib/command.php:450 #, php-format @@ -5304,9 +5305,8 @@ 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:602 -#, fuzzy msgid "Can't subscribe to OMB profiles by command." -msgstr "Du hast dieses Profil nicht abonniert." +msgstr "OMB Profile können nicht mit einem Kommando abonniert werden." #: lib/command.php:608 #, php-format @@ -5700,9 +5700,9 @@ msgid "[%s]" msgstr "[%s]" #: lib/jabber.php:408 -#, fuzzy, php-format +#, php-format msgid "Unknown inbox source %d." -msgstr "Unbekannte Sprache „%s“" +msgstr "Unbekannte inbox Quelle %d." #: lib/joinform.php:114 msgid "Join" @@ -5965,7 +5965,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:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "von" @@ -6035,9 +6035,8 @@ msgid "File could not be moved to destination directory." msgstr "Datei konnte nicht in das Zielverzeichnis verschoben werden." #: lib/mediafile.php:201 lib/mediafile.php:237 -#, fuzzy msgid "Could not determine file's MIME type." -msgstr "Konnte öffentlichen Stream nicht abrufen." +msgstr "Konnte den MIME-Typ nicht feststellen." #: lib/mediafile.php:270 #, php-format @@ -6124,23 +6123,23 @@ msgstr "W" msgid "at" msgstr "in" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "im Zusammenhang" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "Wiederholt von" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Auf diese Nachricht antworten" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Antworten" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "Nachricht wiederholt" @@ -6409,44 +6408,44 @@ msgstr "Lösche dein Abonnement von diesem Benutzer" msgid "Unsubscribe" msgstr "Abbestellen" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Avatar bearbeiten" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Benutzeraktionen" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Profil Einstellungen ändern" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Bearbeiten" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Direkte Nachricht an Benutzer verschickt" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Nachricht" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "Moderieren" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 msgid "User role" msgstr "Benutzerrolle" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "Administrator" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "Moderator" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index 8364d1ebf..beac936c4 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -1,6 +1,7 @@ # Translation of StatusNet to Greek # # Author@translatewiki.net: Crazymadlover +# Author@translatewiki.net: Dead3y3 # Author@translatewiki.net: Omnipaedista # -- # This file is distributed under the same license as the StatusNet package. @@ -9,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:42:26+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:09+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -28,31 +29,30 @@ msgstr "Πρόσβαση" #. TRANS: Page notice #: actions/accessadminpanel.php:67 -#, fuzzy msgid "Site access settings" -msgstr "Ρυθμίσεις OpenID" +msgstr "Ρυθμίσεις πρόσβασης ιστοτόπου" #. TRANS: Form legend for registration form. #: actions/accessadminpanel.php:161 -#, fuzzy msgid "Registration" -msgstr "Περιγραφή" +msgstr "Εγγραφή" #. TRANS: Checkbox instructions for admin setting "Private" #: actions/accessadminpanel.php:165 msgid "Prohibit anonymous users (not logged in) from viewing site?" msgstr "" +"Απαγόρευση ανωνύμων χρηστών (μη συνδεδεμένων) από το να βλέπουν τον ιστότοπο;" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 msgctxt "LABEL" msgid "Private" -msgstr "" +msgstr "Ιδιωτικό" #. TRANS: Checkbox instructions for admin setting "Invite only" #: actions/accessadminpanel.php:174 msgid "Make registration invitation only." -msgstr "" +msgstr "Κάντε την εγγραφή να είναι με πρόσκληση μόνο." #. TRANS: Checkbox label for configuring site as invite only. #: actions/accessadminpanel.php:176 @@ -62,24 +62,22 @@ msgstr "" #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations) #: actions/accessadminpanel.php:183 msgid "Disable new registrations." -msgstr "" +msgstr "Απενεργοποίηση των νέων εγγραφών" #. TRANS: Checkbox label for disabling new user registrations. #: actions/accessadminpanel.php:185 msgid "Closed" -msgstr "" +msgstr "Κλειστό" #. TRANS: Title / tooltip for button to save access settings in site admin panel #: actions/accessadminpanel.php:202 -#, fuzzy msgid "Save access settings" -msgstr "Ρυθμίσεις OpenID" +msgstr "Αποθήκευση ρυθμίσεων πρόσβασης" #: actions/accessadminpanel.php:203 -#, fuzzy msgctxt "BUTTON" msgid "Save" -msgstr "Αποχώρηση" +msgstr "Αποθήκευση" #. TRANS: Server error when page not found (404) #: actions/all.php:64 actions/public.php:98 actions/replies.php:93 @@ -113,9 +111,9 @@ msgstr "Κανένας τέτοιος χρήστης." #. TRANS: Page title. %1$s is user nickname, %2$d is page number #: actions/all.php:86 -#, fuzzy, php-format +#, php-format msgid "%1$s and friends, page %2$d" -msgstr "%s και οι φίλοι του/της" +msgstr "%1$s και φίλοι, σελίδα 2%$d" #. TRANS: Page title. %1$s is user nickname #. TRANS: H1 text. %1$s is user nickname @@ -150,6 +148,8 @@ msgstr "Ροή φίλων του/της %s (Atom)" msgid "" "This is the timeline for %s and friends but no one has posted anything yet." msgstr "" +"Αυτό είναι το χρονοδιάγραμμα για %s και φίλους, αλλά κανείς δεν έχει κάνει " +"καμία αποστολή ακόμα." #: actions/all.php:139 #, php-format @@ -157,6 +157,8 @@ msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " "something yourself." msgstr "" +"Δοκιμάστε την εγγραφή σε περισσότερους ανθρώπους, [ενταχθείτε σε μια ομάδα] " +"(%%action.groups%%) ή αποστείλετε κάτι ο ίδιος." #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@" #: actions/all.php:142 @@ -575,9 +577,9 @@ msgstr "Λογαριασμός" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Ψευδώνυμο" @@ -721,7 +723,7 @@ msgstr "" msgid "Invalid size." msgstr "" -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "" @@ -753,7 +755,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Διαγραφή" @@ -1004,7 +1006,7 @@ msgstr "Είσαι σίγουρος ότι θες να διαγράψεις αυ msgid "Do not delete this notice" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "" @@ -2681,8 +2683,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 μικρά γράμματα ή αριθμοί, χωρίς σημεία στίξης ή κενά" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Ονοματεπώνυμο" @@ -2710,9 +2712,9 @@ msgid "Bio" msgstr "Βιογραφικό" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Τοποθεσία" @@ -2726,7 +2728,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "" @@ -3172,7 +3174,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "" @@ -3211,7 +3213,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 #, fuzzy msgid "Repeated" msgstr "Δημιουργία" @@ -3355,7 +3357,7 @@ msgstr "Προσκλήσεις" msgid "Description" msgstr "Περιγραφή" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "" @@ -3467,68 +3469,68 @@ msgstr "" msgid "%1$s group, page %2$d" msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 #, fuzzy msgid "Group profile" msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, fuzzy, php-format msgid "FOAF for %s group" msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Μέλη" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Δημιουργημένος" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3538,7 +3540,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3547,7 +3549,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Διαχειριστές" @@ -4080,12 +4082,12 @@ msgstr "" msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Προφίλ χρήστη" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -5010,11 +5012,11 @@ msgstr "" msgid "Attachments" msgstr "" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "" @@ -5749,7 +5751,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "από" @@ -5902,23 +5904,23 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "Επαναλαμβάνεται από" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 #, fuzzy msgid "Notice repeated" msgstr "Ρυθμίσεις OpenID" @@ -6194,46 +6196,46 @@ msgstr "" msgid "Unsubscribe" msgstr "" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Επεξεργασία ρυθμίσεων προφίλ" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Επεξεργασία" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Μήνυμα" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "Προφίλ χρήστη" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "Διαχειριστές" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 4a50e8a19..2044bd0c9 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:42:29+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:12+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -580,9 +580,9 @@ msgstr "Account" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Nickname" @@ -724,7 +724,7 @@ msgstr "No size." msgid "Invalid size." msgstr "Invalid size." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -756,7 +756,7 @@ msgid "Preview" msgstr "Preview" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Delete" @@ -1002,7 +1002,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:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Delete this notice" @@ -2697,8 +2697,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 lowercase letters or numbers, no punctuation or spaces" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Full name" @@ -2725,9 +2725,9 @@ msgid "Bio" msgstr "Bio" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Location" @@ -2741,7 +2741,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Tags" @@ -3192,7 +3192,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:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Subscribe" @@ -3228,7 +3228,7 @@ msgstr "You can't repeat your own notice." msgid "You already repeated that notice." msgstr "You already repeated that notice." -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Repeated" @@ -3371,7 +3371,7 @@ msgstr "Organization" msgid "Description" msgstr "Description" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Statistics" @@ -3489,67 +3489,67 @@ msgstr "%s group" msgid "%1$s group, page %2$d" msgstr "%1$s group, page %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Group profile" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Note" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Group actions" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Notice feed for %s group (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Notice feed for %s group (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Notice feed for %s group (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Outbox for %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Members" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(None)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "All members" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Created" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3564,7 +3564,7 @@ msgstr "" "their life and interests. [Join now](%%%%action.register%%%%) to become part " "of this group and many more! ([Read more](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3577,7 +3577,7 @@ msgstr "" "[StatusNet](http://status.net/) tool. Its members share short messages about " "their life and interests. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Admins" @@ -4115,12 +4115,12 @@ msgstr "No ID argument." msgid "Tag %s" msgstr "Tag %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "User profile" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Photo" @@ -5059,11 +5059,11 @@ msgstr "Revoke" msgid "Attachments" msgstr "" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Provider" @@ -5806,7 +5806,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "from" @@ -5956,23 +5956,23 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "in context" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "Repeated by" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Reply to this notice" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Reply" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "Notice repeated" @@ -6240,46 +6240,46 @@ msgstr "Unsubscribe from this user" msgid "Unsubscribe" msgstr "Unsubscribe" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Edit Avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "User actions" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Edit profile settings" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Send a direct message to this user" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Message" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "User profile" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "Admins" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 1f18b6066..712cb1a97 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -13,12 +13,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:42:32+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:15+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -587,9 +587,9 @@ msgstr "Cuenta" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Apodo" @@ -733,7 +733,7 @@ msgstr "Ningún tamaño." msgid "Invalid size." msgstr "Tamaño inválido." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -765,7 +765,7 @@ msgid "Preview" msgstr "Vista previa" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Borrar" @@ -1012,7 +1012,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:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Borrar este aviso" @@ -2737,8 +2737,8 @@ msgstr "" "1-64 letras en minúscula o números, sin signos de puntuación o espacios" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nombre completo" @@ -2765,9 +2765,9 @@ msgid "Bio" msgstr "Biografía" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Ubicación" @@ -2781,7 +2781,7 @@ 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 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Tags" @@ -3242,7 +3242,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:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Suscribirse" @@ -3280,7 +3280,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:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Repetido" @@ -3422,7 +3422,7 @@ msgstr "Organización" msgid "Description" msgstr "Descripción" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Estadísticas" @@ -3534,68 +3534,68 @@ msgstr "Grupo %s" msgid "%1$s group, page %2$d" msgstr "Miembros del grupo %s, página %d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Perfil del grupo" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Nota" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Alias" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Acciones del grupo" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Feed de avisos de grupo %s" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Feed de avisos de grupo %s" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "Feed de avisos de grupo %s" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Bandeja de salida para %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Miembros" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ninguno)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Todos los miembros" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Creado" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3605,7 +3605,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, fuzzy, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3616,7 +3616,7 @@ msgstr "" "**%s** es un grupo de usuarios en %%%%site.name%%%%, un servicio [micro-" "blogging](http://en.wikipedia.org/wiki/Micro-blogging) " -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Administradores" @@ -4163,12 +4163,12 @@ msgstr "No existe argumento de ID." msgid "Tag %s" msgstr "%s tag" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Perfil de usuario" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Foto" @@ -5122,11 +5122,11 @@ msgstr "Revocar" msgid "Attachments" msgstr "" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "Autor" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Proveedor" @@ -5877,7 +5877,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "desde" @@ -6033,24 +6033,24 @@ msgstr "" msgid "at" msgstr "en" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "en contexto" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 #, fuzzy msgid "Repeated by" msgstr "Crear" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Responder este aviso." -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 #, fuzzy msgid "Notice repeated" msgstr "Aviso borrado" @@ -6331,46 +6331,46 @@ msgstr "Desuscribirse de este usuario" msgid "Unsubscribe" msgstr "Cancelar suscripción" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "editar avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Acciones de usuario" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Editar configuración del perfil" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Editar" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Enviar un mensaje directo a este usuario" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Mensaje" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "Moderar" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "Perfil de usuario" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "Administradores" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 #, fuzzy msgctxt "role" msgid "Moderator" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index c781194ad..9c7e9d9e5 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:42:38+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:21+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.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #. TRANS: Page title @@ -579,9 +579,9 @@ msgstr "حساب کاربری" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "نام کاربری" @@ -725,7 +725,7 @@ msgstr "بدون اندازه." msgid "Invalid size." msgstr "اندازه‌ی نادرست" -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "چهره" @@ -758,7 +758,7 @@ msgid "Preview" msgstr "پیش‌نمایش" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "حذف" @@ -1012,7 +1012,7 @@ msgstr "آیا اطمینان دارید که می‌خواهید این پیا msgid "Do not delete this notice" msgstr "این پیام را پاک نکن" -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "این پیام را پاک کن" @@ -2706,8 +2706,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "نام‌کامل" @@ -2734,9 +2734,9 @@ msgid "Bio" msgstr "شرح‌حال" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "موقعیت" @@ -2750,7 +2750,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "برچسب‌ها" @@ -3175,7 +3175,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "" @@ -3211,7 +3211,7 @@ msgstr "شما نمی توانید آگهی خودتان را تکرار کنی msgid "You already repeated that notice." msgstr "شما قبلا آن آگهی را تکرار کردید." -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "" @@ -3358,7 +3358,7 @@ msgstr "صفحه بندى" msgid "Description" msgstr "" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "آمار" @@ -3471,67 +3471,67 @@ msgstr "" msgid "%1$s group, page %2$d" msgstr "اعضای گروه %s، صفحهٔ %d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "نام های مستعار" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "اعضا" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "هیچ" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "همه ی اعضا" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "ساخته شد" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3541,7 +3541,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3550,7 +3550,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "" @@ -4089,12 +4089,12 @@ msgstr "" msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "پروفایل کاربر" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -5015,11 +5015,11 @@ msgstr "حذف" msgid "Attachments" msgstr "ضمائم" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "مؤلف" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "مهیا کننده" @@ -5756,7 +5756,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "از" @@ -5911,23 +5911,23 @@ msgstr "" msgid "at" msgstr "در" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "در زمینه" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "تکرار از" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "به این آگهی جواب دهید" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "جواب دادن" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "آگهی تکرار شد" @@ -6196,45 +6196,45 @@ msgstr "" msgid "Unsubscribe" msgstr "" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "ویرایش اواتور" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "ویرایش تنظیمات پروفيل" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "ویرایش" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "پیام مستقیم به این کاربر بفرستید" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "پیام" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "پروفایل کاربر" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index aa53f56f2..e9ebda511 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:42:35+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:18+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -594,9 +594,9 @@ msgstr "Käyttäjätili" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Tunnus" @@ -743,7 +743,7 @@ msgstr "Kokoa ei ole." msgid "Invalid size." msgstr "Koko ei kelpaa." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Kuva" @@ -775,7 +775,7 @@ msgid "Preview" msgstr "Esikatselu" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Poista" @@ -1025,7 +1025,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:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Poista tämä päivitys" @@ -2784,8 +2784,8 @@ msgstr "" "välilyöntejä" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Koko nimi" @@ -2812,9 +2812,9 @@ msgid "Bio" msgstr "Tietoja" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Kotipaikka" @@ -2828,7 +2828,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Tagit" @@ -3286,7 +3286,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:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Tilaa" @@ -3330,7 +3330,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:676 +#: actions/repeat.php:114 lib/noticelist.php:677 #, fuzzy msgid "Repeated" msgstr "Luotu" @@ -3484,7 +3484,7 @@ msgstr "Sivutus" msgid "Description" msgstr "Kuvaus" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Tilastot" @@ -3596,67 +3596,67 @@ msgstr "Ryhmä %s" msgid "%1$s group, page %2$d" msgstr "Ryhmän %s jäsenet, sivu %d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Ryhmän profiili" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Huomaa" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Aliakset" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Ryhmän toiminnot" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Syöte ryhmän %s päivityksille (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Syöte ryhmän %s päivityksille (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Käyttäjän %s lähetetyt viestit" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Jäsenet" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Tyhjä)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Kaikki jäsenet" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Luotu" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3666,7 +3666,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, fuzzy, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3677,7 +3677,7 @@ msgstr "" "**%s** on ryhmä palvelussa %%%%site.name%%%%, joka on [mikroblogauspalvelu]" "(http://en.wikipedia.org/wiki/Micro-blogging)" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Ylläpitäjät" @@ -4228,12 +4228,12 @@ msgstr "Ei id parametria." msgid "Tag %s" msgstr "Tagi %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Käyttäjän profiili" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Kuva" @@ -5208,11 +5208,11 @@ msgstr "Poista" msgid "Attachments" msgstr "" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 #, fuzzy msgid "Provider" msgstr "Profiili" @@ -5976,7 +5976,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 #, fuzzy msgid "from" msgstr " lähteestä " @@ -6132,25 +6132,25 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 #, fuzzy msgid "in context" msgstr "Ei sisältöä!" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 #, fuzzy msgid "Repeated by" msgstr "Luotu" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Vastaa tähän päivitykseen" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Vastaus" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 #, fuzzy msgid "Notice repeated" msgstr "Päivitys on poistettu." @@ -6433,48 +6433,48 @@ msgstr "Peruuta tämän käyttäjän tilaus" msgid "Unsubscribe" msgstr "Peruuta tilaus" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "Kuva" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Käyttäjän toiminnot" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 #, fuzzy msgid "Edit profile settings" msgstr "Profiiliasetukset" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Lähetä suora viesti tälle käyttäjälle" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Viesti" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "Käyttäjän profiili" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "Ylläpitäjät" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 02bdef611..8665d9785 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:42:42+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:24+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -593,9 +593,9 @@ msgstr "Compte" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Pseudo" @@ -739,7 +739,7 @@ msgstr "Aucune taille" msgid "Invalid size." msgstr "Taille incorrecte." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -773,7 +773,7 @@ msgid "Preview" msgstr "Aperçu" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Supprimer" @@ -1019,7 +1019,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:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Supprimer cet avis" @@ -2750,8 +2750,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nom complet" @@ -2778,9 +2778,9 @@ msgid "Bio" msgstr "Bio" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Emplacement" @@ -2794,7 +2794,7 @@ msgstr "Partager ma localisation lorsque je poste des avis" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Marques" @@ -3265,7 +3265,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:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "S’abonner" @@ -3302,7 +3302,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:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Repris" @@ -3448,7 +3448,7 @@ msgstr "Organisation" msgid "Description" msgstr "Description" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Statistiques" @@ -3569,67 +3569,67 @@ msgstr "Groupe %s" msgid "%1$s group, page %2$d" msgstr "Groupe %1$s, page %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Profil du groupe" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Note" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Alias" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Actions du groupe" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Fil des avis du groupe %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Fil des avis du groupe %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Fil des avis du groupe %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "ami d’un ami pour le groupe %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Membres" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(aucun)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Tous les membres" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Créé" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3645,7 +3645,7 @@ msgstr "" "action.register%%%%) pour devenir membre de ce groupe et bien plus ! ([En " "lire plus](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3658,7 +3658,7 @@ msgstr "" "logiciel libre [StatusNet](http://status.net/). Ses membres partagent des " "messages courts à propos de leur vie et leurs intérêts. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Administrateurs" @@ -4218,12 +4218,12 @@ msgstr "Aucun argument d’identifiant." msgid "Tag %s" msgstr "Marque %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Profil de l’utilisateur" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Photo" @@ -5161,11 +5161,11 @@ msgstr "Révoquer" msgid "Attachments" msgstr "Pièces jointes" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "Auteur" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Fournisseur" @@ -5211,9 +5211,9 @@ msgid "Could not find a user with nickname %s" msgstr "Impossible de trouver un utilisateur avec le pseudo %s" #: lib/command.php:143 -#, fuzzy, php-format +#, php-format msgid "Could not find a local user with nickname %s" -msgstr "Impossible de trouver un utilisateur avec le pseudo %s" +msgstr "Impossible de trouver un utilisateur local portant le pseudo %s" #: lib/command.php:176 msgid "Sorry, this command is not yet implemented." @@ -5293,6 +5293,8 @@ msgid "" "%s is a remote profile; you can only send direct messages to users on the " "same server." msgstr "" +"%s est un profil distant ; vous ne pouvez envoyer de messages directs qu'aux " +"utilisateurs du même serveur." #: lib/command.php:450 #, php-format @@ -5348,9 +5350,8 @@ 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:602 -#, fuzzy msgid "Can't subscribe to OMB profiles by command." -msgstr "Vous n’êtes pas abonné(e) à ce profil." +msgstr "Impossible de s'inscrire aux profils OMB par cette commande." #: lib/command.php:608 #, php-format @@ -6030,7 +6031,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:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "de" @@ -6186,23 +6187,23 @@ msgstr "O" msgid "at" msgstr "chez" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "dans le contexte" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "Repris par" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Répondre à cet avis" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Répondre" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "Avis repris" @@ -6470,44 +6471,44 @@ msgstr "Ne plus suivre cet utilisateur" msgid "Unsubscribe" msgstr "Désabonnement" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Modifier l’avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Actions de l’utilisateur" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Modifier les paramètres du profil" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Modifier" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Envoyer un message à cet utilisateur" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Message" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "Modérer" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 msgid "User role" msgstr "Rôle de l'utilisateur" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "Administrateur" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "Modérateur" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index ee14c3a2f..9a4d6adbe 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:42:45+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:27+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -591,9 +591,9 @@ msgstr "Sobre" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Alcume" @@ -742,7 +742,7 @@ msgstr "Sen tamaño." msgid "Invalid size." msgstr "Tamaño inválido." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -775,7 +775,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 #, fuzzy msgid "Delete" msgstr "eliminar" @@ -1038,7 +1038,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:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 #, fuzzy msgid "Delete this notice" msgstr "Eliminar chío" @@ -2815,8 +2815,8 @@ msgstr "" "De 1 a 64 letras minúsculas ou númeors, nin espazos nin signos de puntuación" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nome completo" @@ -2844,9 +2844,9 @@ msgid "Bio" msgstr "Bio" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Localización" @@ -2860,7 +2860,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Tags" @@ -3327,7 +3327,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:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Subscribir" @@ -3370,7 +3370,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:676 +#: actions/repeat.php:114 lib/noticelist.php:677 #, fuzzy msgid "Repeated" msgstr "Crear" @@ -3520,7 +3520,7 @@ msgstr "Invitación(s) enviada(s)." msgid "Description" msgstr "Subscricións" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Estatísticas" @@ -3632,73 +3632,73 @@ msgstr "" msgid "%1$s group, page %2$d" msgstr "Tódalas subscricións" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 #, fuzzy msgid "Group profile" msgstr "Non existe o perfil." -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 #, fuzzy msgid "Note" msgstr "Chíos" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 #, fuzzy msgid "Group actions" msgstr "Outras opcions" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Fonte de chíos para %s" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Fonte de chíos para %s" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "Fonte de chíos para %s" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, fuzzy, php-format msgid "FOAF for %s group" msgstr "Band. Saída para %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Membro dende" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 #, fuzzy msgid "(None)" msgstr "(nada)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 #, fuzzy msgid "Created" msgstr "Crear" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, fuzzy, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3712,7 +3712,7 @@ msgstr "" "(http://status.net/). [Únete agora](%%action.register%%) para compartir " "chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, fuzzy, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3725,7 +3725,7 @@ msgstr "" "(http://status.net/). [Únete agora](%%action.register%%) para compartir " "chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "" @@ -4279,13 +4279,13 @@ msgstr "Non hai argumento id." msgid "Tag %s" msgstr "Tags" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 #, fuzzy msgid "User profile" msgstr "O usuario non ten perfil." #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -5269,11 +5269,11 @@ msgstr "Eliminar" msgid "Attachments" msgstr "" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 #, fuzzy msgid "Provider" msgstr "Perfil" @@ -6127,7 +6127,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 #, fuzzy msgid "from" msgstr " dende " @@ -6286,27 +6286,27 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 #, fuzzy msgid "in context" msgstr "Sen contido!" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 #, fuzzy msgid "Repeated by" msgstr "Crear" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 #, fuzzy msgid "Reply to this notice" msgstr "Non se pode eliminar este chíos." -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 #, fuzzy msgid "Reply" msgstr "contestar" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 #, fuzzy msgid "Notice repeated" msgstr "Chío publicado" @@ -6600,50 +6600,50 @@ msgstr "Desuscribir de %s" msgid "Unsubscribe" msgstr "Eliminar subscrición" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "Avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 #, fuzzy msgid "User actions" msgstr "Outras opcions" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 #, fuzzy msgid "Edit profile settings" msgstr "Configuración de perfil" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 #, fuzzy msgid "Send a direct message to this user" msgstr "Non podes enviar mensaxes a este usurio." -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 #, fuzzy msgid "Message" msgstr "Nova mensaxe" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "O usuario non ten perfil." -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 72ddfb14b..02d720ce9 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:43:00+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:29+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -584,9 +584,9 @@ msgstr "אודות" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "כינוי" @@ -734,7 +734,7 @@ msgstr "אין גודל." msgid "Invalid size." msgstr "גודל לא חוקי." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "תמונה" @@ -767,7 +767,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 #, fuzzy msgid "Delete" msgstr "מחק" @@ -1023,7 +1023,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "אין הודעה כזו." -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "" @@ -2742,8 +2742,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1 עד 64 אותיות אנגליות קטנות או מספרים, ללא סימני פיסוק או רווחים." #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "שם מלא" @@ -2771,9 +2771,9 @@ msgid "Bio" msgstr "ביוגרפיה" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "מיקום" @@ -2787,7 +2787,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "" @@ -3215,7 +3215,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "כתובת הפרופיל שלך בשרות ביקרובלוג תואם אחר" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "הירשם כמנוי" @@ -3256,7 +3256,7 @@ msgstr "לא ניתן להירשם ללא הסכמה לרשיון" msgid "You already repeated that notice." msgstr "כבר נכנסת למערכת!" -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 #, fuzzy msgid "Repeated" msgstr "צור" @@ -3405,7 +3405,7 @@ msgstr "מיקום" msgid "Description" msgstr "הרשמות" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "סטטיסטיקה" @@ -3516,71 +3516,71 @@ msgstr "" msgid "%1$s group, page %2$d" msgstr "כל המנויים" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 #, fuzzy msgid "Group profile" msgstr "אין הודעה כזו." -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 #, fuzzy msgid "Note" msgstr "הודעות" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "הזנת הודעות של %s" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "הזנת הודעות של %s" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "הזנת הודעות של %s" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, fuzzy, php-format msgid "FOAF for %s group" msgstr "הזנת הודעות של %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "חבר מאז" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 #, fuzzy msgid "Created" msgstr "צור" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3590,7 +3590,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3599,7 +3599,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "" @@ -4137,13 +4137,13 @@ msgstr "אין מסמך כזה." msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 #, fuzzy msgid "User profile" msgstr "למשתמש אין פרופיל." #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -5104,11 +5104,11 @@ msgstr "הסר" msgid "Attachments" msgstr "" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 #, fuzzy msgid "Provider" msgstr "פרופיל" @@ -5864,7 +5864,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "" @@ -6021,26 +6021,26 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 #, fuzzy msgid "in context" msgstr "אין תוכן!" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 #, fuzzy msgid "Repeated by" msgstr "צור" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 #, fuzzy msgid "Reply" msgstr "הגב" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 #, fuzzy msgid "Notice repeated" msgstr "הודעות" @@ -6324,48 +6324,48 @@ msgstr "" msgid "Unsubscribe" msgstr "בטל מנוי" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "תמונה" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 #, fuzzy msgid "Edit profile settings" msgstr "הגדרות הפרופיל" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 #, fuzzy msgid "Message" msgstr "הודעה חדשה" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "למשתמש אין פרופיל." -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 0856b4277..48239383c 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:43:05+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:32+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -560,9 +560,9 @@ msgstr "Konto" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Přimjeno" @@ -704,7 +704,7 @@ msgstr "Žana wulkosć." msgid "Invalid size." msgstr "Njepłaćiwa wulkosć." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Awatar" @@ -737,7 +737,7 @@ msgid "Preview" msgstr "Přehlad" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Zničić" @@ -975,7 +975,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:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Tutu zdźělenku wušmórnyć" @@ -2591,8 +2591,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Dospołne mjeno" @@ -2619,9 +2619,9 @@ msgid "Bio" msgstr "Biografija" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Městno" @@ -2635,7 +2635,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "" @@ -3053,7 +3053,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Abonować" @@ -3089,7 +3089,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:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Wospjetowany" @@ -3226,7 +3226,7 @@ msgstr "Organizacija" msgid "Description" msgstr "Wopisanje" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Statistika" @@ -3337,67 +3337,67 @@ msgstr "" msgid "%1$s group, page %2$d" msgstr "%1$s skupina, strona %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Skupinski profil" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Aliasy" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Skupinske akcije" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Čłonojo" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Žadyn)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Wšitcy čłonojo" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Wutworjeny" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3407,7 +3407,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3416,7 +3416,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Administratorojo" @@ -3933,12 +3933,12 @@ msgstr "Žadyn argument ID." msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Wužiwarski profil" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Foto" @@ -4820,11 +4820,11 @@ msgstr "Wotwołać" msgid "Attachments" msgstr "" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "Awtor" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "" @@ -5000,9 +5000,8 @@ msgid "Specify the name of the user to subscribe to" msgstr "" #: lib/command.php:602 -#, fuzzy msgid "Can't subscribe to OMB profiles by command." -msgstr "Njejsy tón profil abonował." +msgstr "OMB-profile njedadźa so přez přikaz abonować." #: lib/command.php:608 #, php-format @@ -5553,7 +5552,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "wot" @@ -5703,23 +5702,23 @@ msgstr "Z" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "Wospjetowany wot" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Na tutu zdźělenku wotmołwić" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Wotmołwić" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "Zdźělenka wospjetowana" @@ -5987,44 +5986,44 @@ msgstr "Tutoho wužiwarja wotskazać" msgid "Unsubscribe" msgstr "Wotskazać" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Awatar wobdźěłać" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Wužiwarske akcije" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Profilowe nastajenja wobdźěłać" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Wobdźěłać" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Tutomu wužiwarja direktnu powěsć pósłać" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Powěsć" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 msgid "User role" msgstr "Wužiwarska róla" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "Administrator" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index 3169d6fa4..520fbf782 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:43:09+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:35+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -578,9 +578,9 @@ msgstr "Conto" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Pseudonymo" @@ -726,7 +726,7 @@ msgstr "Nulle dimension." msgid "Invalid size." msgstr "Dimension invalide." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -759,7 +759,7 @@ msgid "Preview" msgstr "Previsualisation" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Deler" @@ -1005,7 +1005,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:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Deler iste nota" @@ -2720,8 +2720,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 minusculas o numeros, sin punctuation o spatios" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nomine complete" @@ -2748,9 +2748,9 @@ msgid "Bio" msgstr "Bio" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Loco" @@ -2764,7 +2764,7 @@ msgstr "Divulgar mi loco actual quando io publica notas" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Etiquettas" @@ -3226,7 +3226,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:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Subscriber" @@ -3264,7 +3264,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:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Repetite" @@ -3407,7 +3407,7 @@ msgstr "Organisation" msgid "Description" msgstr "Description" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Statisticas" @@ -3528,67 +3528,67 @@ msgstr "Gruppo %s" msgid "%1$s group, page %2$d" msgstr "Gruppo %1$s, pagina %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Profilo del gruppo" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Nota" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Aliases" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Actiones del gruppo" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Syndication de notas pro le gruppo %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Syndication de notas pro le gruppo %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Syndication de notas pro le gruppo %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Amico de un amico pro le gruppo %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Membros" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Nulle)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Tote le membros" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Create" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3603,7 +3603,7 @@ msgstr "" "lor vita e interesses. [Crea un conto](%%%%action.register%%%%) pro devenir " "parte de iste gruppo e multe alteres! ([Lege plus](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3616,7 +3616,7 @@ msgstr "" "[StatusNet](http://status.net/). Su membros condivide breve messages super " "lor vita e interesses. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Administratores" @@ -4168,12 +4168,12 @@ msgstr "Nulle parametro de ID." msgid "Tag %s" msgstr "Etiquetta %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Profilo del usator" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Photo" @@ -5103,11 +5103,11 @@ msgstr "Revocar" msgid "Attachments" msgstr "Annexos" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "Autor" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Providitor" @@ -5153,9 +5153,9 @@ msgid "Could not find a user with nickname %s" msgstr "Non poteva trovar un usator con pseudonymo %s" #: lib/command.php:143 -#, fuzzy, php-format +#, php-format msgid "Could not find a local user with nickname %s" -msgstr "Non poteva trovar un usator con pseudonymo %s" +msgstr "Non poteva trovar un usator local con pseudonymo %s" #: lib/command.php:176 msgid "Sorry, this command is not yet implemented." @@ -5235,6 +5235,8 @@ msgid "" "%s is a remote profile; you can only send direct messages to users on the " "same server." msgstr "" +"%s es un profilo remote; tu pote solmente inviar messages directe a usatores " +"super le mesme servitor." #: lib/command.php:450 #, php-format @@ -5286,9 +5288,8 @@ msgid "Specify the name of the user to subscribe to" msgstr "Specifica le nomine del usator al qual subscriber te" #: lib/command.php:602 -#, fuzzy msgid "Can't subscribe to OMB profiles by command." -msgstr "Tu non es subscribite a iste profilo." +msgstr "Impossibile subscriber se a profilos OMB per medio de un commando." #: lib/command.php:608 #, php-format @@ -5963,7 +5964,7 @@ msgstr "" "altere usatores in conversation. Altere personas pote inviar te messages que " "solmente tu pote leger." -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "de" @@ -6119,23 +6120,23 @@ msgstr "W" msgid "at" msgstr "a" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "in contexto" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "Repetite per" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Responder a iste nota" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "Nota repetite" @@ -6403,44 +6404,44 @@ msgstr "Cancellar subscription a iste usator" msgid "Unsubscribe" msgstr "Cancellar subscription" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Modificar avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Actiones de usator" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Modificar configuration de profilo" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Modificar" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Inviar un message directe a iste usator" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Message" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "Moderar" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 msgid "User role" msgstr "Rolo de usator" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "Administrator" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "Moderator" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 71caf4b56..0aaa833df 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:43:19+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:38+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -585,9 +585,9 @@ msgstr "Aðgangur" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Stuttnefni" @@ -733,7 +733,7 @@ msgstr "Engin stærð." msgid "Invalid size." msgstr "Ótæk stærð." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Mynd" @@ -765,7 +765,7 @@ msgid "Preview" msgstr "Forsýn" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Eyða" @@ -1015,7 +1015,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:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Eyða þessu babli" @@ -2762,8 +2762,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Fullt nafn" @@ -2793,9 +2793,9 @@ msgid "Bio" msgstr "Lýsing" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Staðsetning" @@ -2809,7 +2809,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Merki" @@ -3257,7 +3257,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:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Gerast áskrifandi" @@ -3302,7 +3302,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:676 +#: actions/repeat.php:114 lib/noticelist.php:677 #, fuzzy msgid "Repeated" msgstr "Í sviðsljósinu" @@ -3449,7 +3449,7 @@ msgstr "Uppröðun" msgid "Description" msgstr "Lýsing" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Tölfræði" @@ -3561,67 +3561,67 @@ msgstr "%s hópurinn" msgid "%1$s group, page %2$d" msgstr "Hópmeðlimir %s, síða %d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Hópssíðan" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "Vefslóð" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Athugasemd" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Hópsaðgerðir" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, fuzzy, php-format msgid "FOAF for %s group" msgstr "%s hópurinn" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Meðlimir" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ekkert)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Allir meðlimir" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3631,7 +3631,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3640,7 +3640,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "" @@ -4182,12 +4182,12 @@ msgstr "Ekkert einkenni gefið upp." msgid "Tag %s" msgstr "Merki %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Persónuleg síða notanda" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Ljósmynd" @@ -5156,11 +5156,11 @@ msgstr "Fjarlægja" msgid "Attachments" msgstr "" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "" @@ -5910,7 +5910,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 #, fuzzy msgid "from" msgstr "frá" @@ -6066,24 +6066,24 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 #, fuzzy msgid "Repeated by" msgstr "Í sviðsljósinu" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Svara þessu babli" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Svara" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 #, fuzzy msgid "Notice repeated" msgstr "Babl sent inn" @@ -6363,45 +6363,45 @@ msgstr "Hætta sem áskrifandi að þessum notanda" msgid "Unsubscribe" msgstr "Fara úr áskrift" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Notandaaðgerðir" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Senda bein skilaboð til þessa notanda" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Skilaboð" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "Persónuleg síða notanda" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 96328690d..6ecfdc0d2 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:43:26+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:41+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -582,9 +582,9 @@ msgstr "Account" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Soprannome" @@ -727,7 +727,7 @@ msgstr "Nessuna dimensione." msgid "Invalid size." msgstr "Dimensione non valida." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Immagine" @@ -760,7 +760,7 @@ msgid "Preview" msgstr "Anteprima" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Elimina" @@ -1005,7 +1005,7 @@ msgstr "Vuoi eliminare questo messaggio?" msgid "Do not delete this notice" msgstr "Non eliminare il messaggio" -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Elimina questo messaggio" @@ -2720,8 +2720,8 @@ msgstr "" "1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nome" @@ -2748,9 +2748,9 @@ msgid "Bio" msgstr "Biografia" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Ubicazione" @@ -2764,7 +2764,7 @@ msgstr "Condividi la mia posizione attuale quando invio messaggi" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Etichette" @@ -3226,7 +3226,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:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Abbonati" @@ -3264,7 +3264,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:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Ripetuti" @@ -3407,7 +3407,7 @@ msgstr "Organizzazione" msgid "Description" msgstr "Descrizione" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Statistiche" @@ -3527,67 +3527,67 @@ msgstr "Gruppo %s" msgid "%1$s group, page %2$d" msgstr "Gruppi di %1$s, pagina %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Profilo del gruppo" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Nota" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Alias" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Azioni dei gruppi" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Feed dei messaggi per il gruppo %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Feed dei messaggi per il gruppo %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Feed dei messaggi per il gruppo %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "FOAF per il gruppo %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Membri" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(nessuno)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Tutti i membri" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Creato" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3603,7 +3603,7 @@ msgstr "" "stesso](%%%%action.register%%%%) per far parte di questo gruppo e di molti " "altri! ([Maggiori informazioni](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3615,7 +3615,7 @@ msgstr "" "(http://it.wikipedia.org/wiki/Microblogging) basato sul software libero " "[StatusNet](http://status.net/)." -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Amministratori" @@ -4165,12 +4165,12 @@ msgstr "Nessun argomento ID." msgid "Tag %s" msgstr "Etichetta %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Profilo utente" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Fotografia" @@ -5104,11 +5104,11 @@ msgstr "Revoca" msgid "Attachments" msgstr "Allegati" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "Autore" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Provider" @@ -5154,9 +5154,9 @@ msgid "Could not find a user with nickname %s" msgstr "Impossibile trovare un utente col soprannome %s" #: lib/command.php:143 -#, fuzzy, php-format +#, php-format msgid "Could not find a local user with nickname %s" -msgstr "Impossibile trovare un utente col soprannome %s" +msgstr "Impossibile trovare un utente locale col soprannome %s" #: lib/command.php:176 msgid "Sorry, this command is not yet implemented." @@ -5236,6 +5236,8 @@ msgid "" "%s is a remote profile; you can only send direct messages to users on the " "same server." msgstr "" +"%s è un profilo remoto. È possibile inviare messaggi privati solo agli " +"utenti sullo stesso server." #: lib/command.php:450 #, php-format @@ -5287,9 +5289,8 @@ msgid "Specify the name of the user to subscribe to" msgstr "Specifica il nome dell'utente a cui abbonarti." #: lib/command.php:602 -#, fuzzy msgid "Can't subscribe to OMB profiles by command." -msgstr "Non hai una abbonamento a quel profilo." +msgstr "Impossibile abbonarsi ai profili OMB attraverso un comando." #: lib/command.php:608 #, php-format @@ -5967,7 +5968,7 @@ msgstr "" "iniziare una conversazione con altri utenti. Altre persone possono mandare " "messaggi riservati solamente a te." -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "via" @@ -6122,23 +6123,23 @@ msgstr "O" msgid "at" msgstr "presso" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "in una discussione" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "Ripetuto da" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Rispondi a questo messaggio" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Rispondi" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "Messaggio ripetuto" @@ -6406,44 +6407,44 @@ msgstr "Annulla l'abbonamento da questo utente" msgid "Unsubscribe" msgstr "Disabbonati" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Modifica immagine" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Azioni utente" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Modifica impostazioni del profilo" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Modifica" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Invia un messaggio diretto a questo utente" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Messaggio" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "Modera" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 msgid "User role" msgstr "Ruolo dell'utente" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "Amministratore" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "Moderatore" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index a3e00a367..98abb124e 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:43:30+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:45+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -578,9 +578,9 @@ msgstr "アカウント" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "ニックネーム" @@ -722,7 +722,7 @@ msgstr "サイズがありません。" msgid "Invalid size." msgstr "不正なサイズ。" -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "アバター" @@ -754,7 +754,7 @@ msgid "Preview" msgstr "プレビュー" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "削除" @@ -1001,7 +1001,7 @@ msgstr "本当にこのつぶやきを削除しますか？" msgid "Do not delete this notice" msgstr "このつぶやきを削除できません。" -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "このつぶやきを削除" @@ -2716,8 +2716,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "フルネーム" @@ -2744,9 +2744,9 @@ msgid "Bio" msgstr "自己紹介" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "場所" @@ -2760,7 +2760,7 @@ msgstr "つぶやきを投稿するときには私の現在の場所を共有し #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "タグ" @@ -3219,7 +3219,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "フォロー" @@ -3258,7 +3258,7 @@ msgstr "自分のつぶやきは繰り返せません。" msgid "You already repeated that notice." msgstr "すでにそのつぶやきを繰り返しています。" -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "繰り返された" @@ -3403,7 +3403,7 @@ msgstr "組織" msgid "Description" msgstr "概要" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "統計データ" @@ -3525,67 +3525,67 @@ msgstr "%s グループ" msgid "%1$s group, page %2$d" msgstr "%1$s グループ、ページ %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "グループプロファイル" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "ノート" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "別名" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "グループアクション" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "%s グループのつぶやきフィード (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "%s グループのつぶやきフィード (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "%s グループのつぶやきフィード (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "%s グループの FOAF" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "メンバー" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(なし)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "全てのメンバー" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "作成日" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3600,7 +3600,7 @@ msgstr "" "する短いメッセージを共有します。[今すぐ参加](%%%%action.register%%%%) してこ" "のグループの一員になりましょう! ([もっと読む](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3613,7 +3613,7 @@ msgstr "" "wikipedia.org/wiki/Micro-blogging) サービス。メンバーは彼らの暮らしと興味に関" "する短いメッセージを共有します。" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "管理者" @@ -4176,12 +4176,12 @@ msgstr "ID引数がありません。" msgid "Tag %s" msgstr "タグ %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "ユーザプロファイル" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "写真" @@ -5124,11 +5124,11 @@ msgstr "取消し" msgid "Attachments" msgstr "添付" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "作者" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "プロバイダ" @@ -5940,7 +5940,7 @@ msgstr "" "に引き込むプライベートメッセージを送ることができます。人々はあなただけへの" "メッセージを送ることができます。" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "from" @@ -6103,23 +6103,23 @@ msgstr "西" msgid "at" msgstr "at" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "このつぶやきへ返信" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "返信" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "つぶやきを繰り返しました" @@ -6387,47 +6387,47 @@ msgstr "この利用者からのフォローを解除する" msgid "Unsubscribe" msgstr "フォロー解除" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "アバターを編集する" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "利用者アクション" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "プロファイル設定編集" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "編集" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "この利用者にダイレクトメッセージを送る" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "メッセージ" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 #, fuzzy msgid "Moderate" msgstr "管理" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "ユーザプロファイル" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "管理者" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 #, fuzzy msgctxt "role" msgid "Moderator" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index ce01a9966..4e79cdf8b 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:43:33+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:48+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -588,9 +588,9 @@ msgstr "계정" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "별명" @@ -738,7 +738,7 @@ msgstr "사이즈가 없습니다." msgid "Invalid size." msgstr "옳지 않은 크기" -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "아바타" @@ -770,7 +770,7 @@ msgid "Preview" msgstr "미리보기" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "삭제" @@ -1025,7 +1025,7 @@ msgstr "정말로 통지를 삭제하시겠습니까?" msgid "Do not delete this notice" msgstr "이 통지를 지울 수 없습니다." -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "이 게시글 삭제하기" @@ -2780,8 +2780,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다." #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "실명" @@ -2809,9 +2809,9 @@ msgid "Bio" msgstr "자기소개" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "위치" @@ -2825,7 +2825,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "태그" @@ -3273,7 +3273,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "다른 마이크로블로깅 서비스의 귀하의 프로필 URL" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "구독" @@ -3316,7 +3316,7 @@ msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다." msgid "You already repeated that notice." msgstr "당신은 이미 이 사용자를 차단하고 있습니다." -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 #, fuzzy msgid "Repeated" msgstr "생성" @@ -3465,7 +3465,7 @@ msgstr "페이지수" msgid "Description" msgstr "설명" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "통계" @@ -3577,68 +3577,68 @@ msgstr "%s 그룹" msgid "%1$s group, page %2$d" msgstr "%s 그룹 회원, %d페이지" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "그룹 프로필" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "설명" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "그룹 행동" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "%s 그룹을 위한 공지피드" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "%s 그룹을 위한 공지피드" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "%s 그룹을 위한 공지피드" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "%s의 보낸쪽지함" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "회원" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(없습니다.)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "모든 회원" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 #, fuzzy msgid "Created" msgstr "생성" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3648,7 +3648,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, fuzzy, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3659,7 +3659,7 @@ msgstr "" "**%s** 는 %%%%site.name%%%% [마이크로블로깅)(http://en.wikipedia.org/wiki/" "Micro-blogging)의 사용자 그룹입니다. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 #, fuzzy msgid "Admins" msgstr "관리자" @@ -4206,12 +4206,12 @@ msgstr "id 인자가 없습니다." msgid "Tag %s" msgstr "태그 %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "이용자 프로필" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "사진" @@ -5182,11 +5182,11 @@ msgstr "삭제" msgid "Attachments" msgstr "" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 #, fuzzy msgid "Provider" msgstr "프로필" @@ -5933,7 +5933,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 #, fuzzy msgid "from" msgstr "다음에서:" @@ -6089,25 +6089,25 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 #, fuzzy msgid "in context" msgstr "내용이 없습니다!" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 #, fuzzy msgid "Repeated by" msgstr "생성" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "이 게시글에 대해 답장하기" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "답장하기" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 #, fuzzy msgid "Notice repeated" msgstr "게시글이 등록되었습니다." @@ -6390,48 +6390,48 @@ msgstr "이 사용자로부터 구독취소합니다." msgid "Unsubscribe" msgstr "구독 해제" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "아바타" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "사용자 동작" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 #, fuzzy msgid "Edit profile settings" msgstr "프로필 세팅" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "이 회원에게 직접 메시지를 보냅니다." -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "메시지" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "이용자 프로필" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "관리자" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 7b85fa9bb..c88e265f2 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:43:36+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:51+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -582,9 +582,9 @@ msgstr "Сметка" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Прекар" @@ -728,7 +728,7 @@ msgstr "Нема големина." msgid "Invalid size." msgstr "Погрешна големина." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Аватар" @@ -762,7 +762,7 @@ msgid "Preview" msgstr "Преглед" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Бриши" @@ -1009,7 +1009,7 @@ msgstr "Дали сте сигурни дека сакате да ја избр msgid "Do not delete this notice" msgstr "Не ја бриши оваа забелешка" -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Бриши ја оваа забелешка" @@ -1566,11 +1566,11 @@ msgstr "Не можев да ги претворам жетоните за ба #: actions/finishremotesubscribe.php:118 msgid "Remote service uses unknown version of OMB protocol." -msgstr "Оддалечената служба користи непозната верзија на OMB протокол." +msgstr "Далечинската служба користи непозната верзија на OMB протокол." #: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306 msgid "Error updating remote profile" -msgstr "Грешка во подновувањето на оддалечениот профил" +msgstr "Грешка во подновувањето на далечинскиот профил" #: actions/getfile.php:79 msgid "No such file." @@ -2730,8 +2730,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 мали букви или бројки. Без интерпукциски знаци и празни места." #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Цело име" @@ -2758,9 +2758,9 @@ msgid "Bio" msgstr "Биографија" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Локација" @@ -2774,7 +2774,7 @@ msgstr "Сподели ја мојата тековна локација при #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Ознаки" @@ -3222,7 +3222,7 @@ msgstr "Оддалечена претплата" #: actions/remotesubscribe.php:124 msgid "Subscribe to a remote user" -msgstr "Претплати се на оддалечен корисник" +msgstr "Претплати се на далечински корисник" #: actions/remotesubscribe.php:129 msgid "User nickname" @@ -3241,7 +3241,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "URL на Вашиот профил на друга компатибилна служба за микроблогирање." #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Претплати се" @@ -3279,7 +3279,7 @@ msgstr "Не можете да повторувате сопствена заб msgid "You already repeated that notice." msgstr "Веќе ја имате повторено таа забелешка." -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Повторено" @@ -3422,7 +3422,7 @@ msgstr "Организација" msgid "Description" msgstr "Опис" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Статистики" @@ -3545,67 +3545,67 @@ msgstr "Група %s" msgid "%1$s group, page %2$d" msgstr "Група %1$s, стр. %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Профил на група" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Забелешка" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Алијаси" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Групни дејства" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Канал со забелешки за групата %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Канал со забелешки за групата %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Канал со забелешки за групата%s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "FOAF за групата %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Членови" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Нема)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Сите членови" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Создадено" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3621,7 +3621,7 @@ msgstr "" "се](%%%%action.register%%%%) за да станете дел од оваа група и многу повеќе! " "([Прочитајте повеќе](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3634,7 +3634,7 @@ msgstr "" "слободната програмска алатка [StatusNet](http://status.net/). Нејзините " "членови си разменуваат кратки пораки за нивниот живот и интереси. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Администратори" @@ -4065,7 +4065,7 @@ msgstr "Нема таков профил." #: actions/subscribe.php:117 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." msgstr "" -"Не можете да се претплатите на OMB 0.1 оддалечен профил со ова дејство." +"Не можете да се претплатите на OMB 0.1 далечински профил со ова дејство." #: actions/subscribe.php:145 msgid "Subscribed" @@ -4188,12 +4188,12 @@ msgstr "Нема ID-аргумент." msgid "Tag %s" msgstr "Означи %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Кориснички профил" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Фото" @@ -4953,7 +4953,7 @@ msgstr "Пред" #: lib/activity.php:453 msgid "Can't handle remote content yet." -msgstr "Сè уште не е поддржана обработката на оддалечена содржина." +msgstr "Сè уште не е поддржана обработката на далечинска содржина." #: lib/activity.php:481 msgid "Can't handle embedded XML content yet." @@ -5126,11 +5126,11 @@ msgstr "Одземи" msgid "Attachments" msgstr "Прилози" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "Автор" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Обезбедувач" @@ -5176,9 +5176,9 @@ msgid "Could not find a user with nickname %s" msgstr "Не можев да пронајдам корисник со прекар %s" #: lib/command.php:143 -#, fuzzy, php-format +#, php-format msgid "Could not find a local user with nickname %s" -msgstr "Не можев да пронајдам корисник со прекар %s" +msgstr "Не можев да пронајдам локален корисник со прекар %s" #: lib/command.php:176 msgid "Sorry, this command is not yet implemented." @@ -5258,6 +5258,8 @@ msgid "" "%s is a remote profile; you can only send direct messages to users on the " "same server." msgstr "" +"%s е далечински профил; можете да праќате директни пораки само до корисници " +"на истиот сервер." #: lib/command.php:450 #, php-format @@ -5312,9 +5314,8 @@ msgid "Specify the name of the user to subscribe to" msgstr "Назначете го името на корисникот на којшто сакате да се претплатите" #: lib/command.php:602 -#, fuzzy msgid "Can't subscribe to OMB profiles by command." -msgstr "Не сте претплатени на тој профил." +msgstr "Не можете да се претплаќате на OMB профили по наредба." #: lib/command.php:608 #, php-format @@ -5988,7 +5989,7 @@ msgstr "" "впуштите во разговор со други корисници. Луѓето можат да ви испраќаат пораки " "што ќе можете да ги видите само Вие." -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "од" @@ -6146,23 +6147,23 @@ msgstr "З" msgid "at" msgstr "во" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "во контекст" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "Повторено од" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Одговори на забелешкава" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Одговор" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "Забелешката е повторена" @@ -6188,7 +6189,7 @@ msgstr "Грешка во внесувањето на аватарот" #: lib/oauthstore.php:311 msgid "Error inserting remote profile" -msgstr "Грешка во внесувањето на оддалечениот профил" +msgstr "Грешка во внесувањето на далечинскиот профил" #: lib/oauthstore.php:345 msgid "Duplicate notice" @@ -6430,44 +6431,44 @@ msgstr "Откажи претплата од овој корсиник" msgid "Unsubscribe" msgstr "Откажи ја претплатата" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Уреди аватар" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Кориснички дејства" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Уреди нагодувања на профилот" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Уреди" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Испрати му директна порака на корисников" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Порака" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "Модерирај" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 msgid "User role" msgstr "Корисничка улога" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "Администратор" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "Модератор" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 3845dca75..e12d8fa70 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:43:40+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:54+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -575,9 +575,9 @@ msgstr "Konto" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Nick" @@ -719,7 +719,7 @@ msgstr "Ingen størrelse." msgid "Invalid size." msgstr "Ugyldig størrelse" -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Brukerbilde" @@ -751,7 +751,7 @@ msgid "Preview" msgstr "Forhåndsvis" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Slett" @@ -997,7 +997,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:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Slett denne notisen" @@ -2655,8 +2655,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 små bokstaver eller nummer, ingen punktum eller mellomrom" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Fullt navn" @@ -2684,9 +2684,9 @@ msgid "Bio" msgstr "Om meg" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "" @@ -2700,7 +2700,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Tagger" @@ -3142,7 +3142,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "" @@ -3180,7 +3180,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "Du er allerede logget inn!" -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Gjentatt" @@ -3325,7 +3325,7 @@ msgstr "Organisasjon" msgid "Description" msgstr "Beskrivelse" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Statistikk" @@ -3437,67 +3437,67 @@ msgstr "%s gruppe" msgid "%1$s group, page %2$d" msgstr "%1$s gruppe, side %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Gruppeprofil" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "Nettadresse" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Notismating for %s gruppe (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Notismating for %s gruppe (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Notismating for %s gruppe (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, fuzzy, php-format msgid "FOAF for %s group" msgstr "Klarte ikke å lagre profil." -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Medlemmer" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ingen)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Alle medlemmer" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Opprettet" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3513,7 +3513,7 @@ msgstr "" "%%%) for å bli medlem av denne gruppen og mange fler. ([Les mer](%%%%doc.help" "%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3526,7 +3526,7 @@ msgstr "" "programvareverktøyet [StatusNet](http://status.net/). Dets medlemmer deler " "korte meldinger om deres liv og interesser. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Administratorer" @@ -4068,13 +4068,13 @@ msgstr "" msgid "Tag %s" msgstr "Tagger" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 #, fuzzy msgid "User profile" msgstr "Klarte ikke å lagre profil." #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -4977,11 +4977,11 @@ msgstr "Tilbakekall" msgid "Attachments" msgstr "Vedlegg" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "Forfatter" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Leverandør" @@ -5801,7 +5801,7 @@ msgstr "" "engasjere andre brukere i en samtale. Personer kan sende deg meldinger som " "bare du kan se." -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "fra" @@ -5953,23 +5953,23 @@ msgstr "V" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "Repetert av" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Svar på denne notisen" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Svar" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "Notis repetert" @@ -6242,45 +6242,45 @@ msgstr "" msgid "Unsubscribe" msgstr "" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "Brukerbilde" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Endre profilinnstillinger" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Rediger" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Send en direktemelding til denne brukeren" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Melding" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "Moderer" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 msgid "User role" msgstr "Brukerrolle" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "Administrator" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "Moderator" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 09e782be1..4be97e8e3 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:43:46+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:28:01+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -592,9 +592,9 @@ msgstr "Gebruiker" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Gebruikersnaam" @@ -738,7 +738,7 @@ msgstr "Geen afmeting." msgid "Invalid size." msgstr "Ongeldige afmetingen." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -771,7 +771,7 @@ msgid "Preview" msgstr "Voorvertoning" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Verwijderen" @@ -1018,7 +1018,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:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Deze mededeling verwijderen" @@ -2747,8 +2747,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Volledige naam" @@ -2775,9 +2775,9 @@ msgid "Bio" msgstr "Beschrijving" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Locatie" @@ -2791,7 +2791,7 @@ msgstr "Mijn huidige locatie weergeven bij het plaatsen van mededelingen" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Labels" @@ -3262,7 +3262,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:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Abonneren" @@ -3300,7 +3300,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:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Herhaald" @@ -3443,7 +3443,7 @@ msgstr "Organisatie" msgid "Description" msgstr "Beschrijving" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Statistieken" @@ -3566,67 +3566,67 @@ msgstr "%s groep" msgid "%1$s group, page %2$d" msgstr "Groep %1$s, pagina %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Groepsprofiel" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Opmerking" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Aliassen" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Groepshandelingen" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Mededelingenfeed voor groep %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Mededelingenfeed voor groep %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Mededelingenfeed voor groep %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Vriend van een vriend voor de groep %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Leden" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(geen)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Alle leden" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Aangemaakt" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3642,7 +3642,7 @@ msgstr "" "lid te worden van deze groep en nog veel meer! [Meer lezen...](%%%%doc.help%%" "%%)" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3655,7 +3655,7 @@ msgstr "" "[StatusNet](http://status.net/). De leden wisselen korte mededelingen uit " "over hun ervaringen en interesses. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Beheerders" @@ -4216,12 +4216,12 @@ msgstr "Geen ID-argument." msgid "Tag %s" msgstr "Label %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Gebruikersprofiel" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Foto" @@ -5165,11 +5165,11 @@ msgstr "Intrekken" msgid "Attachments" msgstr "Bijlagen" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "Auteur" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Provider" @@ -5215,9 +5215,9 @@ msgid "Could not find a user with nickname %s" msgstr "De gebruiker %s is niet aangetroffen" #: lib/command.php:143 -#, fuzzy, php-format +#, php-format msgid "Could not find a local user with nickname %s" -msgstr "De gebruiker %s is niet aangetroffen" +msgstr "De lokale gebruiker %s is niet aangetroffen" #: lib/command.php:176 msgid "Sorry, this command is not yet implemented." @@ -5297,6 +5297,8 @@ msgid "" "%s is a remote profile; you can only send direct messages to users on the " "same server." msgstr "" +"%s is een profiel op afstand. U kunt alle privéberichten verzenden aan " +"gebruikers op dezelfde server." #: lib/command.php:450 #, php-format @@ -5352,9 +5354,8 @@ 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:602 -#, fuzzy msgid "Can't subscribe to OMB profiles by command." -msgstr "U bent niet geabonneerd op dat profiel." +msgstr "Abonneren op OMB-profielen op commando is niet mogelijk." #: lib/command.php:608 #, php-format @@ -6034,7 +6035,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:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "van" @@ -6192,23 +6193,23 @@ msgstr "W" msgid "at" msgstr "op" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "in context" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "Herhaald door" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Op deze mededeling antwoorden" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Antwoorden" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "Mededeling herhaald" @@ -6477,44 +6478,44 @@ msgstr "Uitschrijven van deze gebruiker" msgid "Unsubscribe" msgstr "Abonnement opheffen" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Avatar bewerken" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Gebruikershandelingen" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Profielinstellingen bewerken" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Bewerken" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Deze gebruiker een direct bericht zenden" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Bericht" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "Modereren" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 msgid "User role" msgstr "Gebruikersrol" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "Beheerder" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "Moderator" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 900e9fa19..65463a3fc 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:43:43+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:27:57+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -586,9 +586,9 @@ msgstr "Konto" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Kallenamn" @@ -736,7 +736,7 @@ msgstr "Ingen storleik." msgid "Invalid size." msgstr "Ugyldig storleik." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Brukarbilete" @@ -768,7 +768,7 @@ msgid "Preview" msgstr "Forhandsvis" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Slett" @@ -1024,7 +1024,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:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Slett denne notisen" @@ -2786,8 +2786,8 @@ msgstr "" "1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Fullt namn" @@ -2815,9 +2815,9 @@ msgid "Bio" msgstr "Om meg" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Plassering" @@ -2831,7 +2831,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Merkelappar" @@ -3286,7 +3286,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:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Ting" @@ -3329,7 +3329,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:676 +#: actions/repeat.php:114 lib/noticelist.php:677 #, fuzzy msgid "Repeated" msgstr "Lag" @@ -3478,7 +3478,7 @@ msgstr "Paginering" msgid "Description" msgstr "Beskriving" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Statistikk" @@ -3590,68 +3590,68 @@ msgstr "%s gruppe" msgid "%1$s group, page %2$d" msgstr "%s medlemmar i gruppa, side %d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Gruppe profil" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Merknad" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Gruppe handlingar" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Notisstraum for %s gruppa" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Notisstraum for %s gruppa" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "Notisstraum for %s gruppa" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Utboks for %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Medlemmar" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ingen)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Alle medlemmar" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 #, fuzzy msgid "Created" msgstr "Lag" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3661,7 +3661,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, fuzzy, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3672,7 +3672,7 @@ msgstr "" "**%s** er ei brukargruppe på %%%%site.name%%%%, ei [mikroblogging](http://en." "wikipedia.org/wiki/Micro-blogging)-teneste" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 #, fuzzy msgid "Admins" msgstr "Administrator" @@ -4220,12 +4220,12 @@ msgstr "Manglar argumentet ID." msgid "Tag %s" msgstr "Merkelapp %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Brukarprofil" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Bilete" @@ -5199,11 +5199,11 @@ msgstr "Fjern" msgid "Attachments" msgstr "" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 #, fuzzy msgid "Provider" msgstr "Profil" @@ -5960,7 +5960,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 #, fuzzy msgid "from" msgstr " frå " @@ -6116,25 +6116,25 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 #, fuzzy msgid "in context" msgstr "Ingen innhald." -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 #, fuzzy msgid "Repeated by" msgstr "Lag" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Svar på denne notisen" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Svar" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 #, fuzzy msgid "Notice repeated" msgstr "Melding lagra" @@ -6417,48 +6417,48 @@ msgstr "Fjern tinging fra denne brukaren" msgid "Unsubscribe" msgstr "Fjern tinging" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "Brukarbilete" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Brukarverkty" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 #, fuzzy msgid "Edit profile settings" msgstr "Profilinnstillingar" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Send ei direktemelding til denne brukaren" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Melding" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "Brukarprofil" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "Administrator" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index d7120fab9..64104175e 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:43:49+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:28:05+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \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.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -582,9 +582,9 @@ msgstr "Konto" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Pseudonim" @@ -726,7 +726,7 @@ msgstr "Brak rozmiaru." msgid "Invalid size." msgstr "Nieprawidłowy rozmiar." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Awatar" @@ -758,7 +758,7 @@ msgid "Preview" msgstr "Podgląd" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Usuń" @@ -1003,7 +1003,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:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Usuń ten wpis" @@ -2707,8 +2707,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Imię i nazwisko" @@ -2735,9 +2735,9 @@ msgid "Bio" msgstr "O mnie" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Położenie" @@ -2751,7 +2751,7 @@ msgstr "Podziel się swoim obecnym położeniem podczas wysyłania wpisów" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Znaczniki" @@ -3214,7 +3214,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:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Subskrybuj" @@ -3252,7 +3252,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:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Powtórzono" @@ -3395,7 +3395,7 @@ msgstr "Organizacja" msgid "Description" msgstr "Opis" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Statystyki" @@ -3516,67 +3516,67 @@ msgstr "Grupa %s" msgid "%1$s group, page %2$d" msgstr "Grupa %1$s, strona %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Profil grupy" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "Adres URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Wpis" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Aliasy" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Działania grupy" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Kanał wpisów dla grupy %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Kanał wpisów dla grupy %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Kanał wpisów dla grupy %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "FOAF dla grupy %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Członkowie" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Brak)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Wszyscy członkowie" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Utworzono" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3592,7 +3592,7 @@ msgstr "" "action.register%%%%), aby stać się częścią tej grupy i wiele więcej. " "([Przeczytaj więcej](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3605,7 +3605,7 @@ msgstr "" "narzędziu [StatusNet](http://status.net/). Jej członkowie dzielą się " "krótkimi wiadomościami o swoim życiu i zainteresowaniach. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Administratorzy" @@ -4159,12 +4159,12 @@ msgstr "Brak parametru identyfikatora." msgid "Tag %s" msgstr "Znacznik %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Profil użytkownika" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Zdjęcie" @@ -5098,11 +5098,11 @@ msgstr "Unieważnij" msgid "Attachments" msgstr "Załączniki" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "Autor" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Dostawca" @@ -5148,9 +5148,9 @@ msgid "Could not find a user with nickname %s" msgstr "Nie można odnaleźć użytkownika z pseudonimem %s." #: lib/command.php:143 -#, fuzzy, php-format +#, php-format msgid "Could not find a local user with nickname %s" -msgstr "Nie można odnaleźć użytkownika z pseudonimem %s." +msgstr "Nie można odnaleźć lokalnego użytkownika z pseudonimem %s." #: lib/command.php:176 msgid "Sorry, this command is not yet implemented." @@ -5230,6 +5230,8 @@ msgid "" "%s is a remote profile; you can only send direct messages to users on the " "same server." msgstr "" +"%s to zdalny profil; można wysyłać bezpośrednie wiadomości tylko do " +"użytkowników na tym samym serwerze." #: lib/command.php:450 #, php-format @@ -5281,9 +5283,8 @@ msgid "Specify the name of the user to subscribe to" msgstr "Podaj nazwę użytkownika do subskrybowania." #: lib/command.php:602 -#, fuzzy msgid "Can't subscribe to OMB profiles by command." -msgstr "Nie jesteś subskrybowany do tego profilu." +msgstr "Nie można subskrybować profili OMB za pomocą polecenia." #: lib/command.php:608 #, php-format @@ -5964,7 +5965,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:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "z" @@ -6117,23 +6118,23 @@ msgstr "Zachód" msgid "at" msgstr "w" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "w rozmowie" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "Powtórzone przez" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Odpowiedz na ten wpis" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Odpowiedz" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "Powtórzono wpis" @@ -6402,44 +6403,44 @@ msgstr "Zrezygnuj z subskrypcji tego użytkownika" msgid "Unsubscribe" msgstr "Zrezygnuj z subskrypcji" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Zmodyfikuj awatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Czynności użytkownika" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Zmodyfikuj ustawienia profilu" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Edycja" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Wiadomość" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "Moderuj" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 msgid "User role" msgstr "Rola użytkownika" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "Administrator" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "Moderator" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 368e38c69..90c5e7dcb 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:43:52+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:28:08+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -580,9 +580,9 @@ msgstr "Conta" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Utilizador" @@ -726,7 +726,7 @@ msgstr "Tamanho não definido." msgid "Invalid size." msgstr "Tamanho inválido." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -758,7 +758,7 @@ msgid "Preview" msgstr "Antevisão" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Apagar" @@ -1011,7 +1011,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:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Apagar esta nota" @@ -2753,8 +2753,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nome completo" @@ -2781,9 +2781,9 @@ msgid "Bio" msgstr "Biografia" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Localidade" @@ -2797,7 +2797,7 @@ msgstr "Compartilhar a minha localização presente ao publicar notas" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Categorias" @@ -3262,7 +3262,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:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Subscrever" @@ -3300,7 +3300,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:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Repetida" @@ -3449,7 +3449,7 @@ msgstr "Paginação" msgid "Description" msgstr "Descrição" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Estatísticas" @@ -3570,67 +3570,67 @@ msgstr "Grupo %s" msgid "%1$s group, page %2$d" msgstr "Membros do grupo %1$s, página %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Perfil do grupo" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Anotação" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Sinónimos" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Acções do grupo" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Fonte de notas do grupo %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Fonte de notas do grupo %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Fonte de notas do grupo %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "FOAF do grupo %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Membros" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Nenhum)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Todos os membros" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Criado" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3646,7 +3646,7 @@ msgstr "" "[Registe-se agora](%%action.register%%) para se juntar a este grupo e a " "muitos mais! ([Saber mais](%%doc.help%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3659,7 +3659,7 @@ msgstr "" "programa de Software Livre [StatusNet](http://status.net/). Os membros deste " "grupo partilham mensagens curtas acerca das suas vidas e interesses. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Gestores" @@ -4219,12 +4219,12 @@ msgstr "Argumento de identificação (ID) em falta." msgid "Tag %s" msgstr "Categoria %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Perfil" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Foto" @@ -5184,11 +5184,11 @@ msgstr "Remover" msgid "Attachments" msgstr "Anexos" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "Autor" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Fornecedor" @@ -6044,7 +6044,7 @@ msgstr "" "conversa com outros utilizadores. Outros podem enviar-lhe mensagens, a que " "só você terá acesso." -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "de" @@ -6200,23 +6200,23 @@ msgstr "O" msgid "at" msgstr "coords." -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "no contexto" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "Repetida por" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Responder a esta nota" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "Nota repetida" @@ -6484,46 +6484,46 @@ msgstr "Deixar de subscrever este utilizador" msgid "Unsubscribe" msgstr "Abandonar" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Editar Avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Acções do utilizador" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Editar configurações do perfil" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Editar" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Enviar mensagem directa a este utilizador" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Mensagem" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "Moderar" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "Perfil" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "Gestores" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 #, fuzzy msgctxt "role" msgid "Moderator" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index 5bf084134..433a21c36 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:43:55+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:28:11+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -589,9 +589,9 @@ msgstr "Conta" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Usuário" @@ -733,7 +733,7 @@ msgstr "Sem tamanho definido." msgid "Invalid size." msgstr "Tamanho inválido." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -766,7 +766,7 @@ msgid "Preview" msgstr "Visualização" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Excluir" @@ -1013,7 +1013,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:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Excluir esta mensagem" @@ -2742,8 +2742,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Nome completo" @@ -2770,9 +2770,9 @@ msgid "Bio" msgstr "Descrição" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Localização" @@ -2786,7 +2786,7 @@ msgstr "Compartilhe minha localização atual ao publicar mensagens" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Etiquetas" @@ -3253,7 +3253,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:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Assinar" @@ -3290,7 +3290,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:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Repetida" @@ -3436,7 +3436,7 @@ msgstr "Organização" msgid "Description" msgstr "Descrição" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Estatísticas" @@ -3557,67 +3557,67 @@ msgstr "Grupo %s" msgid "%1$s group, page %2$d" msgstr "Grupo %1$s, pág. %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Perfil do grupo" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "Site" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Mensagem" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Apelidos" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Ações do grupo" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Fonte de mensagens do grupo %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Fonte de mensagens do grupo %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Fonte de mensagens do grupo %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "FOAF para o grupo %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Membros" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Nenhum)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Todos os membros" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Criado" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3633,7 +3633,7 @@ msgstr "" "para se tornar parte deste grupo e muito mais! ([Saiba mais](%%%%doc.help%%%" "%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3646,7 +3646,7 @@ msgstr "" "[StatusNet](http://status.net/). Seus membros compartilham mensagens curtas " "sobre suas vidas e interesses. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Administradores" @@ -4205,12 +4205,12 @@ msgstr "Nenhum argumento de ID." msgid "Tag %s" msgstr "Etiqueta %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Perfil do usuário" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Imagem" @@ -5160,11 +5160,11 @@ msgstr "Revogar" msgid "Attachments" msgstr "Anexos" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "Autor" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Operadora" @@ -6022,7 +6022,7 @@ msgstr "" "privadas para envolver outras pessoas em uma conversa. Você também pode " "receber mensagens privadas." -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "de" @@ -6180,23 +6180,23 @@ msgstr "O" msgid "at" msgstr "em" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "no contexto" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "Repetida por" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Responder a esta mensagem" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Responder" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "Mensagem repetida" @@ -6464,45 +6464,45 @@ msgstr "Cancelar a assinatura deste usuário" msgid "Unsubscribe" msgstr "Cancelar" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Editar o avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Ações do usuário" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Editar as configurações do perfil" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Editar" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Enviar uma mensagem para este usuário." -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Mensagem" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "Moderar" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "Perfil do usuário" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "Administrador" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 #, fuzzy msgctxt "role" msgid "Moderator" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 2f5df9f69..8e31c8270 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:43:59+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:28:14+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -585,9 +585,9 @@ msgstr "Настройки" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Имя" @@ -729,7 +729,7 @@ msgstr "Нет размера." msgid "Invalid size." msgstr "Неверный размер." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Аватара" @@ -762,7 +762,7 @@ msgid "Preview" msgstr "Просмотр" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Удалить" @@ -1008,7 +1008,7 @@ msgstr "Вы уверены, что хотите удалить эту запи msgid "Do not delete this notice" msgstr "Не удалять эту запись" -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Удалить эту запись" @@ -2726,8 +2726,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 латинских строчных буквы или цифры, без пробелов" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Полное имя" @@ -2754,9 +2754,9 @@ msgid "Bio" msgstr "Биография" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Месторасположение" @@ -2770,7 +2770,7 @@ msgstr "Делиться своим текущим местоположение #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Теги" @@ -3233,7 +3233,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "Адрес URL твоего профиля на другом подходящем сервисе микроблогинга" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Подписаться" @@ -3269,7 +3269,7 @@ msgstr "Вы не можете повторить собственную зап msgid "You already repeated that notice." msgstr "Вы уже повторили эту запись." -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Повторено" @@ -3413,7 +3413,7 @@ msgstr "Организация" msgid "Description" msgstr "Описание" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Статистика" @@ -3534,67 +3534,67 @@ msgstr "Группа %s" msgid "%1$s group, page %2$d" msgstr "Группа %1$s, страница %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Профиль группы" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Запись" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Алиасы" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Действия группы" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Лента записей группы %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Лента записей группы %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Лента записей группы %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "FOAF для группы %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Участники" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(пока ничего нет)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Все участники" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Создано" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3610,7 +3610,7 @@ msgstr "" "action.register%%%%), чтобы стать участником группы и получить множество " "других возможностей! ([Читать далее](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3623,7 +3623,7 @@ msgstr "" "обеспечении [StatusNet](http://status.net/). Участники обмениваются " "короткими сообщениями о своей жизни и интересах. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Администраторы" @@ -4180,12 +4180,12 @@ msgstr "Нет аргумента ID." msgid "Tag %s" msgstr "Теги %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Профиль пользователя" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Фото" @@ -5116,11 +5116,11 @@ msgstr "Отозвать" msgid "Attachments" msgstr "Вложения" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "Автор" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Сервис" @@ -5977,7 +5977,7 @@ msgstr "" "вовлечения других пользователей в разговор. Сообщения, получаемые от других " "людей, видите только вы." -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "от " @@ -6132,23 +6132,23 @@ msgstr "з. д." msgid "at" msgstr "на" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "в контексте" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "Повторено" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Ответить на эту запись" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Ответить" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "Запись повторена" @@ -6416,44 +6416,44 @@ msgstr "Отписаться от этого пользователя" msgid "Unsubscribe" msgstr "Отписаться" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Изменить аватару" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Действия пользователя" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Изменение настроек профиля" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Редактировать" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Послать приватное сообщение этому пользователю." -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Сообщение" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "Модерировать" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 msgid "User role" msgstr "Роль пользователя" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "Администратор" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "Модератор" diff --git a/locale/statusnet.po b/locale/statusnet.po index 5e59df581..8f43b3f93 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-03-12 23:41+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -556,9 +556,9 @@ msgstr "" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "" @@ -700,7 +700,7 @@ msgstr "" msgid "Invalid size." msgstr "" -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "" @@ -732,7 +732,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "" @@ -970,7 +970,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "" -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "" @@ -2581,8 +2581,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "" @@ -2609,9 +2609,9 @@ msgid "Bio" msgstr "" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "" @@ -2625,7 +2625,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "" @@ -3042,7 +3042,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "" @@ -3078,7 +3078,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "" -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "" @@ -3215,7 +3215,7 @@ msgstr "" msgid "Description" msgstr "" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "" @@ -3326,67 +3326,67 @@ msgstr "" msgid "%1$s group, page %2$d" msgstr "" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3396,7 +3396,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3405,7 +3405,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "" @@ -3922,12 +3922,12 @@ msgstr "" msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -4809,11 +4809,11 @@ msgstr "" msgid "Attachments" msgstr "" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "" @@ -5535,7 +5535,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "" @@ -5685,23 +5685,23 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "" @@ -5969,44 +5969,44 @@ msgstr "" msgid "Unsubscribe" msgstr "" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 msgid "User role" msgstr "" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index a1ca8cdf8..4226c757d 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:44:04+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:28:18+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -573,9 +573,9 @@ msgstr "Konto" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Smeknamn" @@ -717,7 +717,7 @@ msgstr "Ingen storlek." msgid "Invalid size." msgstr "Ogiltig storlek." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -750,7 +750,7 @@ msgid "Preview" msgstr "Förhandsgranska" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Ta bort" @@ -997,7 +997,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:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Ta bort denna notis" @@ -2705,8 +2705,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Fullständigt namn" @@ -2733,9 +2733,9 @@ msgid "Bio" msgstr "Biografi" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Plats" @@ -2749,7 +2749,7 @@ msgstr "Dela min nuvarande plats när jag skickar notiser" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Taggar" @@ -3216,7 +3216,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:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Prenumerera" @@ -3254,7 +3254,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:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Upprepad" @@ -3398,7 +3398,7 @@ msgstr "Organisation" msgid "Description" msgstr "Beskrivning" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Statistik" @@ -3520,67 +3520,67 @@ msgstr "%s grupp" msgid "%1$s group, page %2$d" msgstr "%1$s grupp, sida %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Grupprofil" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Notis" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Alias" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Åtgärder för grupp" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Flöde av notiser för %s grupp (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Flöde av notiser för %s grupp (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Flöde av notiser för %s grupp (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "FOAF för %s grupp" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Medlemmar" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ingen)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Alla medlemmar" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Skapad" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3595,7 +3595,7 @@ msgstr "" "sina liv och intressen. [Gå med nu](%%%%action.register%%%%) för att bli en " "del av denna grupp och många fler! ([Läs mer](%%%%doc.help%%%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3608,7 +3608,7 @@ msgstr "" "[StatusNet](http://status.net/). Dess medlemmar delar korta meddelande om " "sina liv och intressen. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Administratörer" @@ -4163,12 +4163,12 @@ msgstr "Inget ID-argument." msgid "Tag %s" msgstr "Tagg %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Användarprofil" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Foto" @@ -5101,11 +5101,11 @@ msgstr "Återkalla" msgid "Attachments" msgstr "Bilagor" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "Författare" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Tillhandahållare" @@ -5957,7 +5957,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:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "från" @@ -6113,23 +6113,23 @@ msgstr "V" msgid "at" msgstr "på" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "i sammanhang" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "Upprepad av" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Svara på denna notis" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Svara" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "Notis upprepad" @@ -6397,46 +6397,46 @@ msgstr "Avsluta prenumerationen på denna användare" msgid "Unsubscribe" msgstr "Avsluta pren." -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Redigera avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Åtgärder för användare" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Redigera profilinställningar" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Redigera" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Skicka ett direktmeddelande till denna användare" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Meddelande" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "Moderera" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "Användarprofil" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "Administratörer" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 #, fuzzy msgctxt "role" msgid "Moderator" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 1449adf15..6adfdc447 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:44:07+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:28:21+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -569,9 +569,9 @@ msgstr "ఖాతా" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "పేరు" @@ -714,7 +714,7 @@ msgstr "పరిమాణం లేదు." msgid "Invalid size." msgstr "తప్పుడు పరిమాణం." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "అవతారం" @@ -746,7 +746,7 @@ msgid "Preview" msgstr "మునుజూపు" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "తొలగించు" @@ -990,7 +990,7 @@ msgstr "మీరు నిజంగానే ఈ నోటీసుని త msgid "Do not delete this notice" msgstr "ఈ నోటీసుని తొలగించకు" -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "ఈ నోటీసుని తొలగించు" @@ -2647,8 +2647,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "పూర్తి పేరు" @@ -2675,9 +2675,9 @@ msgid "Bio" msgstr "స్వపరిచయం" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "ప్రాంతం" @@ -2691,7 +2691,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "ట్యాగులు" @@ -3131,7 +3131,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "చందాచేరు" @@ -3168,7 +3168,7 @@ msgstr "మీ నోటీసుని మీరే పునరావృతి msgid "You already repeated that notice." msgstr "మీరు ఇప్పటికే ఆ నోటీసుని పునరావృతించారు." -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 #, fuzzy msgid "Repeated" msgstr "సృష్టితం" @@ -3315,7 +3315,7 @@ msgstr "సంస్ధ" msgid "Description" msgstr "వివరణ" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "గణాంకాలు" @@ -3428,67 +3428,67 @@ msgstr "%s గుంపు" msgid "%1$s group, page %2$d" msgstr "%1$s గుంపు , %2$dవ పేజీ" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "గుంపు ప్రొఫైలు" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "గమనిక" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "మారుపేర్లు" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "గుంపు చర్యలు" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "%s యొక్క సందేశముల ఫీడు" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "%s యొక్క సందేశముల ఫీడు" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "%s యొక్క సందేశముల ఫీడు" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "%s గుంపు" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "సభ్యులు" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(ఏమీలేదు)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "అందరు సభ్యులూ" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "సృష్టితం" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3498,7 +3498,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3507,7 +3507,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "నిర్వాహకులు" @@ -4042,12 +4042,12 @@ msgstr "అటువంటి పత్రమేమీ లేదు." msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "వాడుకరి ప్రొఫైలు" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "ఫొటో" @@ -4959,11 +4959,11 @@ msgstr "తొలగించు" msgid "Attachments" msgstr "జోడింపులు" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "రచయిత" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 #, fuzzy msgid "Provider" msgstr "ప్రొఫైలు" @@ -5736,7 +5736,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "నుండి" @@ -5892,24 +5892,24 @@ msgstr "ప" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "సందర్భంలో" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 #, fuzzy msgid "Repeated by" msgstr "సృష్టితం" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "ఈ నోటీసుపై స్పందించండి" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "స్పందించండి" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 #, fuzzy msgid "Notice repeated" msgstr "నోటీసుని తొలగించాం." @@ -6186,45 +6186,45 @@ msgstr "ఈ వాడుకరి నుండి చందామాను" msgid "Unsubscribe" msgstr "చందామాను" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "అవతారాన్ని మార్చు" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "వాడుకరి చర్యలు" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 #, fuzzy msgid "Edit profile settings" msgstr "ఫ్రొఫైలు అమరికలు" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "మార్చు" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "ఈ వాడుకరికి ఒక నేరు సందేశాన్ని పంపించండి" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "సందేశం" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 msgid "User role" msgstr "వాడుకరి పాత్ర" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "నిర్వాహకులు" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "సమన్వయకర్త" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 07b518790..bc4e25d10 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:44:10+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:28:23+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -589,9 +589,9 @@ msgstr "Hakkında" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Takma ad" @@ -740,7 +740,7 @@ msgstr "" msgid "Invalid size." msgstr "Geçersiz büyüklük." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Avatar" @@ -773,7 +773,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "" @@ -1028,7 +1028,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "Böyle bir durum mesajı yok." -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "" @@ -2751,8 +2751,8 @@ msgstr "" "verilmez" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Tam İsim" @@ -2781,9 +2781,9 @@ msgid "Bio" msgstr "Hakkında" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Yer" @@ -2797,7 +2797,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "" @@ -3228,7 +3228,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Abone ol" @@ -3268,7 +3268,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:676 +#: actions/repeat.php:114 lib/noticelist.php:677 #, fuzzy msgid "Repeated" msgstr "Yarat" @@ -3417,7 +3417,7 @@ msgstr "Yer" msgid "Description" msgstr "Abonelikler" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "İstatistikler" @@ -3528,71 +3528,71 @@ msgstr "" msgid "%1$s group, page %2$d" msgstr "Bütün abonelikler" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 #, fuzzy msgid "Group profile" msgstr "Böyle bir durum mesajı yok." -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 #, fuzzy msgid "Note" msgstr "Durum mesajları" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "%s için durum RSS beslemesi" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "%s için durum RSS beslemesi" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "%s için durum RSS beslemesi" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, fuzzy, php-format msgid "FOAF for %s group" msgstr "%s için durum RSS beslemesi" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "Üyelik başlangıcı" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 #, fuzzy msgid "Created" msgstr "Yarat" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3602,7 +3602,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3611,7 +3611,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "" @@ -4150,13 +4150,13 @@ msgstr "Böyle bir belge yok." msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 #, fuzzy msgid "User profile" msgstr "Kullanıcının profili yok." #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -5113,11 +5113,11 @@ msgstr "Kaldır" msgid "Attachments" msgstr "" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 #, fuzzy msgid "Provider" msgstr "Profil" @@ -5873,7 +5873,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "" @@ -6029,26 +6029,26 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 #, fuzzy msgid "in context" msgstr "İçerik yok!" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 #, fuzzy msgid "Repeated by" msgstr "Yarat" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 #, fuzzy msgid "Reply" msgstr "cevapla" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 #, fuzzy msgid "Notice repeated" msgstr "Durum mesajları" @@ -6330,47 +6330,47 @@ msgstr "" msgid "Unsubscribe" msgstr "Aboneliği sonlandır" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "Avatar" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 #, fuzzy msgid "Edit profile settings" msgstr "Profil ayarları" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "Kullanıcının profili yok." -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index ab9a9bad1..d679449b2 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:44:13+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:28:35+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -582,9 +582,9 @@ msgstr "Акаунт" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Ім’я користувача" @@ -728,7 +728,7 @@ msgstr "Немає розміру." msgid "Invalid size." msgstr "Недійсний розмір." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Аватара" @@ -760,7 +760,7 @@ msgid "Preview" msgstr "Перегляд" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "Видалити" @@ -1004,7 +1004,7 @@ msgstr "Ви впевненні, що бажаєте видалити цей д msgid "Do not delete this notice" msgstr "Не видаляти цей допис" -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "Видалити допис" @@ -2716,8 +2716,8 @@ msgstr "" "1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Повне ім’я" @@ -2744,9 +2744,9 @@ msgid "Bio" msgstr "Про себе" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Розташування" @@ -2760,7 +2760,7 @@ msgstr "Показувати мою поточну локацію при над #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Теґи" @@ -3224,7 +3224,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "URL-адреса Вашого профілю на іншому сумісному сервісі" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Підписатись" @@ -3261,7 +3261,7 @@ msgstr "Ви не можете повторювати свої власні до msgid "You already repeated that notice." msgstr "Ви вже повторили цей допис." -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 msgid "Repeated" msgstr "Повторено" @@ -3404,7 +3404,7 @@ msgstr "Організація" msgid "Description" msgstr "Опис" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Статистика" @@ -3525,67 +3525,67 @@ msgstr "Група %s" msgid "%1$s group, page %2$d" msgstr "Група %1$s, сторінка %2$d" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 msgid "Group profile" msgstr "Профіль групи" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "Зауваження" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "Додаткові імена" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "Діяльність групи" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Стрічка дописів групи %s (RSS 1.0)" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Стрічка дописів групи %s (RSS 2.0)" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "Стрічка дописів групи %s (Atom)" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "FOAF для групи %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Учасники" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Пусто)" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "Всі учасники" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 msgid "Created" msgstr "Створено" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3600,7 +3600,7 @@ msgstr "" "короткі дописи про своє життя та інтереси. [Приєднуйтесь](%%action.register%" "%) зараз і долучіться до спілкування! ([Дізнатися більше](%%doc.help%%))" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3613,7 +3613,7 @@ msgstr "" "забезпеченні [StatusNet](http://status.net/). Члени цієї групи роблять " "короткі дописи про своє життя та інтереси. " -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "Адміни" @@ -4165,12 +4165,12 @@ msgstr "Немає ID аргументу." msgid "Tag %s" msgstr "Позначити %s" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 msgid "User profile" msgstr "Профіль користувача." #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "Фото" @@ -5097,11 +5097,11 @@ msgstr "Відкликати" msgid "Attachments" msgstr "Вкладення" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "Автор" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "Провайдер" @@ -5147,9 +5147,9 @@ msgid "Could not find a user with nickname %s" msgstr "Не вдалося знайти користувача з іменем %s" #: lib/command.php:143 -#, fuzzy, php-format +#, php-format msgid "Could not find a local user with nickname %s" -msgstr "Не вдалося знайти користувача з іменем %s" +msgstr "Не вдалося знайти локального користувача з іменем %s" #: lib/command.php:176 msgid "Sorry, this command is not yet implemented." @@ -5229,6 +5229,8 @@ msgid "" "%s is a remote profile; you can only send direct messages to users on the " "same server." msgstr "" +"%s — це віддалений профіль; Ви можете надсилати приватні повідомлення лише " +"користувачам одного з вами сервісу." #: lib/command.php:450 #, php-format @@ -5280,9 +5282,8 @@ msgid "Specify the name of the user to subscribe to" msgstr "Зазначте ім’я користувача, до якого бажаєте підписатись" #: lib/command.php:602 -#, fuzzy msgid "Can't subscribe to OMB profiles by command." -msgstr "Ви не підписані до цього профілю." +msgstr "Не можу підписатись до профілю OMB за командою." #: lib/command.php:608 #, php-format @@ -5955,7 +5956,7 @@ msgstr "" "повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите " "лише Ви." -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "від" @@ -6110,23 +6111,23 @@ msgstr "Зах." msgid "at" msgstr "в" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 msgid "in context" msgstr "в контексті" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 msgid "Repeated by" msgstr "Повторено" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "Відповісти на цей допис" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Відповісти" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 msgid "Notice repeated" msgstr "Допис повторили" @@ -6394,44 +6395,44 @@ msgstr "Відписатись від цього користувача" msgid "Unsubscribe" msgstr "Відписатись" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Аватара" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "Діяльність користувача" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 msgid "Edit profile settings" msgstr "Налаштування профілю" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "Правка" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "Надіслати пряме повідомлення цьому користувачеві" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "Повідомлення" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "Модерувати" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 msgid "User role" msgstr "Роль користувача" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "Адміністратор" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "Модератор" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 3848e101c..68fc6523c 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:44:16+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:28:37+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -591,9 +591,9 @@ msgstr "Giới thiệu" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "Biệt danh" @@ -741,7 +741,7 @@ msgstr "Không có kích thước." msgid "Invalid size." msgstr "Kích thước không hợp lệ." -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "Hình đại diện" @@ -776,7 +776,7 @@ msgid "Preview" msgstr "Xem trước" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 #, fuzzy msgid "Delete" msgstr "Xóa tin nhắn" @@ -1034,7 +1034,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:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 #, fuzzy msgid "Delete this notice" msgstr "Xóa tin nhắn" @@ -2848,8 +2848,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64 chữ cái thường hoặc là chữ số, không có dấu chấm hay " #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "Tên đầy đủ" @@ -2877,9 +2877,9 @@ msgid "Bio" msgstr "Lý lịch" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "Thành phố" @@ -2893,7 +2893,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "Từ khóa" @@ -3346,7 +3346,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:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "Theo bạn này" @@ -3387,7 +3387,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:676 +#: actions/repeat.php:114 lib/noticelist.php:677 #, fuzzy msgid "Repeated" msgstr "Tạo" @@ -3536,7 +3536,7 @@ msgstr "Thư mời đã gửi" msgid "Description" msgstr "Mô tả" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "Số liệu thống kê" @@ -3648,72 +3648,72 @@ msgstr "%s và nhóm" msgid "%1$s group, page %2$d" msgstr "Thành viên" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 #, fuzzy msgid "Group profile" msgstr "Thông tin nhóm" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 #, fuzzy msgid "Note" msgstr "Tin nhắn" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 #, fuzzy msgid "Group actions" msgstr "Mã nhóm" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "Dòng tin nhắn cho %s" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "Dòng tin nhắn cho %s" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "Dòng tin nhắn cho %s" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "Hộp thư đi của %s" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 msgid "Members" msgstr "Thành viên" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 #, fuzzy msgid "All members" msgstr "Thành viên" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 #, fuzzy msgid "Created" msgstr "Tạo" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3723,7 +3723,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3732,7 +3732,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "" @@ -4290,13 +4290,13 @@ msgstr "Không có tài liệu nào." msgid "Tag %s" msgstr "Từ khóa" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 #, fuzzy msgid "User profile" msgstr "Hồ sơ" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -5271,11 +5271,11 @@ msgstr "Xóa" msgid "Attachments" msgstr "" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 #, fuzzy msgid "Provider" msgstr "Hồ sơ " @@ -6095,7 +6095,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 #, fuzzy msgid "from" msgstr " từ " @@ -6255,26 +6255,26 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 #, fuzzy msgid "in context" msgstr "Không có nội dung!" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 #, fuzzy msgid "Repeated by" msgstr "Tạo" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 #, fuzzy msgid "Reply to this notice" msgstr "Trả lời tin nhắn này" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "Trả lời" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 #, fuzzy msgid "Notice repeated" msgstr "Tin đã gửi" @@ -6569,50 +6569,50 @@ msgstr "Ngừng đăng ký từ người dùng này" msgid "Unsubscribe" msgstr "Hết theo" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "Hình đại diện" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 #, fuzzy msgid "User actions" msgstr "Không tìm thấy action" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 #, fuzzy msgid "Edit profile settings" msgstr "Các thiết lập cho Hồ sơ cá nhân" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 #, fuzzy msgid "Send a direct message to this user" msgstr "Bạn đã theo những người này:" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 #, fuzzy msgid "Message" msgstr "Tin mới nhất" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "Hồ sơ" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index e6542c3a7..e64a31790 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:44:18+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:28:41+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -588,9 +588,9 @@ msgstr "帐号" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "昵称" @@ -739,7 +739,7 @@ msgstr "没有大小。" msgid "Invalid size." msgstr "大小不正确。" -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "头像" @@ -771,7 +771,7 @@ msgid "Preview" msgstr "预览" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 #, fuzzy msgid "Delete" msgstr "删除" @@ -1030,7 +1030,7 @@ msgstr "确定要删除这条消息吗？" msgid "Do not delete this notice" msgstr "无法删除通告。" -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 #, fuzzy msgid "Delete this notice" msgstr "删除通告" @@ -2789,8 +2789,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1 到 64 个小写字母或数字，不包含标点及空白" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "全名" @@ -2818,9 +2818,9 @@ msgid "Bio" msgstr "自述" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "位置" @@ -2834,7 +2834,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "标签" @@ -3278,7 +3278,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "您在其他兼容的微博客服务的个人信息URL" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "订阅" @@ -3321,7 +3321,7 @@ msgstr "您必须同意此授权方可注册。" msgid "You already repeated that notice." msgstr "您已成功阻止该用户：" -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 #, fuzzy msgid "Repeated" msgstr "创建" @@ -3471,7 +3471,7 @@ msgstr "分页" msgid "Description" msgstr "描述" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "统计" @@ -3583,71 +3583,71 @@ msgstr "%s 组" msgid "%1$s group, page %2$d" msgstr "%s 组成员, 第 %d 页" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 #, fuzzy msgid "Group profile" msgstr "组资料" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "URL 互联网地址" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 #, fuzzy msgid "Note" msgstr "通告" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "组动作" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "%s 的通告聚合" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "%s 的通告聚合" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "%s 的通告聚合" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, php-format msgid "FOAF for %s group" msgstr "%s 的发件箱" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "注册于" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "（没有）" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "所有成员" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 #, fuzzy msgid "Created" msgstr "创建" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3657,7 +3657,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, fuzzy, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3668,7 +3668,7 @@ msgstr "" "**%s** 是一个 %%%%site.name%%%% 的用户组,一个微博客服务 [micro-blogging]" "(http://en.wikipedia.org/wiki/Micro-blogging)" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 #, fuzzy msgid "Admins" msgstr "admin管理员" @@ -4219,13 +4219,13 @@ msgstr "没有这份文档。" msgid "Tag %s" msgstr "标签" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 #, fuzzy msgid "User profile" msgstr "用户没有个人信息。" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "相片" @@ -5201,11 +5201,11 @@ msgstr "移除" msgid "Attachments" msgstr "" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 #, fuzzy msgid "Provider" msgstr "个人信息" @@ -5970,7 +5970,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 #, fuzzy msgid "from" msgstr " 从 " @@ -6129,27 +6129,27 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 #, fuzzy msgid "in context" msgstr "没有内容！" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 #, fuzzy msgid "Repeated by" msgstr "创建" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 #, fuzzy msgid "Reply to this notice" msgstr "无法删除通告。" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 #, fuzzy msgid "Reply" msgstr "回复" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 #, fuzzy msgid "Notice repeated" msgstr "消息已发布。" @@ -6440,51 +6440,51 @@ msgstr "取消订阅 %s" msgid "Unsubscribe" msgstr "退订" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "头像" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 #, fuzzy msgid "User actions" msgstr "未知动作" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 #, fuzzy msgid "Edit profile settings" msgstr "个人设置" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 #, fuzzy msgid "Send a direct message to this user" msgstr "无法向此用户发送消息。" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 #, fuzzy msgid "Message" msgstr "新消息" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "用户没有个人信息。" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 #, fuzzy msgctxt "role" msgid "Administrator" msgstr "admin管理员" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index ae1cd9546..5672a6f0d 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-03-12 23:41+0000\n" -"PO-Revision-Date: 2010-03-12 23:44:21+0000\n" +"POT-Creation-Date: 2010-03-14 22:26+0000\n" +"PO-Revision-Date: 2010-03-14 22:28:45+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63655); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r63757); 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" @@ -580,9 +580,9 @@ msgstr "關於" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/showgroup.php:245 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 -#: lib/userprofile.php:131 +#: lib/userprofile.php:132 msgid "Nickname" msgstr "暱稱" @@ -729,7 +729,7 @@ msgstr "無尺寸" msgid "Invalid size." msgstr "尺寸錯誤" -#: actions/avatarsettings.php:67 actions/showgroup.php:229 +#: actions/avatarsettings.php:67 actions/showgroup.php:230 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "個人圖像" @@ -762,7 +762,7 @@ msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:657 +#: lib/deleteuserform.php:66 lib/noticelist.php:658 msgid "Delete" msgstr "" @@ -1017,7 +1017,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "無此通知" -#: actions/deletenotice.php:146 lib/noticelist.php:657 +#: actions/deletenotice.php:146 lib/noticelist.php:658 msgid "Delete this notice" msgstr "" @@ -2695,8 +2695,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1-64個小寫英文字母或數字，勿加標點符號或空格" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:255 actions/tagother.php:104 -#: lib/groupeditform.php:157 lib/userprofile.php:149 +#: actions/showgroup.php:256 actions/tagother.php:104 +#: lib/groupeditform.php:157 lib/userprofile.php:150 msgid "Full name" msgstr "全名" @@ -2724,9 +2724,9 @@ msgid "Bio" msgstr "自我介紹" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/showgroup.php:265 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 -#: lib/userprofile.php:164 +#: lib/userprofile.php:165 msgid "Location" msgstr "地點" @@ -2740,7 +2740,7 @@ msgstr "" #: actions/profilesettings.php:145 actions/tagother.php:149 #: actions/tagother.php:209 lib/subscriptionlist.php:106 -#: lib/subscriptionlist.php:108 lib/userprofile.php:209 +#: lib/subscriptionlist.php:108 lib/userprofile.php:210 msgid "Tags" msgstr "" @@ -3162,7 +3162,7 @@ msgid "URL of your profile on another compatible microblogging service" msgstr "" #: actions/remotesubscribe.php:137 lib/subscribeform.php:139 -#: lib/userprofile.php:394 +#: lib/userprofile.php:395 msgid "Subscribe" msgstr "" @@ -3201,7 +3201,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "無此使用者" -#: actions/repeat.php:114 lib/noticelist.php:676 +#: actions/repeat.php:114 lib/noticelist.php:677 #, fuzzy msgid "Repeated" msgstr "新增" @@ -3347,7 +3347,7 @@ msgstr "地點" msgid "Description" msgstr "所有訂閱" -#: actions/showapplication.php:192 actions/showgroup.php:438 +#: actions/showapplication.php:192 actions/showgroup.php:439 #: lib/profileaction.php:176 msgid "Statistics" msgstr "" @@ -3458,70 +3458,70 @@ msgstr "" msgid "%1$s group, page %2$d" msgstr "所有訂閱" -#: actions/showgroup.php:226 +#: actions/showgroup.php:227 #, fuzzy msgid "Group profile" msgstr "無此通知" -#: actions/showgroup.php:271 actions/tagother.php:118 -#: actions/userauthorization.php:175 lib/userprofile.php:177 +#: actions/showgroup.php:272 actions/tagother.php:118 +#: actions/userauthorization.php:175 lib/userprofile.php:178 msgid "URL" msgstr "" -#: actions/showgroup.php:282 actions/tagother.php:128 -#: actions/userauthorization.php:187 lib/userprofile.php:194 +#: actions/showgroup.php:283 actions/tagother.php:128 +#: actions/userauthorization.php:187 lib/userprofile.php:195 msgid "Note" msgstr "" -#: actions/showgroup.php:292 lib/groupeditform.php:184 +#: actions/showgroup.php:293 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:301 +#: actions/showgroup.php:302 msgid "Group actions" msgstr "" -#: actions/showgroup.php:337 +#: actions/showgroup.php:338 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/showgroup.php:343 +#: actions/showgroup.php:344 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/showgroup.php:349 +#: actions/showgroup.php:350 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/showgroup.php:354 +#: actions/showgroup.php:355 #, fuzzy, php-format msgid "FOAF for %s group" msgstr "無此通知" -#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91 +#: actions/showgroup.php:391 actions/showgroup.php:448 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "何時加入會員的呢？" -#: actions/showgroup.php:395 lib/profileaction.php:117 +#: actions/showgroup.php:396 lib/profileaction.php:117 #: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" -#: actions/showgroup.php:401 +#: actions/showgroup.php:402 msgid "All members" msgstr "" -#: actions/showgroup.php:441 +#: actions/showgroup.php:442 #, fuzzy msgid "Created" msgstr "新增" -#: actions/showgroup.php:457 +#: actions/showgroup.php:458 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3531,7 +3531,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:463 +#: actions/showgroup.php:464 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3540,7 +3540,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:491 +#: actions/showgroup.php:492 msgid "Admins" msgstr "" @@ -4076,13 +4076,13 @@ msgstr "無此文件" msgid "Tag %s" msgstr "" -#: actions/tagother.php:77 lib/userprofile.php:75 +#: actions/tagother.php:77 lib/userprofile.php:76 #, fuzzy msgid "User profile" msgstr "無此通知" #: actions/tagother.php:81 actions/userauthorization.php:132 -#: lib/userprofile.php:102 +#: lib/userprofile.php:103 msgid "Photo" msgstr "" @@ -5017,11 +5017,11 @@ msgstr "" msgid "Attachments" msgstr "" -#: lib/attachmentlist.php:265 +#: lib/attachmentlist.php:263 msgid "Author" msgstr "" -#: lib/attachmentlist.php:278 +#: lib/attachmentlist.php:276 msgid "Provider" msgstr "" @@ -5766,7 +5766,7 @@ msgid "" "users in conversation. People can send you messages for your eyes only." msgstr "" -#: lib/mailbox.php:227 lib/noticelist.php:484 +#: lib/mailbox.php:227 lib/noticelist.php:485 msgid "from" msgstr "" @@ -5921,25 +5921,25 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:568 +#: lib/noticelist.php:569 #, fuzzy msgid "in context" msgstr "無內容" -#: lib/noticelist.php:603 +#: lib/noticelist.php:604 #, fuzzy msgid "Repeated by" msgstr "新增" -#: lib/noticelist.php:630 +#: lib/noticelist.php:631 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:631 +#: lib/noticelist.php:632 msgid "Reply" msgstr "" -#: lib/noticelist.php:675 +#: lib/noticelist.php:676 #, fuzzy msgid "Notice repeated" msgstr "更新個人圖像" @@ -6218,47 +6218,47 @@ msgstr "" msgid "Unsubscribe" msgstr "" -#: lib/userprofile.php:116 +#: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" msgstr "個人圖像" -#: lib/userprofile.php:236 +#: lib/userprofile.php:237 msgid "User actions" msgstr "" -#: lib/userprofile.php:251 +#: lib/userprofile.php:252 #, fuzzy msgid "Edit profile settings" msgstr "線上即時通設定" -#: lib/userprofile.php:252 +#: lib/userprofile.php:253 msgid "Edit" msgstr "" -#: lib/userprofile.php:275 +#: lib/userprofile.php:276 msgid "Send a direct message to this user" msgstr "" -#: lib/userprofile.php:276 +#: lib/userprofile.php:277 msgid "Message" msgstr "" -#: lib/userprofile.php:314 +#: lib/userprofile.php:315 msgid "Moderate" msgstr "" -#: lib/userprofile.php:352 +#: lib/userprofile.php:353 #, fuzzy msgid "User role" msgstr "無此通知" -#: lib/userprofile.php:354 +#: lib/userprofile.php:355 msgctxt "role" msgid "Administrator" msgstr "" -#: lib/userprofile.php:355 +#: lib/userprofile.php:356 msgctxt "role" msgid "Moderator" msgstr "" -- cgit v1.2.3-54-g00ecf From 3e2b806e755064d9bcf5ad63faa83329455ffbc2 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 15 Mar 2010 09:42:25 -0700 Subject: Add scripts/docgen.php to build basic doxygen HTML docs from doc comments, either for core or a given plugin. Nothing too fancy yet; style and layout needs some loving! --- scripts/docgen.php | 84 +++ scripts/doxygen.tmpl | 1516 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1600 insertions(+) create mode 100755 scripts/docgen.php create mode 100644 scripts/doxygen.tmpl diff --git a/scripts/docgen.php b/scripts/docgen.php new file mode 100755 index 000000000..78bbe37d8 --- /dev/null +++ b/scripts/docgen.php @@ -0,0 +1,84 @@ +#!/usr/bin/env php + STATUSNET_VERSION, + '%%indir%%' => $indir, + '%%pattern%%' => $pattern, + '%%outdir%%' => $outdir, + '%%htmlout%%' => $outdir, + '%%exclude%%' => $exclude, +); + +var_dump($replacements); + +$template = file_get_contents(dirname(__FILE__) . '/doxygen.tmpl'); +$template = strtr($template, $replacements); + +$templateFile = tempnam(sys_get_temp_dir(), 'statusnet-doxygen'); +file_put_contents($templateFile, $template); + +$cmd = "doxygen " . escapeshellarg($templateFile); + +$retval = 0; +passthru($cmd, $retval); + +if ($retval == 0) { + echo "Done!\n"; + unlink($templateFile); + exit(0); +} else { + echo "Failed! Doxygen config left in $templateFile\n"; + exit($retval); +} + diff --git a/scripts/doxygen.tmpl b/scripts/doxygen.tmpl new file mode 100644 index 000000000..15d03e3bb --- /dev/null +++ b/scripts/doxygen.tmpl @@ -0,0 +1,1516 @@ +# Doxyfile 1.6.1 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = StatusNet + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = %%version%% + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = %%outdir%% + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = %%indir%% + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it parses. +# With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this tag. +# The format is ext=language, where ext is a file extension, and language is one of +# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, +# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat +# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), +# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen to replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penality. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will rougly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = NO + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by +# doxygen. The layout file controls the global structure of the generated output files +# in an output format independent way. The create the layout file that represents +# doxygen's defaults, run doxygen with the -l option. You can optionally specify a +# file name after the option, if omitted DoxygenLayout.xml will be used as the name +# of the layout file. + +LAYOUT_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = %%indir%% + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 + +FILE_PATTERNS = %%pattern%% + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +# fixme for some reason this doesn't work? + +EXCLUDE = config.php extlib local plugins scripts + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = %%exclude%% + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = YES + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. +# Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = NO + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = %%htmlout%% + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER +# are set, an additional index file will be generated that can be used as input for +# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated +# HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. +# For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's +# filter section matches. +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# When the SEARCHENGINE tag is enable doxygen will generate a search box for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP) +# there is already a search function so this one should typically +# be disabled. + +SEARCHENGINE = YES + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = NO + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = NO + +# By default doxygen will write a font called FreeSans.ttf to the output +# directory and reference it in all dot files that doxygen generates. This +# font does not include all possible unicode characters however, so when you need +# these (or just want a differently looking font) you can specify the font name +# using DOT_FONTNAME. You need need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = FreeSans + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = YES + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES -- cgit v1.2.3-54-g00ecf From fa1262f51e95fb64d64105cf2a6cce77a227cd6c Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 16 Mar 2010 17:31:05 +0800 Subject: Fixed IE7 prompting the user to download OpenSearch description xml after login (for a private site) Flow: 1. Browser (IE7) is redirected to the login page. 2. Browser reads the page, sees OpenSearch descriptions, tries to download them. Each request gets recorded by SN as the page the user should be redirected to after logging in (returnto). 3. User logs in, then gets redirected to the returnto action, which is an OpenSearch description. The OpenSearch descriptions aren't sensitive so making them public in a private site should be okay. (I recall fixing this in 0.8.x... :-( ) --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 65f251bcc..d6c617e1d 100644 --- a/index.php +++ b/index.php @@ -200,7 +200,7 @@ function checkMirror($action_obj, $args) function isLoginAction($action) { - static $loginActions = array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp'); + static $loginActions = array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp', 'opensearch'); $login = null; -- cgit v1.2.3-54-g00ecf From 8a9b3a858b5b7693198a10c0a9c84155cdb096b2 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Tue, 9 Mar 2010 10:20:48 +0800 Subject: Fixed "Warning: syslog() expects parameter 1 to be long, string given" With the FirePHP plugin enabled, I get these warnings in the output page. This is because the StartLog handler inadvertly modifies the original (number) priority with the corresponding (string) FirePHP priority. --- plugins/FirePHP/FirePHPPlugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/FirePHP/FirePHPPlugin.php b/plugins/FirePHP/FirePHPPlugin.php index 452f79024..9143ff69c 100644 --- a/plugins/FirePHP/FirePHPPlugin.php +++ b/plugins/FirePHP/FirePHPPlugin.php @@ -52,8 +52,8 @@ class FirePHPPlugin extends Plugin { static $firephp_priorities = array(FirePHP::ERROR, FirePHP::ERROR, FirePHP::ERROR, FirePHP::ERROR, FirePHP::WARN, FirePHP::LOG, FirePHP::LOG, FirePHP::INFO); - $priority = $firephp_priorities[$priority]; - $this->firephp->fb($msg, $priority); + $fp_priority = $firephp_priorities[$priority]; + $this->firephp->fb($msg, $fp_priority); } function onPluginVersion(&$versions) -- cgit v1.2.3-54-g00ecf From 0be70e390b2f1ac12b9d8d7f2cbe66a5b93818ad Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 16 Mar 2010 19:34:20 +0100 Subject: Removed dangling stylesheet --- theme/base/css/thickbox.css | 163 -------------------------------------------- 1 file changed, 163 deletions(-) delete mode 100644 theme/base/css/thickbox.css diff --git a/theme/base/css/thickbox.css b/theme/base/css/thickbox.css deleted file mode 100644 index d24b9bedf..000000000 --- a/theme/base/css/thickbox.css +++ /dev/null @@ -1,163 +0,0 @@ -/* ----------------------------------------------------------------------------------------------------------------*/ -/* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/ -/* ----------------------------------------------------------------------------------------------------------------*/ -*{padding: 0; margin: 0;} - -/* ----------------------------------------------------------------------------------------------------------------*/ -/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/ -/* ----------------------------------------------------------------------------------------------------------------*/ -#TB_window { - font: 12px Arial, Helvetica, sans-serif; - color: #333333; -} - -#TB_secondLine { - font: 10px Arial, Helvetica, sans-serif; - color:#666666; -} - -#TB_window a:link {color: #666666;} -#TB_window a:visited {color: #666666;} -#TB_window a:hover {color: #000;} -#TB_window a:active {color: #666666;} -#TB_window a:focus{color: #666666;} - -/* ----------------------------------------------------------------------------------------------------------------*/ -/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/ -/* ----------------------------------------------------------------------------------------------------------------*/ -#TB_overlay { - position: fixed; - z-index:100; - top: 0px; - left: 0px; - height:100%; - width:100%; -} - -.TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;} -.TB_overlayBG { - background-color:#000; - filter:alpha(opacity=75); - -moz-opacity: 0.75; - opacity: 0.75; -} - -* html #TB_overlay { /* ie6 hack */ - position: absolute; - height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); -} - -#TB_window { - position: fixed; - background: #ffffff; - z-index: 102; - color:#000000; - display:none; - border: 4px solid #525252; - text-align:left; - top:50%; - left:50%; -} - -* html #TB_window { /* ie6 hack */ -position: absolute; -margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); -} - -#TB_window img#TB_Image { - display:block; - margin: 15px 0 0 15px; - border-right: 1px solid #ccc; - border-bottom: 1px solid #ccc; - border-top: 1px solid #666; - border-left: 1px solid #666; -} - -#TB_caption{ - height:25px; - padding:7px 30px 10px 25px; - float:left; -} - -#TB_closeWindow{ - height:25px; - padding:11px 25px 10px 0; - float:right; -} - -#TB_closeAjaxWindow{ - padding:7px 10px 5px 0; - margin-bottom:1px; - text-align:right; - float:right; -} - -#TB_ajaxWindowTitle{ - float:left; - padding:7px 0 5px 10px; - margin-bottom:1px; -} - -#TB_title{ - background-color:#e8e8e8; - height:27px; -} - -#TB_ajaxContent{ - clear:both; - padding:2px 15px 15px 15px; - overflow:auto; - text-align:left; - line-height:1.4em; -} - -#TB_ajaxContent.TB_modal{ - padding:15px; -} - -#TB_ajaxContent p{ - padding:5px 0px 5px 0px; -} - -#TB_load{ - position: fixed; - display:none; - height:13px; - width:208px; - z-index:103; - top: 50%; - left: 50%; - margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */ -} - -* html #TB_load { /* ie6 hack */ -position: absolute; -margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); -} - -#TB_HideSelect{ - z-index:99; - position:fixed; - top: 0; - left: 0; - background-color:#fff; - border:none; - filter:alpha(opacity=0); - -moz-opacity: 0; - opacity: 0; - height:100%; - width:100%; -} - -* html #TB_HideSelect { /* ie6 hack */ - position: absolute; - height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); -} - -#TB_iframeContent{ - clear:both; - border:none; - margin-bottom:-1px; - margin-top:1px; - _margin-bottom:1px; -} -- cgit v1.2.3-54-g00ecf From e8c7873b79b73d983b6222869598a6fdfaec674f Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 16 Mar 2010 20:53:49 +0100 Subject: Added extra condition to focusing on notice form on page load. If the window location contains a fragument identifier, it will skip focus and do what the UA does natively. --- js/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/util.js b/js/util.js index 3efda0d7b..2e0f6e57b 100644 --- a/js/util.js +++ b/js/util.js @@ -86,7 +86,7 @@ var SN = { // StatusNet $('#'+form_id+' #'+SN.C.S.NoticeTextCount).text(jQuery.data(form[0], 'ElementData').MaxLength); } - if ($('body')[0].id != 'conversation') { + if ($('body')[0].id != 'conversation' && window.location.hash.length === 0) { $('#'+form_id+' textarea').focus(); } }, -- cgit v1.2.3-54-g00ecf From 910108b9ae18d75782f236248be9770a8d2efb9c Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 16 Mar 2010 21:02:56 +0100 Subject: Removed unnecessary form_id. Using jQuery .find() instead of constructing the selector. --- js/util.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/js/util.js b/js/util.js index 2e0f6e57b..f82ca992c 100644 --- a/js/util.js +++ b/js/util.js @@ -61,10 +61,8 @@ var SN = { // StatusNet U: { // Utils FormNoticeEnhancements: function(form) { - form_id = form.attr('id'); - if (jQuery.data(form[0], 'ElementData') === undefined) { - MaxLength = $('#'+form_id+' #'+SN.C.S.NoticeTextCount).text(); + MaxLength = form.find('#'+SN.C.S.NoticeTextCount).text(); if (typeof(MaxLength) == 'undefined') { MaxLength = SN.C.I.MaxLength; } @@ -72,7 +70,7 @@ var SN = { // StatusNet SN.U.Counter(form); - NDT = $('#'+form_id+' #'+SN.C.S.NoticeDataText); + NDT = form.find('#'+SN.C.S.NoticeDataText); NDT.bind('keyup', function(e) { SN.U.Counter(form); @@ -83,11 +81,11 @@ var SN = { // StatusNet }); } else { - $('#'+form_id+' #'+SN.C.S.NoticeTextCount).text(jQuery.data(form[0], 'ElementData').MaxLength); + form.find('#'+SN.C.S.NoticeTextCount).text(jQuery.data(form[0], 'ElementData').MaxLength); } if ($('body')[0].id != 'conversation' && window.location.hash.length === 0) { - $('#'+form_id+' textarea').focus(); + form.find('textarea').focus(); } }, @@ -105,7 +103,6 @@ var SN = { // StatusNet Counter: function(form) { SN.C.I.FormNoticeCurrent = form; - form_id = form.attr('id'); var MaxLength = jQuery.data(form[0], 'ElementData').MaxLength; @@ -113,8 +110,8 @@ var SN = { // StatusNet return; } - var remaining = MaxLength - $('#'+form_id+' #'+SN.C.S.NoticeDataText).val().length; - var counter = $('#'+form_id+' #'+SN.C.S.NoticeTextCount); + var remaining = MaxLength - form.find('#'+SN.C.S.NoticeDataText).val().length; + var counter = form.find('#'+SN.C.S.NoticeTextCount); if (remaining.toString() != counter.text()) { if (!SN.C.I.CounterBlackout || remaining === 0) { @@ -174,7 +171,6 @@ var SN = { // StatusNet FormNoticeXHR: function(form) { SN.C.I.NoticeDataGeo = {}; - form_id = form.attr('id'); form.append(''); form.ajaxForm({ dataType: 'xml', -- cgit v1.2.3-54-g00ecf From d9a9fd3779c592e3f4e0a8aea8e385ee2183c0b3 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 16 Mar 2010 14:18:37 -0700 Subject: Stub plugins administration panel, allows for disabling/re-enabling plugins from the default plugins list. --- actions/plugindisable.php | 78 ++++++++++++++++ actions/pluginenable.php | 166 ++++++++++++++++++++++++++++++++ actions/pluginsadminpanel.php | 110 ++++++++++++++++++++++ lib/adminpanelaction.php | 8 ++ lib/default.php | 3 +- lib/plugindisableform.php | 93 ++++++++++++++++++ lib/pluginenableform.php | 114 ++++++++++++++++++++++ lib/pluginlist.php | 213 ++++++++++++++++++++++++++++++++++++++++++ lib/router.php | 7 ++ lib/statusnet.php | 5 + 10 files changed, 796 insertions(+), 1 deletion(-) create mode 100644 actions/plugindisable.php create mode 100644 actions/pluginenable.php create mode 100644 actions/pluginsadminpanel.php create mode 100644 lib/plugindisableform.php create mode 100644 lib/pluginenableform.php create mode 100644 lib/pluginlist.php diff --git a/actions/plugindisable.php b/actions/plugindisable.php new file mode 100644 index 000000000..7f107b333 --- /dev/null +++ b/actions/plugindisable.php @@ -0,0 +1,78 @@ +. + * + * PHP version 5 + * + * @category Action + * @package StatusNet + * @author Brion Vibber + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Plugin enable action. + * + * (Re)-enables a plugin from the default plugins list. + * + * Takes parameters: + * + * - plugin: plugin name + * - token: session token to prevent CSRF attacks + * - ajax: boolean; whether to return Ajax or full-browser results + * + * Only works if the current user is logged in. + * + * @category Action + * @package StatusNet + * @author Brion Vibber + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 + * @link http://status.net/ + */ + +class PluginDisableAction extends PluginEnableAction +{ + /** + * Value to save into $config['plugins']['disable-'] + */ + protected function overrideValue() + { + return 1; + } + + protected function successShortTitle() + { + // TRANS: Page title for AJAX form return when a disabling a plugin. + return _m('plugin', 'Disabled'); + } + + protected function successNextForm() + { + return new EnablePluginForm($this, $this->plugin); + } +} + + diff --git a/actions/pluginenable.php b/actions/pluginenable.php new file mode 100644 index 000000000..2dbb3e395 --- /dev/null +++ b/actions/pluginenable.php @@ -0,0 +1,166 @@ +. + * + * PHP version 5 + * + * @category Action + * @package StatusNet + * @author Brion Vibber + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Plugin enable action. + * + * (Re)-enables a plugin from the default plugins list. + * + * Takes parameters: + * + * - plugin: plugin name + * - token: session token to prevent CSRF attacks + * - ajax: boolean; whether to return Ajax or full-browser results + * + * Only works if the current user is logged in. + * + * @category Action + * @package StatusNet + * @author Brion Vibber + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 + * @link http://status.net/ + */ + +class PluginEnableAction extends Action +{ + var $user; + var $plugin; + + /** + * Check pre-requisites and instantiate attributes + * + * @param Array $args array of arguments (URL, GET, POST) + * + * @return boolean success flag + */ + + function prepare($args) + { + parent::prepare($args); + + // @fixme these are pretty common, should a parent class factor these out? + + // Only allow POST requests + + if ($_SERVER['REQUEST_METHOD'] != 'POST') { + $this->clientError(_('This action only accepts POST requests.')); + return false; + } + + // CSRF protection + + $token = $this->trimmed('token'); + + if (!$token || $token != common_session_token()) { + $this->clientError(_('There was a problem with your session token.'. + ' Try again, please.')); + return false; + } + + // Only for logged-in users + + $this->user = common_current_user(); + + if (empty($this->user)) { + $this->clientError(_('Not logged in.')); + return false; + } + + if (!AdminPanelAction::canAdmin('plugins')) { + $this->clientError(_('You cannot administer plugins.')); + return false; + } + + $this->plugin = $this->arg('plugin'); + $defaultPlugins = common_config('plugins', 'default'); + if (!array_key_exists($this->plugin, $defaultPlugins)) { + $this->clientError(_('No such plugin.')); + return false; + } + + return true; + } + + /** + * Handle request + * + * Does the subscription and returns results. + * + * @param Array $args unused. + * + * @return void + */ + + function handle($args) + { + $key = 'disable-' . $this->plugin; + Config::save('plugins', $key, $this->overrideValue()); + + // @fixme this is a pretty common pattern and should be refactored down + if ($this->boolean('ajax')) { + $this->startHTML('text/xml;charset=utf-8'); + $this->elementStart('head'); + $this->element('title', null, $this->successShortTitle()); + $this->elementEnd('head'); + $this->elementStart('body'); + $form = $this->successNextForm(); + $form->show(); + $this->elementEnd('body'); + $this->elementEnd('html'); + } else { + $url = common_local_url('pluginsadminpanel'); + common_redirect($url, 303); + } + } + + /** + * Value to save into $config['plugins']['disable-'] + */ + protected function overrideValue() + { + return 0; + } + + protected function successShortTitle() + { + // TRANS: Page title for AJAX form return when enabling a plugin. + return _m('plugin', 'Enabled'); + } + + protected function successNextForm() + { + return new DisablePluginForm($this, $this->plugin); + } +} diff --git a/actions/pluginsadminpanel.php b/actions/pluginsadminpanel.php new file mode 100644 index 000000000..bc400bd51 --- /dev/null +++ b/actions/pluginsadminpanel.php @@ -0,0 +1,110 @@ +. + * + * @category Settings + * @package StatusNet + * @author Brion Vibber + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +/** + * Plugins settings + * + * @category Admin + * @package StatusNet + * @author Brion Vibber + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class PluginsadminpanelAction extends AdminPanelAction +{ + + /** + * Returns the page title + * + * @return string page title + */ + + function title() + { + // TRANS: Tab and title for plugins admin panel. + return _('Plugins'); + } + + /** + * Instructions for using this form. + * + * @return string instructions + */ + + function getInstructions() + { + // TRANS: Instructions at top of plugin admin page. + return _('Additional plugins can be enabled and configured manually. ' . + 'See the online plugin ' . + 'documentation for more details.'); + } + + /** + * Show the plugins admin panel form + * + * @return void + */ + + function showForm() + { + $this->elementStart('fieldset', array('id' => 'settings_plugins_default')); + + // TRANS: Admin form section header + $this->element('legend', null, _('Default plugins'), 'default'); + + $this->showDefaultPlugins(); + + $this->elementEnd('fieldset'); + } + + /** + * Until we have a general plugin metadata infrastructure, for now + * we'll just list up the ones we know from the global default + * plugins list. + */ + protected function showDefaultPlugins() + { + $plugins = array_keys(common_config('plugins', 'default')); + natsort($plugins); + + if ($plugins) { + $list = new PluginList($plugins, $this); + $list->show(); + } else { + $this->element('p', null, + _('All default plugins have been disabled from the ' . + 'site\'s configuration file.')); + } + } +} diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php index a927e2333..d87981b6a 100644 --- a/lib/adminpanelaction.php +++ b/lib/adminpanelaction.php @@ -407,6 +407,14 @@ class AdminPanelNav extends Widget $menu_title, $action_name == 'snapshotadminpanel', 'nav_snapshot_admin_panel'); } + if (AdminPanelAction::canAdmin('plugins')) { + // TRANS: Menu item title/tooltip + $menu_title = _('Plugins configuration'); + // TRANS: Menu item for site administration + $this->out->menuItem(common_local_url('pluginsadminpanel'), _('Plugins'), + $menu_title, $action_name == 'pluginsadminpanel', 'nav_design_admin_panel'); + } + Event::handle('EndAdminPanelNav', array($this)); } $this->action->elementEnd('ul'); diff --git a/lib/default.php b/lib/default.php index 10f3f1a97..eb0cb0b64 100644 --- a/lib/default.php +++ b/lib/default.php @@ -285,8 +285,9 @@ $default = 'RSSCloud' => null, 'OpenID' => null), ), + 'pluginlist' => array(), 'admin' => - array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice')), + array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'plugins')), 'singleuser' => array('enabled' => false, 'nickname' => null), diff --git a/lib/plugindisableform.php b/lib/plugindisableform.php new file mode 100644 index 000000000..3cbabdb2c --- /dev/null +++ b/lib/plugindisableform.php @@ -0,0 +1,93 @@ +. + * + * @category Form + * @package StatusNet + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +/** + * Form for joining a group + * + * @category Form + * @package StatusNet + * @author Brion Vibber + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + * @see PluginEnableForm + */ + +class PluginDisableForm extends PluginEnableForm +{ + /** + * ID of the form + * + * @return string ID of the form + */ + + function id() + { + return 'plugin-disable-' . $this->plugin; + } + + /** + * class of the form + * + * @return string of the form class + */ + + function formClass() + { + return 'form_plugin_disable'; + } + + /** + * Action of the form + * + * @return string URL of the action + */ + + function action() + { + return common_local_url('plugindisable', + array('plugin' => $this->plugin)); + } + + /** + * Action elements + * + * @return void + */ + + function formActions() + { + // TRANS: Plugin admin panel controls + $this->out->submit('submit', _m('plugin', 'Disable')); + } + +} diff --git a/lib/pluginenableform.php b/lib/pluginenableform.php new file mode 100644 index 000000000..8683ffd0b --- /dev/null +++ b/lib/pluginenableform.php @@ -0,0 +1,114 @@ +. + * + * @category Form + * @package StatusNet + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +require_once INSTALLDIR.'/lib/form.php'; + +/** + * Form for joining a group + * + * @category Form + * @package StatusNet + * @author Brion Vibber + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + * @see PluginDisableForm + */ + +class PluginEnableForm extends Form +{ + /** + * Plugin to enable/disable + */ + + var $plugin = null; + + /** + * Constructor + * + * @param HTMLOutputter $out output channel + * @param string $plugin plugin to enable/disable + */ + + function __construct($out=null, $plugin=null) + { + parent::__construct($out); + + $this->plugin = $plugin; + } + + /** + * ID of the form + * + * @return string ID of the form + */ + + function id() + { + return 'plugin-enable-' . $this->plugin; + } + + /** + * class of the form + * + * @return string of the form class + */ + + function formClass() + { + return 'form_plugin_enable'; + } + + /** + * Action of the form + * + * @return string URL of the action + */ + + function action() + { + return common_local_url('pluginenable', + array('plugin' => $this->plugin)); + } + + /** + * Action elements + * + * @return void + */ + + function formActions() + { + // TRANS: Plugin admin panel controls + $this->out->submit('submit', _m('plugin', 'Enable')); + } +} diff --git a/lib/pluginlist.php b/lib/pluginlist.php new file mode 100644 index 000000000..07a17ba39 --- /dev/null +++ b/lib/pluginlist.php @@ -0,0 +1,213 @@ +. + * + * @category Settings + * @package StatusNet + * @author Brion Vibber + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require INSTALLDIR . "/lib/pluginenableform.php"; +require INSTALLDIR . "/lib/plugindisableform.php"; + +/** + * Plugin list + * + * @category Admin + * @package StatusNet + * @author Brion Vibber + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +class PluginList extends Widget +{ + var $plugins = array(); + + function __construct($plugins, $out) + { + parent::__construct($out); + $this->plugins = $plugins; + } + + function show() + { + $this->startList(); + $this->showPlugins(); + $this->endList(); + } + + function startList() + { + $this->out->elementStart('table', 'plugin_list'); + } + + function endList() + { + $this->out->elementEnd('table'); + } + + function showPlugins() + { + foreach ($this->plugins as $plugin) { + $pli = $this->newListItem($plugin); + $pli->show(); + } + } + + function newListItem($plugin) + { + return new PluginListItem($plugin, $this->out); + } +} + +class PluginListItem extends Widget +{ + /** Current plugin. */ + var $plugin = null; + + /** Local cache for plugin version info */ + protected static $versions = false; + + function __construct($plugin, $out) + { + parent::__construct($out); + $this->plugin = $plugin; + } + + function show() + { + $meta = $this->metaInfo(); + + $this->out->elementStart('tr', array('id' => 'plugin-' . $this->plugin)); + + // Name and controls + $this->out->elementStart('td'); + $this->out->elementStart('div'); + if (!empty($meta['homepage'])) { + $this->out->elementStart('a', array('href' => $meta['homepage'])); + } + $this->out->text($this->plugin); + if (!empty($meta['homepage'])) { + $this->out->elementEnd('a'); + } + $this->out->elementEnd('div'); + + $form = $this->getControlForm(); + $form->show(); + + $this->out->elementEnd('td'); + + // Version and authors + $this->out->elementStart('td'); + if (!empty($meta['version'])) { + $this->out->elementStart('div'); + $this->out->text($meta['version']); + $this->out->elementEnd('div'); + } + if (!empty($meta['author'])) { + $this->out->elementStart('div'); + $this->out->text($meta['author']); + $this->out->elementEnd('div'); + } + $this->out->elementEnd('td'); + + // Description + $this->out->elementStart('td'); + if (!empty($meta['rawdescription'])) { + $this->out->raw($meta['rawdescription']); + } + $this->out->elementEnd('td'); + + $this->out->elementEnd('tr'); + } + + /** + * Pull up the appropriate control form for this plugin, depending + * on its current state. + * + * @return Form + */ + protected function getControlForm() + { + $key = 'disable-' . $this->plugin; + if (common_config('plugins', $key)) { + return new PluginEnableForm($this->out, $this->plugin); + } else { + return new PluginDisableForm($this->out, $this->plugin); + } + } + + /** + * Grab metadata about this plugin... + * Warning: horribly inefficient and may explode! + * Doesn't work for disabled plugins either. + * + * @fixme pull structured data from plugin source + */ + function metaInfo() + { + $versions = self::getPluginVersions(); + $found = false; + + foreach ($versions as $info) { + // hack for URL shorteners... "LilUrl (ur1.ca)" etc + list($name, ) = explode(' ', $info['name']); + + if ($name == $this->plugin) { + if ($found) { + // hack for URL shorteners... + $found['rawdescription'] .= "
\n" . $info['rawdescription']; + } else { + $found = $info; + } + } + } + + if ($found) { + return $found; + } else { + return array('name' => $this->plugin, + 'rawdescription' => _m('plugin-description', + '(Plugin descriptions unavailable when disabled.)')); + } + } + + /** + * Lazy-load the set of active plugin version info + * @return array + */ + protected static function getPluginVersions() + { + if (!is_array(self::$versions)) { + $versions = array(); + Event::handle('PluginVersion', array(&$versions)); + self::$versions = $versions; + } + return self::$versions; + } +} diff --git a/lib/router.php b/lib/router.php index 706120e0b..3d1c0e290 100644 --- a/lib/router.php +++ b/lib/router.php @@ -652,6 +652,13 @@ class Router $m->connect('admin/sessions', array('action' => 'sessionsadminpanel')); $m->connect('admin/sitenotice', array('action' => 'sitenoticeadminpanel')); $m->connect('admin/snapshot', array('action' => 'snapshotadminpanel')); + $m->connect('admin/plugins', array('action' => 'pluginsadminpanel')); + $m->connect('admin/plugins/enable/:plugin', + array('action' => 'pluginenable'), + array('plugin' => '[A-Za-z0-9_]+')); + $m->connect('admin/plugins/disable/:plugin', + array('action' => 'plugindisable'), + array('plugin' => '[A-Za-z0-9_]+')); $m->connect('getfile/:filename', array('action' => 'getfile'), diff --git a/lib/statusnet.php b/lib/statusnet.php index eba9ab9b8..fe93680b0 100644 --- a/lib/statusnet.php +++ b/lib/statusnet.php @@ -163,6 +163,11 @@ class StatusNet { // Load default plugins foreach (common_config('plugins', 'default') as $name => $params) { + $key = 'disable-' . $name; + if (common_config('plugins', $key)) { + continue; + } + if (is_null($params)) { addPlugin($name); } else if (is_array($params)) { -- cgit v1.2.3-54-g00ecf From 88f66131a1b11de81d1aece68683ef3396ccf98b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 16 Mar 2010 16:23:19 -0700 Subject: Pull back for now on switch of PEAR error mode to exceptions; seems to trigger out exceptions at various times we don't want them. For instance this was throwing an exception for DB_DataObject::staticGet when there's no match... definitely not what we want when all our code expects to get a nice null. Example of this causing trouble: http://gitorious.org/statusnet/mainline/merge_requests/131 Revert "Don't attempt to retrieve the current user from the DB while processing a DB error" This reverts commit 68347691b0c7fb3f81415abd7fcdc5aec85cc554. Revert "Use PHP exceptions for PEAR error handling." This reverts commit d8212977ce7f911d4f9bd6e55f94aea059a86782. --- index.php | 103 ++++++++++++++++++++++++++------------------------------- lib/common.php | 12 ------- 2 files changed, 46 insertions(+), 69 deletions(-) diff --git a/index.php b/index.php index d6c617e1d..4c879fe9a 100644 --- a/index.php +++ b/index.php @@ -37,6 +37,8 @@ define('INSTALLDIR', dirname(__FILE__)); define('STATUSNET', true); define('LACONICA', true); // compatibility +require_once INSTALLDIR . '/lib/common.php'; + $user = null; $action = null; @@ -66,69 +68,52 @@ function getPath($req) */ function handleError($error) { - try { - - if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) { - return; - } + if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) { + return; + } - $logmsg = "PEAR error: " . $error->getMessage(); - if ($error instanceof PEAR_Exception && common_config('site', 'logdebug')) { - $logmsg .= " : ". $error->toText(); - } - // DB queries often end up with a lot of newlines; merge to a single line - // for easier grepability... - $logmsg = str_replace("\n", " ", $logmsg); - common_log(LOG_ERR, $logmsg); - - // @fixme backtrace output should be consistent with exception handling - if (common_config('site', 'logdebug')) { - $bt = $error->getTrace(); - foreach ($bt as $n => $line) { - common_log(LOG_ERR, formatBacktraceLine($n, $line)); - } - } - if ($error instanceof DB_DataObject_Error - || $error instanceof DB_Error - || ($error instanceof PEAR_Exception && $error->getCode() == -24) - ) { - //If we run into a DB error, assume we can't connect to the DB at all - //so set the current user to null, so we don't try to access the DB - //while rendering the error page. - global $_cur; - $_cur = null; - - $msg = sprintf( - _( - 'The database for %s isn\'t responding correctly, '. - 'so the site won\'t work properly. '. - 'The site admins probably know about the problem, '. - 'but you can contact them at %s to make sure. '. - 'Otherwise, wait a few minutes and try again.' - ), - common_config('site', 'name'), - common_config('site', 'email') - ); - } else { - $msg = _( - 'An important error occured, probably related to email setup. '. - 'Check logfiles for more info..' - ); + $logmsg = "PEAR error: " . $error->getMessage(); + if (common_config('site', 'logdebug')) { + $logmsg .= " : ". $error->getDebugInfo(); + } + // DB queries often end up with a lot of newlines; merge to a single line + // for easier grepability... + $logmsg = str_replace("\n", " ", $logmsg); + common_log(LOG_ERR, $logmsg); + + // @fixme backtrace output should be consistent with exception handling + if (common_config('site', 'logdebug')) { + $bt = $error->getBacktrace(); + foreach ($bt as $n => $line) { + common_log(LOG_ERR, formatBacktraceLine($n, $line)); } - - $dac = new DBErrorAction($msg, 500); - $dac->showPage(); - - } catch (Exception $e) { - echo _('An error occurred.'); } + if ($error instanceof DB_DataObject_Error + || $error instanceof DB_Error + ) { + $msg = sprintf( + _( + 'The database for %s isn\'t responding correctly, '. + 'so the site won\'t work properly. '. + 'The site admins probably know about the problem, '. + 'but you can contact them at %s to make sure. '. + 'Otherwise, wait a few minutes and try again.' + ), + common_config('site', 'name'), + common_config('site', 'email') + ); + } else { + $msg = _( + 'An important error occured, probably related to email setup. '. + 'Check logfiles for more info..' + ); + } + + $dac = new DBErrorAction($msg, 500); + $dac->showPage(); exit(-1); } -set_exception_handler('handleError'); - -require_once INSTALLDIR . '/lib/common.php'; - /** * Format a backtrace line for debug output roughly like debug_print_backtrace() does. * Exceptions already have this built in, but PEAR error objects just give us the array. @@ -253,6 +238,10 @@ function main() return; } + // For database errors + + PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError'); + // Make sure RW database is setup setupRW(); diff --git a/lib/common.php b/lib/common.php index 047dc5a7b..5d53270e3 100644 --- a/lib/common.php +++ b/lib/common.php @@ -71,7 +71,6 @@ if (!function_exists('dl')) { # global configuration object require_once('PEAR.php'); -require_once('PEAR/Exception.php'); require_once('DB/DataObject.php'); require_once('DB/DataObject/Cast.php'); # for dates @@ -129,17 +128,6 @@ require_once INSTALLDIR.'/lib/activity.php'; require_once INSTALLDIR.'/lib/clientexception.php'; require_once INSTALLDIR.'/lib/serverexception.php'; - -//set PEAR error handling to use regular PHP exceptions -function PEAR_ErrorToPEAR_Exception($err) -{ - if ($err->getCode()) { - throw new PEAR_Exception($err->getMessage(), $err->getCode()); - } - throw new PEAR_Exception($err->getMessage()); -} -PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'PEAR_ErrorToPEAR_Exception'); - try { StatusNet::init(@$server, @$path, @$conffile); } catch (NoConfigException $e) { -- cgit v1.2.3-54-g00ecf From b9fc4c24b44ba8a83448f3ea8e0698c689d74d19 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 17 Mar 2010 08:55:16 -0700 Subject: Pulling the stub plugin panel back out; we'll flesh it out more for 1.0.x and see if we can make it easier to disable through the config file for now. Revert "Stub plugins administration panel, allows for disabling/re-enabling plugins from the default plugins list." This reverts commit d9a9fd3779c592e3f4e0a8aea8e385ee2183c0b3. --- actions/plugindisable.php | 78 ---------------- actions/pluginenable.php | 166 -------------------------------- actions/pluginsadminpanel.php | 110 ---------------------- lib/adminpanelaction.php | 8 -- lib/default.php | 3 +- lib/plugindisableform.php | 93 ------------------ lib/pluginenableform.php | 114 ---------------------- lib/pluginlist.php | 213 ------------------------------------------ lib/router.php | 7 -- lib/statusnet.php | 5 - 10 files changed, 1 insertion(+), 796 deletions(-) delete mode 100644 actions/plugindisable.php delete mode 100644 actions/pluginenable.php delete mode 100644 actions/pluginsadminpanel.php delete mode 100644 lib/plugindisableform.php delete mode 100644 lib/pluginenableform.php delete mode 100644 lib/pluginlist.php diff --git a/actions/plugindisable.php b/actions/plugindisable.php deleted file mode 100644 index 7f107b333..000000000 --- a/actions/plugindisable.php +++ /dev/null @@ -1,78 +0,0 @@ -. - * - * PHP version 5 - * - * @category Action - * @package StatusNet - * @author Brion Vibber - * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 - * @link http://status.net/ - */ - -if (!defined('STATUSNET')) { - exit(1); -} - -/** - * Plugin enable action. - * - * (Re)-enables a plugin from the default plugins list. - * - * Takes parameters: - * - * - plugin: plugin name - * - token: session token to prevent CSRF attacks - * - ajax: boolean; whether to return Ajax or full-browser results - * - * Only works if the current user is logged in. - * - * @category Action - * @package StatusNet - * @author Brion Vibber - * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 - * @link http://status.net/ - */ - -class PluginDisableAction extends PluginEnableAction -{ - /** - * Value to save into $config['plugins']['disable-'] - */ - protected function overrideValue() - { - return 1; - } - - protected function successShortTitle() - { - // TRANS: Page title for AJAX form return when a disabling a plugin. - return _m('plugin', 'Disabled'); - } - - protected function successNextForm() - { - return new EnablePluginForm($this, $this->plugin); - } -} - - diff --git a/actions/pluginenable.php b/actions/pluginenable.php deleted file mode 100644 index 2dbb3e395..000000000 --- a/actions/pluginenable.php +++ /dev/null @@ -1,166 +0,0 @@ -. - * - * PHP version 5 - * - * @category Action - * @package StatusNet - * @author Brion Vibber - * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 - * @link http://status.net/ - */ - -if (!defined('STATUSNET')) { - exit(1); -} - -/** - * Plugin enable action. - * - * (Re)-enables a plugin from the default plugins list. - * - * Takes parameters: - * - * - plugin: plugin name - * - token: session token to prevent CSRF attacks - * - ajax: boolean; whether to return Ajax or full-browser results - * - * Only works if the current user is logged in. - * - * @category Action - * @package StatusNet - * @author Brion Vibber - * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 - * @link http://status.net/ - */ - -class PluginEnableAction extends Action -{ - var $user; - var $plugin; - - /** - * Check pre-requisites and instantiate attributes - * - * @param Array $args array of arguments (URL, GET, POST) - * - * @return boolean success flag - */ - - function prepare($args) - { - parent::prepare($args); - - // @fixme these are pretty common, should a parent class factor these out? - - // Only allow POST requests - - if ($_SERVER['REQUEST_METHOD'] != 'POST') { - $this->clientError(_('This action only accepts POST requests.')); - return false; - } - - // CSRF protection - - $token = $this->trimmed('token'); - - if (!$token || $token != common_session_token()) { - $this->clientError(_('There was a problem with your session token.'. - ' Try again, please.')); - return false; - } - - // Only for logged-in users - - $this->user = common_current_user(); - - if (empty($this->user)) { - $this->clientError(_('Not logged in.')); - return false; - } - - if (!AdminPanelAction::canAdmin('plugins')) { - $this->clientError(_('You cannot administer plugins.')); - return false; - } - - $this->plugin = $this->arg('plugin'); - $defaultPlugins = common_config('plugins', 'default'); - if (!array_key_exists($this->plugin, $defaultPlugins)) { - $this->clientError(_('No such plugin.')); - return false; - } - - return true; - } - - /** - * Handle request - * - * Does the subscription and returns results. - * - * @param Array $args unused. - * - * @return void - */ - - function handle($args) - { - $key = 'disable-' . $this->plugin; - Config::save('plugins', $key, $this->overrideValue()); - - // @fixme this is a pretty common pattern and should be refactored down - if ($this->boolean('ajax')) { - $this->startHTML('text/xml;charset=utf-8'); - $this->elementStart('head'); - $this->element('title', null, $this->successShortTitle()); - $this->elementEnd('head'); - $this->elementStart('body'); - $form = $this->successNextForm(); - $form->show(); - $this->elementEnd('body'); - $this->elementEnd('html'); - } else { - $url = common_local_url('pluginsadminpanel'); - common_redirect($url, 303); - } - } - - /** - * Value to save into $config['plugins']['disable-'] - */ - protected function overrideValue() - { - return 0; - } - - protected function successShortTitle() - { - // TRANS: Page title for AJAX form return when enabling a plugin. - return _m('plugin', 'Enabled'); - } - - protected function successNextForm() - { - return new DisablePluginForm($this, $this->plugin); - } -} diff --git a/actions/pluginsadminpanel.php b/actions/pluginsadminpanel.php deleted file mode 100644 index bc400bd51..000000000 --- a/actions/pluginsadminpanel.php +++ /dev/null @@ -1,110 +0,0 @@ -. - * - * @category Settings - * @package StatusNet - * @author Brion Vibber - * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET')) { - exit(1); -} - -/** - * Plugins settings - * - * @category Admin - * @package StatusNet - * @author Brion Vibber - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -class PluginsadminpanelAction extends AdminPanelAction -{ - - /** - * Returns the page title - * - * @return string page title - */ - - function title() - { - // TRANS: Tab and title for plugins admin panel. - return _('Plugins'); - } - - /** - * Instructions for using this form. - * - * @return string instructions - */ - - function getInstructions() - { - // TRANS: Instructions at top of plugin admin page. - return _('Additional plugins can be enabled and configured manually. ' . - 'See the online plugin ' . - 'documentation for more details.'); - } - - /** - * Show the plugins admin panel form - * - * @return void - */ - - function showForm() - { - $this->elementStart('fieldset', array('id' => 'settings_plugins_default')); - - // TRANS: Admin form section header - $this->element('legend', null, _('Default plugins'), 'default'); - - $this->showDefaultPlugins(); - - $this->elementEnd('fieldset'); - } - - /** - * Until we have a general plugin metadata infrastructure, for now - * we'll just list up the ones we know from the global default - * plugins list. - */ - protected function showDefaultPlugins() - { - $plugins = array_keys(common_config('plugins', 'default')); - natsort($plugins); - - if ($plugins) { - $list = new PluginList($plugins, $this); - $list->show(); - } else { - $this->element('p', null, - _('All default plugins have been disabled from the ' . - 'site\'s configuration file.')); - } - } -} diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php index d87981b6a..a927e2333 100644 --- a/lib/adminpanelaction.php +++ b/lib/adminpanelaction.php @@ -407,14 +407,6 @@ class AdminPanelNav extends Widget $menu_title, $action_name == 'snapshotadminpanel', 'nav_snapshot_admin_panel'); } - if (AdminPanelAction::canAdmin('plugins')) { - // TRANS: Menu item title/tooltip - $menu_title = _('Plugins configuration'); - // TRANS: Menu item for site administration - $this->out->menuItem(common_local_url('pluginsadminpanel'), _('Plugins'), - $menu_title, $action_name == 'pluginsadminpanel', 'nav_design_admin_panel'); - } - Event::handle('EndAdminPanelNav', array($this)); } $this->action->elementEnd('ul'); diff --git a/lib/default.php b/lib/default.php index eb0cb0b64..10f3f1a97 100644 --- a/lib/default.php +++ b/lib/default.php @@ -285,9 +285,8 @@ $default = 'RSSCloud' => null, 'OpenID' => null), ), - 'pluginlist' => array(), 'admin' => - array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'plugins')), + array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice')), 'singleuser' => array('enabled' => false, 'nickname' => null), diff --git a/lib/plugindisableform.php b/lib/plugindisableform.php deleted file mode 100644 index 3cbabdb2c..000000000 --- a/lib/plugindisableform.php +++ /dev/null @@ -1,93 +0,0 @@ -. - * - * @category Form - * @package StatusNet - * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -/** - * Form for joining a group - * - * @category Form - * @package StatusNet - * @author Brion Vibber - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - * - * @see PluginEnableForm - */ - -class PluginDisableForm extends PluginEnableForm -{ - /** - * ID of the form - * - * @return string ID of the form - */ - - function id() - { - return 'plugin-disable-' . $this->plugin; - } - - /** - * class of the form - * - * @return string of the form class - */ - - function formClass() - { - return 'form_plugin_disable'; - } - - /** - * Action of the form - * - * @return string URL of the action - */ - - function action() - { - return common_local_url('plugindisable', - array('plugin' => $this->plugin)); - } - - /** - * Action elements - * - * @return void - */ - - function formActions() - { - // TRANS: Plugin admin panel controls - $this->out->submit('submit', _m('plugin', 'Disable')); - } - -} diff --git a/lib/pluginenableform.php b/lib/pluginenableform.php deleted file mode 100644 index 8683ffd0b..000000000 --- a/lib/pluginenableform.php +++ /dev/null @@ -1,114 +0,0 @@ -. - * - * @category Form - * @package StatusNet - * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -require_once INSTALLDIR.'/lib/form.php'; - -/** - * Form for joining a group - * - * @category Form - * @package StatusNet - * @author Brion Vibber - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - * - * @see PluginDisableForm - */ - -class PluginEnableForm extends Form -{ - /** - * Plugin to enable/disable - */ - - var $plugin = null; - - /** - * Constructor - * - * @param HTMLOutputter $out output channel - * @param string $plugin plugin to enable/disable - */ - - function __construct($out=null, $plugin=null) - { - parent::__construct($out); - - $this->plugin = $plugin; - } - - /** - * ID of the form - * - * @return string ID of the form - */ - - function id() - { - return 'plugin-enable-' . $this->plugin; - } - - /** - * class of the form - * - * @return string of the form class - */ - - function formClass() - { - return 'form_plugin_enable'; - } - - /** - * Action of the form - * - * @return string URL of the action - */ - - function action() - { - return common_local_url('pluginenable', - array('plugin' => $this->plugin)); - } - - /** - * Action elements - * - * @return void - */ - - function formActions() - { - // TRANS: Plugin admin panel controls - $this->out->submit('submit', _m('plugin', 'Enable')); - } -} diff --git a/lib/pluginlist.php b/lib/pluginlist.php deleted file mode 100644 index 07a17ba39..000000000 --- a/lib/pluginlist.php +++ /dev/null @@ -1,213 +0,0 @@ -. - * - * @category Settings - * @package StatusNet - * @author Brion Vibber - * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET')) { - exit(1); -} - -require INSTALLDIR . "/lib/pluginenableform.php"; -require INSTALLDIR . "/lib/plugindisableform.php"; - -/** - * Plugin list - * - * @category Admin - * @package StatusNet - * @author Brion Vibber - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -class PluginList extends Widget -{ - var $plugins = array(); - - function __construct($plugins, $out) - { - parent::__construct($out); - $this->plugins = $plugins; - } - - function show() - { - $this->startList(); - $this->showPlugins(); - $this->endList(); - } - - function startList() - { - $this->out->elementStart('table', 'plugin_list'); - } - - function endList() - { - $this->out->elementEnd('table'); - } - - function showPlugins() - { - foreach ($this->plugins as $plugin) { - $pli = $this->newListItem($plugin); - $pli->show(); - } - } - - function newListItem($plugin) - { - return new PluginListItem($plugin, $this->out); - } -} - -class PluginListItem extends Widget -{ - /** Current plugin. */ - var $plugin = null; - - /** Local cache for plugin version info */ - protected static $versions = false; - - function __construct($plugin, $out) - { - parent::__construct($out); - $this->plugin = $plugin; - } - - function show() - { - $meta = $this->metaInfo(); - - $this->out->elementStart('tr', array('id' => 'plugin-' . $this->plugin)); - - // Name and controls - $this->out->elementStart('td'); - $this->out->elementStart('div'); - if (!empty($meta['homepage'])) { - $this->out->elementStart('a', array('href' => $meta['homepage'])); - } - $this->out->text($this->plugin); - if (!empty($meta['homepage'])) { - $this->out->elementEnd('a'); - } - $this->out->elementEnd('div'); - - $form = $this->getControlForm(); - $form->show(); - - $this->out->elementEnd('td'); - - // Version and authors - $this->out->elementStart('td'); - if (!empty($meta['version'])) { - $this->out->elementStart('div'); - $this->out->text($meta['version']); - $this->out->elementEnd('div'); - } - if (!empty($meta['author'])) { - $this->out->elementStart('div'); - $this->out->text($meta['author']); - $this->out->elementEnd('div'); - } - $this->out->elementEnd('td'); - - // Description - $this->out->elementStart('td'); - if (!empty($meta['rawdescription'])) { - $this->out->raw($meta['rawdescription']); - } - $this->out->elementEnd('td'); - - $this->out->elementEnd('tr'); - } - - /** - * Pull up the appropriate control form for this plugin, depending - * on its current state. - * - * @return Form - */ - protected function getControlForm() - { - $key = 'disable-' . $this->plugin; - if (common_config('plugins', $key)) { - return new PluginEnableForm($this->out, $this->plugin); - } else { - return new PluginDisableForm($this->out, $this->plugin); - } - } - - /** - * Grab metadata about this plugin... - * Warning: horribly inefficient and may explode! - * Doesn't work for disabled plugins either. - * - * @fixme pull structured data from plugin source - */ - function metaInfo() - { - $versions = self::getPluginVersions(); - $found = false; - - foreach ($versions as $info) { - // hack for URL shorteners... "LilUrl (ur1.ca)" etc - list($name, ) = explode(' ', $info['name']); - - if ($name == $this->plugin) { - if ($found) { - // hack for URL shorteners... - $found['rawdescription'] .= "
\n" . $info['rawdescription']; - } else { - $found = $info; - } - } - } - - if ($found) { - return $found; - } else { - return array('name' => $this->plugin, - 'rawdescription' => _m('plugin-description', - '(Plugin descriptions unavailable when disabled.)')); - } - } - - /** - * Lazy-load the set of active plugin version info - * @return array - */ - protected static function getPluginVersions() - { - if (!is_array(self::$versions)) { - $versions = array(); - Event::handle('PluginVersion', array(&$versions)); - self::$versions = $versions; - } - return self::$versions; - } -} diff --git a/lib/router.php b/lib/router.php index 3d1c0e290..706120e0b 100644 --- a/lib/router.php +++ b/lib/router.php @@ -652,13 +652,6 @@ class Router $m->connect('admin/sessions', array('action' => 'sessionsadminpanel')); $m->connect('admin/sitenotice', array('action' => 'sitenoticeadminpanel')); $m->connect('admin/snapshot', array('action' => 'snapshotadminpanel')); - $m->connect('admin/plugins', array('action' => 'pluginsadminpanel')); - $m->connect('admin/plugins/enable/:plugin', - array('action' => 'pluginenable'), - array('plugin' => '[A-Za-z0-9_]+')); - $m->connect('admin/plugins/disable/:plugin', - array('action' => 'plugindisable'), - array('plugin' => '[A-Za-z0-9_]+')); $m->connect('getfile/:filename', array('action' => 'getfile'), diff --git a/lib/statusnet.php b/lib/statusnet.php index fe93680b0..eba9ab9b8 100644 --- a/lib/statusnet.php +++ b/lib/statusnet.php @@ -163,11 +163,6 @@ class StatusNet { // Load default plugins foreach (common_config('plugins', 'default') as $name => $params) { - $key = 'disable-' . $name; - if (common_config('plugins', $key)) { - continue; - } - if (is_null($params)) { addPlugin($name); } else if (is_array($params)) { -- cgit v1.2.3-54-g00ecf From 1c942afa60b7ec5a8f0855a14d32110837270119 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 17 Mar 2010 10:52:11 -0700 Subject: Workaround for HTTP authentication in the API when running PHP as CGI/FastCGI. Example rewrite lines added as comments in htaccess.sample, API tweaked to accept alternate environment var form. --- htaccess.sample | 5 +++++ lib/apiauth.php | 14 +++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/htaccess.sample b/htaccess.sample index 37eb8e01e..18a868698 100644 --- a/htaccess.sample +++ b/htaccess.sample @@ -5,6 +5,11 @@ RewriteBase /mublog/ + ## Uncomment these if having trouble with API authentication + ## when PHP is running in CGI or FastCGI mode. + #RewriteCond %{HTTP:Authorization} ^(.*) + #RewriteRule ^(.*) - [E=HTTP_AUTHORIZATION:%1] + RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteRule (.*) index.php?p=$1 [L,QSA] diff --git a/lib/apiauth.php b/lib/apiauth.php index 32502399f..17f803a1c 100644 --- a/lib/apiauth.php +++ b/lib/apiauth.php @@ -294,11 +294,15 @@ class ApiAuthAction extends ApiAction function basicAuthProcessHeader() { - if (isset($_SERVER['AUTHORIZATION']) - || isset($_SERVER['HTTP_AUTHORIZATION']) - ) { - $authorization_header = isset($_SERVER['HTTP_AUTHORIZATION']) - ? $_SERVER['HTTP_AUTHORIZATION'] : $_SERVER['AUTHORIZATION']; + $authHeaders = array('AUTHORIZATION', + 'HTTP_AUTHORIZATION', + 'REDIRECT_HTTP_AUTHORIZATION'); // rewrite for CGI + $authorization_header = null; + foreach ($authHeaders as $header) { + if (isset($_SERVER[$header])) { + $authorization_header = $_SERVER[$header]; + break; + } } if (isset($_SERVER['PHP_AUTH_USER'])) { -- cgit v1.2.3-54-g00ecf From 3a72c70b7e560023ecb7439be680942e4d0e6350 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 17 Mar 2010 12:34:35 -0700 Subject: When too-long messages come in via OStatus, mark the attachment link up as a "more" link in the HTML output, marked with class="attachment more" so JS code can fold it out smartly. Text output will still include the raw link. --- plugins/OStatus/classes/Ostatus_profile.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index 73f5d2322..7b18fed9c 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -547,9 +547,19 @@ class Ostatus_profile extends Memcached_DataObject $shortSummary = substr($shortSummary, 0, Notice::maxContent() - (mb_strlen($url) + 2)); - $shortSummary .= '… ' . $url; - $content = $shortSummary; - $rendered = common_render_text($content); + $shortSummary .= '…'; + $content = $shortSummary . ' ' . $url; + + // We mark up the attachment link specially for the HTML output + // so we can fold-out the full version inline. + $rendered = common_render_text($shortSummary) . + ' ' . + '' . + // TRANS: expansion link for too-long remote messages + htmlspecialchars(_m('(more)')) . + ''; } } -- cgit v1.2.3-54-g00ecf From f797a10256969c0e3bf214967e5eafe8df886149 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 17 Mar 2010 13:58:25 -0700 Subject: Display scrubbed HTML attachments inline on attachment view page. --- lib/attachmentlist.php | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php index dc6709d67..22ae8ba07 100644 --- a/lib/attachmentlist.php +++ b/lib/attachmentlist.php @@ -330,6 +330,13 @@ class Attachment extends AttachmentListItem $this->out->element('param', array('name' => 'autoStart', 'value' => 1)); $this->out->elementEnd('object'); break; + + case 'text/html': + if ($this->attachment->filename) { + // Locally-uploaded HTML. Scrub and display inline. + $this->showHtmlFile($this->attachment); + } + break; } } } else { @@ -356,5 +363,60 @@ class Attachment extends AttachmentListItem } } } + + protected function showHtmlFile(File $attachment) + { + $body = $this->scrubHtmlFile($attachment); + if ($body) { + $this->out->elementStart('div', array('class' => 'inline-attachment')); + $this->out->raw($body); + $this->out->elementEnd('div'); + } + } + + /** + * @return mixed false on failure, HTML fragment string on success + */ + protected function scrubHtmlFile(File $attachment) + { + $path = File::path($attachment->filename); + if (!file_exists($path) || !is_readable($path)) { + common_log(LOG_ERR, "Missing local HTML attachment $path"); + return false; + } + $raw = file_get_contents($path); + + // Normalize... + $dom = new DOMDocument(); + if(!$dom->loadHTML($raw)) { + common_log(LOG_ERR, "Bad HTML in local HTML attachment $path"); + return false; + } + + // Remove '); + } } -- cgit v1.2.3-54-g00ecf From a20880ee1e526efafd89ad9b823089f71245c481 Mon Sep 17 00:00:00 2001 From: James Walker Date: Mon, 22 Mar 2010 13:44:05 -0400 Subject: Fixing HTTP Header LRDD parsing (sites in subdirectories need this) --- plugins/OStatus/lib/discovery.php | 2 +- plugins/OStatus/lib/linkheader.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/OStatus/lib/discovery.php b/plugins/OStatus/lib/discovery.php index 44fad62fb..7187c1f3e 100644 --- a/plugins/OStatus/lib/discovery.php +++ b/plugins/OStatus/lib/discovery.php @@ -195,7 +195,7 @@ class Discovery_LRDD_Link_Header implements Discovery_LRDD // return false; } - return Discovery_LRDD_Link_Header::parseHeader($link_header); + return array(Discovery_LRDD_Link_Header::parseHeader($link_header)); } protected static function parseHeader($header) diff --git a/plugins/OStatus/lib/linkheader.php b/plugins/OStatus/lib/linkheader.php index afcd66d26..cd78d31ce 100644 --- a/plugins/OStatus/lib/linkheader.php +++ b/plugins/OStatus/lib/linkheader.php @@ -11,7 +11,7 @@ class LinkHeader preg_match('/^<[^>]+>/', $str, $uri_reference); //if (empty($uri_reference)) return; - $this->uri = trim($uri_reference[0], '<>'); + $this->href = trim($uri_reference[0], '<>'); $this->rel = array(); $this->type = null; -- cgit v1.2.3-54-g00ecf From 5697e4edb0fc4bb1d4c9365100501e795b2553de Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 22 Mar 2010 10:35:54 -0700 Subject: Replace the "give up and dump object" attachment view fallback with a client-side redirect to the target URL, which will at least be useful. --- lib/attachmentlist.php | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php index 51ceca857..fe38281af 100644 --- a/lib/attachmentlist.php +++ b/lib/attachmentlist.php @@ -306,7 +306,7 @@ class Attachment extends AttachmentListItem function showRepresentation() { if (empty($this->oembed->type)) { if (empty($this->attachment->mimetype)) { - $this->out->element('pre', null, 'oh well... not sure how to handle the following: ' . print_r($this->attachment, true)); + $this->showFallback(); } else { switch ($this->attachment->mimetype) { case 'image/gif': @@ -332,6 +332,8 @@ class Attachment extends AttachmentListItem $this->out->element('param', array('name' => 'autoStart', 'value' => 1)); $this->out->elementEnd('object'); break; + default: + $this->showFallback(); } } } else { @@ -354,9 +356,23 @@ class Attachment extends AttachmentListItem break; default: - $this->out->element('pre', null, 'oh well... not sure how to handle the following oembed: ' . print_r($this->oembed, true)); + $this->showFallback(); } } } + + function showFallback() + { + // If we don't know how to display an attachment inline, we probably + // shouldn't have gotten to this point. + // + // But, here we are... displaying details on a file or remote URL + // either on the main view or in an ajax-loaded lightbox. As a lesser + // of several evils, we'll try redirecting to the actual target via + // client-side JS. + + common_log(LOG_ERR, "Empty or unknown type for file id {$this->attachment->id}; falling back to client-side redirect."); + $this->out->raw(''); + } } -- cgit v1.2.3-54-g00ecf From 295e05ea39982ff2b41cec21d5622375005682c2 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Sun, 21 Mar 2010 23:05:23 -0400 Subject: Refactor common parts of LdapAuthorization and LdapAuthentication plugins into a separate class LdapAuthorization should get a performance improvement as LDAP schema caching is now used --- .../LdapAuthenticationPlugin.php | 277 +--------------- plugins/LdapAuthentication/MemcacheSchemaCache.php | 75 ----- .../LdapAuthorization/LdapAuthorizationPlugin.php | 133 +------- plugins/LdapCommon/LdapCommon.php | 356 +++++++++++++++++++++ plugins/LdapCommon/MemcacheSchemaCache.php | 75 +++++ 5 files changed, 453 insertions(+), 463 deletions(-) delete mode 100644 plugins/LdapAuthentication/MemcacheSchemaCache.php create mode 100644 plugins/LdapCommon/LdapCommon.php create mode 100644 plugins/LdapCommon/MemcacheSchemaCache.php diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php index 483209676..6296bccfa 100644 --- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -31,48 +31,25 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once 'Net/LDAP2.php'; - class LdapAuthenticationPlugin extends AuthenticationPlugin { - public $host=null; - public $port=null; - public $version=null; - public $starttls=null; - public $binddn=null; - public $bindpw=null; - public $basedn=null; - public $options=null; - public $filter=null; - public $scope=null; - public $password_encoding=null; - public $attributes=array(); - function onInitializePlugin(){ parent::onInitializePlugin(); - if(!isset($this->host)){ - throw new Exception("must specify a host"); - } - if(!isset($this->basedn)){ - throw new Exception("must specify a basedn"); - } if(!isset($this->attributes['nickname'])){ throw new Exception("must specify a nickname attribute"); } - if(!isset($this->attributes['username'])){ - throw new Exception("must specify a username attribute"); - } if($this->password_changeable && (! isset($this->attributes['password']) || !isset($this->password_encoding))){ throw new Exception("if password_changeable is set, the password attribute and password_encoding must also be specified"); } + $this->ldapCommon = new LdapCommon(get_object_vars($this)); } function onAutoload($cls) { switch ($cls) { - case 'MemcacheSchemaCache': - require_once(INSTALLDIR.'/plugins/LdapAuthentication/MemcacheSchemaCache.php'); + case 'LdapCommon': + require_once(INSTALLDIR.'/plugins/LdapCommon/LdapCommon.php'); return false; } } @@ -107,19 +84,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin function checkPassword($username, $password) { - $entry = $this->ldap_get_user($username); - if(!$entry){ - return false; - }else{ - $config = $this->ldap_get_config(); - $config['binddn']=$entry->dn(); - $config['bindpw']=$password; - if($this->ldap_get_connection($config)){ - return true; - }else{ - return false; - } - } + return $this->ldapCommon->checkPassword($username); } function autoRegister($username, $nickname) @@ -127,7 +92,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin if(is_null($nickname)){ $nickname = $username; } - $entry = $this->ldap_get_user($username,$this->attributes); + $entry = $this->ldapCommon->get_user($username,$this->attributes); if($entry){ $registration_data = array(); foreach($this->attributes as $sn_attribute=>$ldap_attribute){ @@ -148,40 +113,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin function changePassword($username,$oldpassword,$newpassword) { - if(! isset($this->attributes['password']) || !isset($this->password_encoding)){ - //throw new Exception(_('Sorry, changing LDAP passwords is not supported at this time')); - return false; - } - $entry = $this->ldap_get_user($username); - if(!$entry){ - return false; - }else{ - $config = $this->ldap_get_config(); - $config['binddn']=$entry->dn(); - $config['bindpw']=$oldpassword; - if($ldap = $this->ldap_get_connection($config)){ - $entry = $this->ldap_get_user($username,array(),$ldap); - - $newCryptedPassword = $this->hashPassword($newpassword, $this->password_encoding); - if ($newCryptedPassword===false) { - return false; - } - if($this->password_encoding=='ad') { - //TODO I believe this code will work once this bug is fixed: http://pear.php.net/bugs/bug.php?id=16796 - $oldCryptedPassword = $this->hashPassword($oldpassword, $this->password_encoding); - $entry->delete( array($this->attributes['password'] => $oldCryptedPassword )); - } - $entry->replace( array($this->attributes['password'] => $newCryptedPassword ), true); - if( Net_LDAP2::isError($entry->upate()) ) { - return false; - } - return true; - }else{ - return false; - } - } - - return false; + return $this->ldapCommon->changePassword($username,$oldpassword,$newpassword); } function suggestNicknameForUsername($username) @@ -198,203 +130,6 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin } return common_nicknamize($nickname); } - - //---utility functions---// - function ldap_get_config(){ - $config = array(); - $keys = array('host','port','version','starttls','binddn','bindpw','basedn','options','filter','scope'); - foreach($keys as $key){ - $value = $this->$key; - if($value!==null){ - $config[$key]=$value; - } - } - return $config; - } - - function ldap_get_connection($config = null){ - if($config == null && isset($this->default_ldap)){ - return $this->default_ldap; - } - - //cannot use Net_LDAP2::connect() as StatusNet uses - //PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError'); - //PEAR handling can be overridden on instance objects, so we do that. - $ldap = new Net_LDAP2(isset($config)?$config:$this->ldap_get_config()); - $ldap->setErrorHandling(PEAR_ERROR_RETURN); - $err=$ldap->bind(); - if (Net_LDAP2::isError($err)) { - // if we were called with a config, assume caller will handle - // incorrect username/password (LDAP_INVALID_CREDENTIALS) - if (isset($config) && $err->getCode() == 0x31) { - return null; - } - throw new Exception('Could not connect to LDAP server: '.$err->getMessage()); - } - if($config == null) $this->default_ldap=$ldap; - - $c = common_memcache(); - if (!empty($c)) { - $cacheObj = new MemcacheSchemaCache( - array('c'=>$c, - 'cacheKey' => common_cache_key('ldap_schema:' . crc32(serialize($config))))); - $ldap->registerSchemaCache($cacheObj); - } - return $ldap; - } - - /** - * get an LDAP entry for a user with a given username - * - * @param string $username - * $param array $attributes LDAP attributes to retrieve - * @return string DN - */ - function ldap_get_user($username,$attributes=array(),$ldap=null){ - if($ldap==null) { - $ldap = $this->ldap_get_connection(); - } - $filter = Net_LDAP2_Filter::create($this->attributes['username'], 'equals', $username); - $options = array( - 'attributes' => $attributes - ); - $search = $ldap->search($this->basedn, $filter, $options); - - if (PEAR::isError($search)) { - common_log(LOG_WARNING, 'Error while getting DN for user: '.$search->getMessage()); - return false; - } - - $searchcount = $search->count(); - if($searchcount == 0) { - return false; - }else if($searchcount == 1) { - $entry = $search->shiftEntry(); - return $entry; - }else{ - common_log(LOG_WARNING, 'Found ' . $searchcount . ' ldap user with the username: ' . $username); - return false; - } - } - - /** - * Code originaly from the phpLDAPadmin development team - * http://phpldapadmin.sourceforge.net/ - * - * Hashes a password and returns the hash based on the specified enc_type. - * - * @param string $passwordClear The password to hash in clear text. - * @param string $encodageType Standard LDAP encryption type which must be one of - * crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, or clear. - * @return string The hashed password. - * - */ - - function hashPassword( $passwordClear, $encodageType ) - { - $encodageType = strtolower( $encodageType ); - switch( $encodageType ) { - case 'crypt': - $cryptedPassword = '{CRYPT}' . crypt($passwordClear,$this->randomSalt(2)); - break; - - case 'ext_des': - // extended des crypt. see OpenBSD crypt man page. - if ( ! defined( 'CRYPT_EXT_DES' ) || CRYPT_EXT_DES == 0 ) {return FALSE;} //Your system crypt library does not support extended DES encryption. - $cryptedPassword = '{CRYPT}' . crypt( $passwordClear, '_' . $this->randomSalt(8) ); - break; - - case 'md5crypt': - if( ! defined( 'CRYPT_MD5' ) || CRYPT_MD5 == 0 ) {return FALSE;} //Your system crypt library does not support md5crypt encryption. - $cryptedPassword = '{CRYPT}' . crypt( $passwordClear , '$1$' . $this->randomSalt(9) ); - break; - - case 'blowfish': - if( ! defined( 'CRYPT_BLOWFISH' ) || CRYPT_BLOWFISH == 0 ) {return FALSE;} //Your system crypt library does not support blowfish encryption. - $cryptedPassword = '{CRYPT}' . crypt( $passwordClear , '$2a$12$' . $this->randomSalt(13) ); // hardcoded to second blowfish version and set number of rounds - break; - - case 'md5': - $cryptedPassword = '{MD5}' . base64_encode( pack( 'H*' , md5( $passwordClear) ) ); - break; - - case 'sha': - if( function_exists('sha1') ) { - // use php 4.3.0+ sha1 function, if it is available. - $cryptedPassword = '{SHA}' . base64_encode( pack( 'H*' , sha1( $passwordClear) ) ); - } elseif( function_exists( 'mhash' ) ) { - $cryptedPassword = '{SHA}' . base64_encode( mhash( MHASH_SHA1, $passwordClear) ); - } else { - return FALSE; //Your PHP install does not have the mhash() function. Cannot do SHA hashes. - } - break; - - case 'ssha': - if( function_exists( 'mhash' ) && function_exists( 'mhash_keygen_s2k' ) ) { - mt_srand( (double) microtime() * 1000000 ); - $salt = mhash_keygen_s2k( MHASH_SHA1, $passwordClear, substr( pack( "h*", md5( mt_rand() ) ), 0, 8 ), 4 ); - $cryptedPassword = "{SSHA}".base64_encode( mhash( MHASH_SHA1, $passwordClear.$salt ).$salt ); - } else { - return FALSE; //Your PHP install does not have the mhash() function. Cannot do SHA hashes. - } - break; - - case 'smd5': - if( function_exists( 'mhash' ) && function_exists( 'mhash_keygen_s2k' ) ) { - mt_srand( (double) microtime() * 1000000 ); - $salt = mhash_keygen_s2k( MHASH_MD5, $passwordClear, substr( pack( "h*", md5( mt_rand() ) ), 0, 8 ), 4 ); - $cryptedPassword = "{SMD5}".base64_encode( mhash( MHASH_MD5, $passwordClear.$salt ).$salt ); - } else { - return FALSE; //Your PHP install does not have the mhash() function. Cannot do SHA hashes. - } - break; - - case 'ad': - $cryptedPassword = ''; - $passwordClear = "\"" . $passwordClear . "\""; - $len = strlen($passwordClear); - for ($i = 0; $i < $len; $i++) { - $cryptedPassword .= "{$passwordClear{$i}}\000"; - } - - case 'clear': - default: - $cryptedPassword = $passwordClear; - } - - return $cryptedPassword; - } - - /** - * Code originaly from the phpLDAPadmin development team - * http://phpldapadmin.sourceforge.net/ - * - * Used to generate a random salt for crypt-style passwords. Salt strings are used - * to make pre-built hash cracking dictionaries difficult to use as the hash algorithm uses - * not only the user's password but also a randomly generated string. The string is - * stored as the first N characters of the hash for reference of hashing algorithms later. - * - * --- added 20021125 by bayu irawan --- - * --- ammended 20030625 by S C Rigler --- - * - * @param int $length The length of the salt string to generate. - * @return string The generated salt string. - */ - - function randomSalt( $length ) - { - $possible = '0123456789'. - 'abcdefghijklmnopqrstuvwxyz'. - 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'. - './'; - $str = ""; - mt_srand((double)microtime() * 1000000); - - while( strlen( $str ) < $length ) - $str .= substr( $possible, ( rand() % strlen( $possible ) ), 1 ); - - return $str; - } function onPluginVersion(&$versions) { diff --git a/plugins/LdapAuthentication/MemcacheSchemaCache.php b/plugins/LdapAuthentication/MemcacheSchemaCache.php deleted file mode 100644 index 6b91d17d6..000000000 --- a/plugins/LdapAuthentication/MemcacheSchemaCache.php +++ /dev/null @@ -1,75 +0,0 @@ -. - * - * @category Plugin - * @package StatusNet - * @author Craig Andrews - * @copyright 2009 Craig Andrews http://candrews.integralblue.com - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ -class MemcacheSchemaCache implements Net_LDAP2_SchemaCache -{ - protected $c; - protected $cacheKey; - - /** - * Initialize the simple cache - * - * Config is as following: - * memcache memcache instance - * cachekey the key in the cache to look at - * - * @param array $cfg Config array - */ - public function MemcacheSchemaCache($cfg) - { - $this->c = $cfg['c']; - $this->cacheKey = $cfg['cacheKey']; - } - - /** - * Return the schema object from the cache - * - * @return Net_LDAP2_Schema|Net_LDAP2_Error|false - */ - public function loadSchema() - { - return $this->c->get($this->cacheKey); - } - - /** - * Store a schema object in the cache - * - * This method will be called, if Net_LDAP2 has fetched a fresh - * schema object from LDAP and wants to init or refresh the cache. - * - * To invalidate the cache and cause Net_LDAP2 to refresh the cache, - * you can call this method with null or false as value. - * The next call to $ldap->schema() will then refresh the caches object. - * - * @param mixed $schema The object that should be cached - * @return true|Net_LDAP2_Error|false - */ - public function storeSchema($schema) { - return $this->c->set($this->cacheKey, $schema); - } -} diff --git a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php index e6a68cbae..97103d158 100644 --- a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php +++ b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php @@ -31,41 +31,28 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once 'Net/LDAP2.php'; - class LdapAuthorizationPlugin extends AuthorizationPlugin { - public $host=null; - public $port=null; - public $version=null; - public $starttls=null; - public $binddn=null; - public $bindpw=null; - public $basedn=null; - public $options=null; - public $filter=null; - public $scope=null; - public $provider_name = null; - public $uniqueMember_attribute = null; public $roles_to_groups = array(); public $login_group = null; - public $attributes = array(); function onInitializePlugin(){ - if(!isset($this->host)){ - throw new Exception("must specify a host"); - } - if(!isset($this->basedn)){ - throw new Exception("must specify a basedn"); - } if(!isset($this->provider_name)){ throw new Exception("provider_name must be set. Use the provider_name from the LDAP Authentication plugin."); } if(!isset($this->uniqueMember_attribute)){ throw new Exception("uniqueMember_attribute must be set."); } - if(!isset($this->attributes['username'])){ - throw new Exception("username attribute must be set."); + $this->ldapCommon = new LdapCommon(get_object_vars($this)); + } + + function onAutoload($cls) + { + switch ($cls) + { + case 'LdapCommon': + require_once(INSTALLDIR.'/plugins/LdapCommon/LdapCommon.php'); + return false; } } @@ -75,17 +62,17 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin $user_username->user_id=$user->id; $user_username->provider_name=$this->provider_name; if($user_username->find() && $user_username->fetch()){ - $entry = $this->ldap_get_user($user_username->username); + $entry = $this->ldapCommon->get_user($user_username->username); if($entry){ if(isset($this->login_group)){ if(is_array($this->login_group)){ foreach($this->login_group as $group){ - if($this->ldap_is_dn_member_of_group($entry->dn(),$group)){ + if($this->ldapCommon->is_dn_member_of_group($entry->dn(),$group)){ return true; } } }else{ - if($this->ldap_is_dn_member_of_group($entry->dn(),$this->login_group)){ + if($this->ldapCommon->is_dn_member_of_group($entry->dn(),$this->login_group)){ return true; } } @@ -107,17 +94,17 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin $user_username->user_id=$profile->id; $user_username->provider_name=$this->provider_name; if($user_username->find() && $user_username->fetch()){ - $entry = $this->ldap_get_user($user_username->username); + $entry = $this->ldapCommon->get_user($user_username->username); if($entry){ if(isset($this->roles_to_groups[$name])){ if(is_array($this->roles_to_groups[$name])){ foreach($this->roles_to_groups[$name] as $group){ - if($this->ldap_is_dn_member_of_group($entry->dn(),$group)){ + if($this->ldapCommon->is_dn_member_of_group($entry->dn(),$group)){ return true; } } }else{ - if($this->ldap_is_dn_member_of_group($entry->dn(),$this->roles_to_groups[$name])){ + if($this->ldapCommon->is_dn_member_of_group($entry->dn(),$this->roles_to_groups[$name])){ return true; } } @@ -127,94 +114,6 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin return false; } - function ldap_is_dn_member_of_group($userDn, $groupDn) - { - $ldap = $this->ldap_get_connection(); - $link = $ldap->getLink(); - $r = @ldap_compare($link, $groupDn, $this->uniqueMember_attribute, $userDn); - if ($r === true){ - return true; - }else if($r === false){ - return false; - }else{ - common_log(LOG_ERR, "LDAP error determining if userDn=$userDn is a member of groupDn=$groupDn using uniqueMember_attribute=$this->uniqueMember_attribute error: ".ldap_error($link)); - return false; - } - } - - function ldap_get_config(){ - $config = array(); - $keys = array('host','port','version','starttls','binddn','bindpw','basedn','options','filter','scope'); - foreach($keys as $key){ - $value = $this->$key; - if($value!==null){ - $config[$key]=$value; - } - } - return $config; - } - - //-----the below function were copied from LDAPAuthenticationPlugin. They will be moved to a utility class soon.----\\ - function ldap_get_connection($config = null){ - if($config == null && isset($this->default_ldap)){ - return $this->default_ldap; - } - - //cannot use Net_LDAP2::connect() as StatusNet uses - //PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError'); - //PEAR handling can be overridden on instance objects, so we do that. - $ldap = new Net_LDAP2(isset($config)?$config:$this->ldap_get_config()); - $ldap->setErrorHandling(PEAR_ERROR_RETURN); - $err=$ldap->bind(); - if (Net_LDAP2::isError($err)) { - // if we were called with a config, assume caller will handle - // incorrect username/password (LDAP_INVALID_CREDENTIALS) - if (isset($config) && $err->getCode() == 0x31) { - return null; - } - throw new Exception('Could not connect to LDAP server: '.$err->getMessage()); - return false; - } - if($config == null) $this->default_ldap=$ldap; - return $ldap; - } - - /** - * get an LDAP entry for a user with a given username - * - * @param string $username - * $param array $attributes LDAP attributes to retrieve - * @return string DN - */ - function ldap_get_user($username,$attributes=array(),$ldap=null){ - if($ldap==null) { - $ldap = $this->ldap_get_connection(); - } - if(! $ldap) { - throw new Exception("Could not connect to LDAP"); - } - $filter = Net_LDAP2_Filter::create($this->attributes['username'], 'equals', $username); - $options = array( - 'attributes' => $attributes - ); - $search = $ldap->search(null,$filter,$options); - - if (PEAR::isError($search)) { - common_log(LOG_WARNING, 'Error while getting DN for user: '.$search->getMessage()); - return false; - } - - if($search->count()==0){ - return false; - }else if($search->count()==1){ - $entry = $search->shiftEntry(); - return $entry; - }else{ - common_log(LOG_WARNING, 'Found ' . $search->count() . ' ldap user with the username: ' . $username); - return false; - } - } - function onPluginVersion(&$versions) { $versions[] = array('name' => 'LDAP Authorization', diff --git a/plugins/LdapCommon/LdapCommon.php b/plugins/LdapCommon/LdapCommon.php new file mode 100644 index 000000000..39d872df5 --- /dev/null +++ b/plugins/LdapCommon/LdapCommon.php @@ -0,0 +1,356 @@ +. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews + * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +class LdapCommon +{ + protected static $ldap_connections = array(); + public $host=null; + public $port=null; + public $version=null; + public $starttls=null; + public $binddn=null; + public $bindpw=null; + public $basedn=null; + public $options=null; + public $filter=null; + public $scope=null; + public $uniqueMember_attribute = null; + public $attributes=array(); + public $password_encoding=null; + + public function __construct($config) + { + Event::addHandler('Autoload',array($this,'onAutoload')); + foreach($config as $key=>$value) { + $this->$key = $value; + } + $this->ldap_config = $this->get_ldap_config(); + + if(!isset($this->host)){ + throw new Exception("must specify a host"); + } + if(!isset($this->basedn)){ + throw new Exception("must specify a basedn"); + } + if(!isset($this->attributes['username'])){ + throw new Exception("username attribute must be set."); + } + } + + function onAutoload($cls) + { + switch ($cls) + { + case 'MemcacheSchemaCache': + require_once(INSTALLDIR.'/plugins/LdapCommon/MemcacheSchemaCache.php'); + return false; + case 'Net_LDAP2': + require_once 'Net/LDAP2.php'; + return false; + } + } + + function get_ldap_config(){ + $config = array(); + $keys = array('host','port','version','starttls','binddn','bindpw','basedn','options','filter','scope'); + foreach($keys as $key){ + $value = $this->$key; + if($value!==null){ + $config[$key]=$value; + } + } + return $config; + } + + function get_ldap_connection($config = null){ + if($config == null) { + $config = $this->ldap_config; + } + $config_id = crc32(serialize($config)); + $ldap = self::$ldap_connections[$config_id]; + if(! isset($ldap)) { + //cannot use Net_LDAP2::connect() as StatusNet uses + //PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError'); + //PEAR handling can be overridden on instance objects, so we do that. + $ldap = new Net_LDAP2($config); + $ldap->setErrorHandling(PEAR_ERROR_RETURN); + $err=$ldap->bind(); + if (Net_LDAP2::isError($err)) { + // if we were called with a config, assume caller will handle + // incorrect username/password (LDAP_INVALID_CREDENTIALS) + if (isset($config) && $err->getCode() == 0x31) { + throw new LdapInvalidCredentialsException('Could not connect to LDAP server: '.$err->getMessage()); + } + throw new Exception('Could not connect to LDAP server: '.$err->getMessage()); + } + $c = common_memcache(); + if (!empty($c)) { + $cacheObj = new MemcacheSchemaCache( + array('c'=>$c, + 'cacheKey' => common_cache_key('ldap_schema:' . $config_id))); + $ldap->registerSchemaCache($cacheObj); + } + self::$ldap_connections[$config_id] = $ldap; + } + return $ldap; + } + + function checkPassword($username, $password) + { + $entry = $this->get_user($username); + if(!$entry){ + return false; + }else{ + $config = $this->get_ldap_config(); + $config['binddn']=$entry->dn(); + $config['bindpw']=$password; + try { + $this->get_ldap_connection($config); + } catch (LdapInvalidCredentialsException $e) { + return false; + } + return true; + } + } + + function changePassword($username,$oldpassword,$newpassword) + { + if(! isset($this->attributes['password']) || !isset($this->password_encoding)){ + //throw new Exception(_('Sorry, changing LDAP passwords is not supported at this time')); + return false; + } + $entry = $this->get_user($username); + if(!$entry){ + return false; + }else{ + $config = $this->get_ldap_config(); + $config['binddn']=$entry->dn(); + $config['bindpw']=$oldpassword; + try { + $ldap = $this->get_ldap_connection($config); + + $entry = $this->get_user($username,array(),$ldap); + + $newCryptedPassword = $this->hashPassword($newpassword, $this->password_encoding); + if ($newCryptedPassword===false) { + return false; + } + if($this->password_encoding=='ad') { + //TODO I believe this code will work once this bug is fixed: http://pear.php.net/bugs/bug.php?id=16796 + $oldCryptedPassword = $this->hashPassword($oldpassword, $this->password_encoding); + $entry->delete( array($this->attributes['password'] => $oldCryptedPassword )); + } + $entry->replace( array($this->attributes['password'] => $newCryptedPassword ), true); + if( Net_LDAP2::isError($entry->upate()) ) { + return false; + } + return true; + } catch (LdapInvalidCredentialsException $e) { + return false; + } + } + + return false; + } + + function is_dn_member_of_group($userDn, $groupDn) + { + $ldap = $this->get_ldap_connection(); + $link = $ldap->getLink(); + $r = @ldap_compare($link, $groupDn, $this->uniqueMember_attribute, $userDn); + if ($r === true){ + return true; + }else if($r === false){ + return false; + }else{ + common_log(LOG_ERR, "LDAP error determining if userDn=$userDn is a member of groupDn=$groupDn using uniqueMember_attribute=$this->uniqueMember_attribute error: ".ldap_error($link)); + return false; + } + } + + /** + * get an LDAP entry for a user with a given username + * + * @param string $username + * $param array $attributes LDAP attributes to retrieve + * @return string DN + */ + function get_user($username,$attributes=array()){ + $ldap = $this->get_ldap_connection(); + $filter = Net_LDAP2_Filter::create($this->attributes['username'], 'equals', $username); + $options = array( + 'attributes' => $attributes + ); + $search = $ldap->search(null,$filter,$options); + + if (PEAR::isError($search)) { + common_log(LOG_WARNING, 'Error while getting DN for user: '.$search->getMessage()); + return false; + } + + if($search->count()==0){ + return false; + }else if($search->count()==1){ + $entry = $search->shiftEntry(); + return $entry; + }else{ + common_log(LOG_WARNING, 'Found ' . $search->count() . ' ldap user with the username: ' . $username); + return false; + } + } + + /** + * Code originaly from the phpLDAPadmin development team + * http://phpldapadmin.sourceforge.net/ + * + * Hashes a password and returns the hash based on the specified enc_type. + * + * @param string $passwordClear The password to hash in clear text. + * @param string $encodageType Standard LDAP encryption type which must be one of + * crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, or clear. + * @return string The hashed password. + * + */ + + function hashPassword( $passwordClear, $encodageType ) + { + $encodageType = strtolower( $encodageType ); + switch( $encodageType ) { + case 'crypt': + $cryptedPassword = '{CRYPT}' . crypt($passwordClear,$this->randomSalt(2)); + break; + + case 'ext_des': + // extended des crypt. see OpenBSD crypt man page. + if ( ! defined( 'CRYPT_EXT_DES' ) || CRYPT_EXT_DES == 0 ) {return FALSE;} //Your system crypt library does not support extended DES encryption. + $cryptedPassword = '{CRYPT}' . crypt( $passwordClear, '_' . $this->randomSalt(8) ); + break; + + case 'md5crypt': + if( ! defined( 'CRYPT_MD5' ) || CRYPT_MD5 == 0 ) {return FALSE;} //Your system crypt library does not support md5crypt encryption. + $cryptedPassword = '{CRYPT}' . crypt( $passwordClear , '$1$' . $this->randomSalt(9) ); + break; + + case 'blowfish': + if( ! defined( 'CRYPT_BLOWFISH' ) || CRYPT_BLOWFISH == 0 ) {return FALSE;} //Your system crypt library does not support blowfish encryption. + $cryptedPassword = '{CRYPT}' . crypt( $passwordClear , '$2a$12$' . $this->randomSalt(13) ); // hardcoded to second blowfish version and set number of rounds + break; + + case 'md5': + $cryptedPassword = '{MD5}' . base64_encode( pack( 'H*' , md5( $passwordClear) ) ); + break; + + case 'sha': + if( function_exists('sha1') ) { + // use php 4.3.0+ sha1 function, if it is available. + $cryptedPassword = '{SHA}' . base64_encode( pack( 'H*' , sha1( $passwordClear) ) ); + } elseif( function_exists( 'mhash' ) ) { + $cryptedPassword = '{SHA}' . base64_encode( mhash( MHASH_SHA1, $passwordClear) ); + } else { + return FALSE; //Your PHP install does not have the mhash() function. Cannot do SHA hashes. + } + break; + + case 'ssha': + if( function_exists( 'mhash' ) && function_exists( 'mhash_keygen_s2k' ) ) { + mt_srand( (double) microtime() * 1000000 ); + $salt = mhash_keygen_s2k( MHASH_SHA1, $passwordClear, substr( pack( "h*", md5( mt_rand() ) ), 0, 8 ), 4 ); + $cryptedPassword = "{SSHA}".base64_encode( mhash( MHASH_SHA1, $passwordClear.$salt ).$salt ); + } else { + return FALSE; //Your PHP install does not have the mhash() function. Cannot do SHA hashes. + } + break; + + case 'smd5': + if( function_exists( 'mhash' ) && function_exists( 'mhash_keygen_s2k' ) ) { + mt_srand( (double) microtime() * 1000000 ); + $salt = mhash_keygen_s2k( MHASH_MD5, $passwordClear, substr( pack( "h*", md5( mt_rand() ) ), 0, 8 ), 4 ); + $cryptedPassword = "{SMD5}".base64_encode( mhash( MHASH_MD5, $passwordClear.$salt ).$salt ); + } else { + return FALSE; //Your PHP install does not have the mhash() function. Cannot do SHA hashes. + } + break; + + case 'ad': + $cryptedPassword = ''; + $passwordClear = "\"" . $passwordClear . "\""; + $len = strlen($passwordClear); + for ($i = 0; $i < $len; $i++) { + $cryptedPassword .= "{$passwordClear{$i}}\000"; + } + + case 'clear': + default: + $cryptedPassword = $passwordClear; + } + + return $cryptedPassword; + } + + /** + * Code originaly from the phpLDAPadmin development team + * http://phpldapadmin.sourceforge.net/ + * + * Used to generate a random salt for crypt-style passwords. Salt strings are used + * to make pre-built hash cracking dictionaries difficult to use as the hash algorithm uses + * not only the user's password but also a randomly generated string. The string is + * stored as the first N characters of the hash for reference of hashing algorithms later. + * + * --- added 20021125 by bayu irawan --- + * --- ammended 20030625 by S C Rigler --- + * + * @param int $length The length of the salt string to generate. + * @return string The generated salt string. + */ + + function randomSalt( $length ) + { + $possible = '0123456789'. + 'abcdefghijklmnopqrstuvwxyz'. + 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'. + './'; + $str = ""; + mt_srand((double)microtime() * 1000000); + + while( strlen( $str ) < $length ) + $str .= substr( $possible, ( rand() % strlen( $possible ) ), 1 ); + + return $str; + } + +} + +class LdapInvalidCredentialsException extends Exception +{ + +} diff --git a/plugins/LdapCommon/MemcacheSchemaCache.php b/plugins/LdapCommon/MemcacheSchemaCache.php new file mode 100644 index 000000000..6b91d17d6 --- /dev/null +++ b/plugins/LdapCommon/MemcacheSchemaCache.php @@ -0,0 +1,75 @@ +. + * + * @category Plugin + * @package StatusNet + * @author Craig Andrews + * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ +class MemcacheSchemaCache implements Net_LDAP2_SchemaCache +{ + protected $c; + protected $cacheKey; + + /** + * Initialize the simple cache + * + * Config is as following: + * memcache memcache instance + * cachekey the key in the cache to look at + * + * @param array $cfg Config array + */ + public function MemcacheSchemaCache($cfg) + { + $this->c = $cfg['c']; + $this->cacheKey = $cfg['cacheKey']; + } + + /** + * Return the schema object from the cache + * + * @return Net_LDAP2_Schema|Net_LDAP2_Error|false + */ + public function loadSchema() + { + return $this->c->get($this->cacheKey); + } + + /** + * Store a schema object in the cache + * + * This method will be called, if Net_LDAP2 has fetched a fresh + * schema object from LDAP and wants to init or refresh the cache. + * + * To invalidate the cache and cause Net_LDAP2 to refresh the cache, + * you can call this method with null or false as value. + * The next call to $ldap->schema() will then refresh the caches object. + * + * @param mixed $schema The object that should be cached + * @return true|Net_LDAP2_Error|false + */ + public function storeSchema($schema) { + return $this->c->set($this->cacheKey, $schema); + } +} -- cgit v1.2.3-54-g00ecf From c85228eadc60b50ed6e7c9cba596c3e66f5214b2 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 22 Mar 2010 14:22:18 -0400 Subject: blowSubscriberCount and blowSubscriptionCount - no 's' --- classes/Subscription.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/Subscription.php b/classes/Subscription.php index 60c12cccc..0679c0925 100644 --- a/classes/Subscription.php +++ b/classes/Subscription.php @@ -88,8 +88,8 @@ class Subscription extends Memcached_DataObject self::blow('user:notices_with_friends:%d', $subscriber->id); - $subscriber->blowSubscriptionsCount(); - $other->blowSubscribersCount(); + $subscriber->blowSubscriptionCount(); + $other->blowSubscriberCount(); $otherUser = User::staticGet('id', $other->id); @@ -213,8 +213,8 @@ class Subscription extends Memcached_DataObject self::blow('user:notices_with_friends:%d', $subscriber->id); - $subscriber->blowSubscriptionsCount(); - $other->blowSubscribersCount(); + $subscriber->blowSubscriptionCount(); + $other->blowSubscriberCount(); Event::handle('EndUnsubscribe', array($subscriber, $other)); } -- cgit v1.2.3-54-g00ecf From 3bb639699c7a5e7e96c0d048adbe48a3ed486fc9 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 22 Mar 2010 11:27:39 -0700 Subject: Confirm there's actually user and domain portions of acct string before assigning things from output of explode(); avoids notice message when invalid input passed to main/xrd --- plugins/OStatus/actions/userxrd.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/OStatus/actions/userxrd.php b/plugins/OStatus/actions/userxrd.php index eb80a5ad4..6a6886eb8 100644 --- a/plugins/OStatus/actions/userxrd.php +++ b/plugins/OStatus/actions/userxrd.php @@ -35,9 +35,13 @@ class UserxrdAction extends XrdAction $this->uri = Discovery::normalize($this->uri); if (Discovery::isWebfinger($this->uri)) { - list($nick, $domain) = explode('@', substr(urldecode($this->uri), 5)); - $nick = common_canonical_nickname($nick); - $this->user = User::staticGet('nickname', $nick); + $parts = explode('@', substr(urldecode($this->uri), 5)); + if (count($parts) == 2) { + list($nick, $domain) = $parts; + // @fixme confirm the domain too + $nick = common_canonical_nickname($nick); + $this->user = User::staticGet('nickname', $nick); + } } else { $this->user = User::staticGet('uri', $this->uri); } -- cgit v1.2.3-54-g00ecf From 4168b9cec1f7b2e6421c018e56e3b9a13c14d581 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 22 Mar 2010 11:33:56 -0700 Subject: Log backtraces for non-ClientException exceptions caught at the top-level handler. --- index.php | 4 ++-- lib/servererroraction.php | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/index.php b/index.php index 36ba3a0d2..ea5c80277 100644 --- a/index.php +++ b/index.php @@ -324,10 +324,10 @@ function main() $cac = new ClientErrorAction($cex->getMessage(), $cex->getCode()); $cac->showPage(); } catch (ServerException $sex) { // snort snort guffaw - $sac = new ServerErrorAction($sex->getMessage(), $sex->getCode()); + $sac = new ServerErrorAction($sex->getMessage(), $sex->getCode(), $sex); $sac->showPage(); } catch (Exception $ex) { - $sac = new ServerErrorAction($ex->getMessage()); + $sac = new ServerErrorAction($ex->getMessage(), 500, $ex); $sac->showPage(); } } diff --git a/lib/servererroraction.php b/lib/servererroraction.php index 0993a63bc..9b5a553dc 100644 --- a/lib/servererroraction.php +++ b/lib/servererroraction.php @@ -62,15 +62,18 @@ class ServerErrorAction extends ErrorAction 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported'); - function __construct($message='Error', $code=500) + function __construct($message='Error', $code=500, $ex=null) { parent::__construct($message, $code); $this->default = 500; // Server errors must be logged. - - common_log(LOG_ERR, "ServerErrorAction: $code $message"); + $log = "ServerErrorAction: $code $message"; + if ($ex) { + $log .= "\n" . $ex->getTraceAsString(); + } + common_log(LOG_ERR, $log); } // XXX: Should these error actions even be invokable via URI? -- cgit v1.2.3-54-g00ecf From 27bfd1211d64298ee3c3b2d82d7b38ca1e1167ad Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 22 Mar 2010 12:17:45 -0700 Subject: Math_BigInteger doesn't correctly handle serialization/deserialization for a value of 0, which can end up spewing notices to output and otherwise intefering with Salmon signature setup and verification when using memcached. Worked around this with a subclass that fixes the wakeup, used for the stored 0 value in the subclassed Crypt_RSA. --- plugins/OStatus/classes/Magicsig.php | 10 ++++------ plugins/OStatus/lib/safecrypt_rsa.php | 18 ++++++++++++++++++ plugins/OStatus/lib/safemath_biginteger.php | 20 ++++++++++++++++++++ 3 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 plugins/OStatus/lib/safecrypt_rsa.php create mode 100644 plugins/OStatus/lib/safemath_biginteger.php diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php index 5705ecc11..87c684c93 100644 --- a/plugins/OStatus/classes/Magicsig.php +++ b/plugins/OStatus/classes/Magicsig.php @@ -27,8 +27,6 @@ * @link http://status.net/ */ -require_once 'Crypt/RSA.php'; - class Magicsig extends Memcached_DataObject { @@ -102,16 +100,16 @@ class Magicsig extends Memcached_DataObject public function generate($user_id) { - $rsa = new Crypt_RSA(); + $rsa = new SafeCrypt_RSA(); $keypair = $rsa->createKey(); $rsa->loadKey($keypair['privatekey']); - $this->privateKey = new Crypt_RSA(); + $this->privateKey = new SafeCrypt_RSA(); $this->privateKey->loadKey($keypair['privatekey']); - $this->publicKey = new Crypt_RSA(); + $this->publicKey = new SafeCrypt_RSA(); $this->publicKey->loadKey($keypair['publickey']); $this->user_id = $user_id; @@ -163,7 +161,7 @@ class Magicsig extends Memcached_DataObject { common_log(LOG_DEBUG, "Adding ".$type." key: (".$mod .', '. $exp .")"); - $rsa = new Crypt_RSA(); + $rsa = new SafeCrypt_RSA(); $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1; $rsa->setHash('sha256'); $rsa->modulus = new Math_BigInteger(base64_url_decode($mod), 256); diff --git a/plugins/OStatus/lib/safecrypt_rsa.php b/plugins/OStatus/lib/safecrypt_rsa.php new file mode 100644 index 000000000..f3aa2c928 --- /dev/null +++ b/plugins/OStatus/lib/safecrypt_rsa.php @@ -0,0 +1,18 @@ +zero = new SafeMath_BigInteger(); + } +} + diff --git a/plugins/OStatus/lib/safemath_biginteger.php b/plugins/OStatus/lib/safemath_biginteger.php new file mode 100644 index 000000000..c05e24d1e --- /dev/null +++ b/plugins/OStatus/lib/safemath_biginteger.php @@ -0,0 +1,20 @@ +hex == '') { + $this->hex = '0'; + } + parent::__wakeup(); + } +} + -- cgit v1.2.3-54-g00ecf From eb563937df921e5fc67ca0c87e229feb2907fd19 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 22 Mar 2010 16:04:06 -0400 Subject: Need to pass the password parameter to checkPassword --- plugins/LdapAuthentication/LdapAuthenticationPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php index 6296bccfa..a55c45ff5 100644 --- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -84,7 +84,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin function checkPassword($username, $password) { - return $this->ldapCommon->checkPassword($username); + return $this->ldapCommon->checkPassword($username,$password); } function autoRegister($username, $nickname) -- cgit v1.2.3-54-g00ecf From 3678e7b89bd0cc683c98369e5dec3b940134532b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 22 Mar 2010 15:55:13 -0700 Subject: OStatus remote sending test cases. Doesn't actually run within PHPUnit right now, must be run from command line -- specify base URLs to two StatusNet sites that will be able to communicate with each other. Current test run includes: * register accounts (via web form) * local post * @-mention using path (@domain/path/to/user) Subscriptions, webfinger mentions, various paths to subscription and unsubscription, etc to come. --- plugins/OStatus/tests/remote-tests.php | 392 +++++++++++++++++++++++++++++++++ 1 file changed, 392 insertions(+) create mode 100644 plugins/OStatus/tests/remote-tests.php diff --git a/plugins/OStatus/tests/remote-tests.php b/plugins/OStatus/tests/remote-tests.php new file mode 100644 index 000000000..103ca066c --- /dev/null +++ b/plugins/OStatus/tests/remote-tests.php @@ -0,0 +1,392 @@ +a = $a; + $this->b = $b; + + $base = 'test' . mt_rand(1, 1000000); + $this->pub = new SNTestClient($this->a, 'pub' . $base, 'pw-' . mt_rand(1, 1000000)); + $this->sub = new SNTestClient($this->b, 'sub' . $base, 'pw-' . mt_rand(1, 1000000)); + } + + function run() + { + $this->setup(); + $this->testLocalPost(); + $this->testMentionUrl(); + $this->log("DONE!"); + } + + function setup() + { + $this->pub->register(); + $this->pub->assertRegistered(); + + $this->sub->register(); + $this->sub->assertRegistered(); + } + + function testLocalPost() + { + $post = $this->pub->post("Local post, no subscribers yet."); + $this->assertNotEqual('', $post); + + $post = $this->sub->post("Local post, no subscriptions yet."); + $this->assertNotEqual('', $post); + } + + /** + * pub posts: @b/sub + */ + function testMentionUrl() + { + $bits = parse_url($this->b); + $base = $bits['host']; + if (isset($bits['path'])) { + $base .= $bits['path']; + } + $name = $this->sub->username; + + $post = $this->pub->post("@$base/$name should have this in home and replies"); + $this->sub->assertReceived($post); + } +} + +class SNTestClient extends TestBase +{ + function __construct($base, $username, $password) + { + $this->basepath = $base; + $this->username = $username; + $this->password = $password; + + $this->fullname = ucfirst($username) . ' Smith'; + $this->homepage = 'http://example.org/' . $username; + $this->bio = 'Stub account for OStatus tests.'; + $this->location = 'Montreal, QC'; + } + + /** + * Make a low-level web hit to this site, with authentication. + * @param string $path URL fragment for something under the base path + * @param array $params POST parameters to send + * @param boolean $auth whether to include auth data + * @return string + * @throws Exception on low-level error conditions + */ + protected function hit($path, $params=array(), $auth=false, $cookies=array()) + { + $url = $this->basepath . '/' . $path; + + $http = new HTTP_Request2($url, 'POST'); + if ($auth) { + $http->setAuth($this->username, $this->password, HTTP_Request2::AUTH_BASIC); + } + foreach ($cookies as $name => $val) { + $http->addCookie($name, $val); + } + $http->addPostParameter($params); + $response = $http->send(); + + $code = $response->getStatus(); + if ($code < '200' || $code >= '400') { + throw new Exception("Failed API hit to $url: $code\n" . $response->getBody()); + } + + return $response; + } + + /** + * Make a hit to a web form, without authentication but with a session. + * @param string $path URL fragment relative to site base + * @param string $form id of web form to pull initial parameters from + * @param array $params POST parameters, will be merged with defaults in form + */ + protected function web($path, $form, $params=array()) + { + $url = $this->basepath . '/' . $path; + $http = new HTTP_Request2($url, 'GET'); + $response = $http->send(); + + $dom = $this->checkWeb($url, 'GET', $response); + $cookies = array(); + foreach ($response->getCookies() as $cookie) { + // @fixme check for expirations etc + $cookies[$cookie['name']] = $cookie['value']; + } + + $form = $dom->getElementById($form); + if (!$form) { + throw new Exception("Form $form not found on $url"); + } + $inputs = $form->getElementsByTagName('input'); + foreach ($inputs as $item) { + $type = $item->getAttribute('type'); + if ($type != 'check') { + $name = $item->getAttribute('name'); + $val = $item->getAttribute('value'); + if ($name && $val && !isset($params[$name])) { + $params[$name] = $val; + } + } + } + + $response = $this->hit($path, $params, false, $cookies); + $dom = $this->checkWeb($url, 'POST', $response); + + return $dom; + } + + protected function checkWeb($url, $method, $response) + { + $dom = new DOMDocument(); + if (!$dom->loadHTML($response->getBody())) { + throw new Exception("Invalid HTML from $method to $url"); + } + + $xpath = new DOMXPath($dom); + $error = $xpath->query('//p[@class="error"]'); + if ($error && $error->length) { + throw new Exception("Error on $method to $url: " . + $error->item(0)->textContent); + } + + return $dom; + } + + /** + * Make an API hit to this site, with authentication. + * @param string $path URL fragment for something under 'api' folder + * @param string $style one of 'json', 'xml', or 'atom' + * @param array $params POST parameters to send + * @return mixed associative array for JSON, DOMDocument for XML/Atom + * @throws Exception on low-level error conditions + */ + protected function api($path, $style, $params=array()) + { + $response = $this->hit("api/$path.$style", $params, true); + $body = $response->getBody(); + if ($style == 'json') { + $data = json_decode($body, true); + if ($data !== null) { + if (!empty($data['error'])) { + throw new Exception("JSON API returned error: " . $data['error']); + } + return $data; + } else { + throw new Exception("Bogus JSON data from $path:\n$body"); + } + } else if ($style == 'xml' || $style == 'atom') { + $dom = new DOMDocument(); + if ($dom->loadXML($body)) { + return $dom; + } else { + throw new Exception("Bogus XML data from $path:\n$body"); + } + } else { + throw new Exception("API needs to be JSON, XML, or Atom"); + } + } + + /** + * Register the account. + * + * Unfortunately there's not an API method for registering, so we fake it. + */ + function register() + { + $this->log("Registering user %s on %s", + $this->username, + $this->basepath); + $ret = $this->web('main/register', 'form_register', + array('nickname' => $this->username, + 'password' => $this->password, + 'confirm' => $this->password, + 'fullname' => $this->fullname, + 'homepage' => $this->homepage, + 'bio' => $this->bio, + 'license' => 1, + 'submit' => 'Register')); + } + + /** + * Check that the account has been registered and can be used. + * On failure, throws a test failure exception. + */ + function assertRegistered() + { + $this->log("Confirming %s is registered on %s", + $this->username, + $this->basepath); + $data = $this->api('account/verify_credentials', 'json'); + $this->assertEqual($this->username, $data['screen_name']); + $this->assertEqual($this->fullname, $data['name']); + $this->assertEqual($this->homepage, $data['url']); + $this->assertEqual($this->bio, $data['description']); + } + + /** + * Post a given message from this account + * @param string $message + * @return string URL/URI of notice + * @todo reply, location options + */ + function post($message) + { + $this->log("Posting notice as %s on %s: %s", + $this->username, + $this->basepath, + $message); + $data = $this->api('statuses/update', 'json', + array('status' => $message)); + + $url = $this->basepath . '/notice/' . $data['id']; + return $url; + } + + /** + * Check that this account has received the notice. + * @param string $notice_uri URI for the notice to check for + */ + function assertReceived($notice_uri) + { + $timeout = 5; + $tries = 6; + while ($tries) { + $ok = $this->checkReceived($notice_uri); + if ($ok) { + return true; + } + $tries--; + if ($tries) { + $this->log("Didn't see it yet, waiting $timeout seconds"); + sleep($timeout); + } + } + throw new Exception("Message $notice_uri not received by $this->username"); + } + + /** + * Pull the user's home timeline to check if a notice with the given + * source URL has been received recently. + * If we don't see it, we'll try a couple more times up to 10 seconds. + * + * @param string $notice_uri + */ + function checkReceived($notice_uri) + { + $this->log("Checking if %s on %s received notice %s", + $this->username, + $this->basepath, + $notice_uri); + $params = array(); + $dom = $this->api('statuses/home_timeline', 'atom', $params); + + $xml = simplexml_import_dom($dom); + if (!$xml->entry) { + return false; + } + if (is_array($xml->entry)) { + $entries = $xml->entry; + } else { + $entries = array($xml->entry); + } + foreach ($entries as $entry) { + if ($entry->id == $notice_uri) { + $this->log("found it $notice_uri"); + return true; + } + //$this->log("nope... " . $entry->id); + } + return false; + } + + /** + * Check that this account is subscribed to the given profile. + * @param string $profile_uri URI for the profile to check for + */ + function assertHasSubscription($profile_uri) + { + throw new Exception('tbi'); + } + + /** + * Check that this account is subscribed to by the given profile. + * @param string $profile_uri URI for the profile to check for + */ + function assertHasSubscriber($profile_uri) + { + throw new Exception('tbi'); + } + +} + +$args = array_slice($_SERVER['argv'], 1); +if (count($args) < 2) { + print << + url1: base URL of a StatusNet instance + url2: base URL of another StatusNet instance + +This will register user accounts on the two given StatusNet instances +and run some tests to confirm that OStatus subscription and posting +between the two sites works correctly. + +END_HELP; +exit(1); +} + +$a = $args[0]; +$b = $args[1]; + +$tester = new OStatusTester($a, $b); +$tester->run(); + -- cgit v1.2.3-54-g00ecf From b8e97ac7098783f0380c7f8f61c20a100e814dc0 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 22 Mar 2010 18:53:09 -0700 Subject: Some initial media parsing - Activity now returns a list of activity objects - Processing of photo objects --- lib/activity.php | 24 +-- lib/activityobject.php | 20 +++ plugins/OStatus/actions/groupsalmon.php | 3 +- plugins/OStatus/actions/usersalmon.php | 5 +- plugins/OStatus/classes/Ostatus_profile.php | 2 +- scripts/importtwitteratom.php | 2 +- tests/ActivityParseTests.php | 233 ++++++++++++++++++++++++++-- tests/UserFeedParseTest.php | 8 +- 8 files changed, 266 insertions(+), 31 deletions(-) diff --git a/lib/activity.php b/lib/activity.php index bd1d5d56c..f9192c6b8 100644 --- a/lib/activity.php +++ b/lib/activity.php @@ -53,6 +53,7 @@ class Activity { const SPEC = 'http://activitystrea.ms/spec/1.0/'; const SCHEMA = 'http://activitystrea.ms/schema/1.0/'; + const MEDIA = 'http://purl.org/syndication/atommedia'; const VERB = 'verb'; const OBJECT = 'object'; @@ -85,7 +86,7 @@ class Activity public $actor; // an ActivityObject public $verb; // a string (the URL) - public $object; // an ActivityObject + public $objects = array(); // an array of ActivityObjects public $target; // an ActivityObject public $context; // an ActivityObject public $time; // Time of the activity @@ -161,12 +162,15 @@ class Activity // XXX: do other implied stuff here } - $objectEl = $this->_child($entry, self::OBJECT); + $objectEls = $entry->getElementsByTagNameNS(self::SPEC, self::OBJECT); - if (!empty($objectEl)) { - $this->object = new ActivityObject($objectEl); + if ($objectEls->length > 0) { + for ($i = 0; $i < $objectEls->length; $i++) { + $objectEl = $objectEls->item($i); + $this->objects[] = new ActivityObject($objectEl); + } } else { - $this->object = new ActivityObject($entry); + $this->objects[] = new ActivityObject($entry); } $actorEl = $this->_child($entry, self::ACTOR); @@ -280,8 +284,8 @@ class Activity } } - $this->object = new ActivityObject($item); - $this->context = new ActivityContext($item); + $this->objects[] = new ActivityObject($item); + $this->context = new ActivityContext($item); } /** @@ -339,8 +343,10 @@ class Activity $xs->element('activity:verb', null, $this->verb); - if ($this->object) { - $xs->raw($this->object->asString()); + if (!empty($this->objects)) { + foreach($this->objects as $object) { + $xs->raw($object->asString()); + } } if ($this->target) { diff --git a/lib/activityobject.php b/lib/activityobject.php index 0a358ccab..34d1b9170 100644 --- a/lib/activityobject.php +++ b/lib/activityobject.php @@ -100,6 +100,13 @@ class ActivityObject public $poco; public $displayName; + // @todo move this stuff to it's own PHOTO activity object + const MEDIA_DESCRIPTION = 'description'; + + public $thumbnail; + public $largerImage; + public $description; + /** * Constructor * @@ -150,6 +157,19 @@ class ActivityObject $this->poco = new PoCo($element); } + + if ($this->type == self::PHOTO) { + + $this->thumbnail = ActivityUtils::getLink($element, 'preview'); + $this->largerImage = ActivityUtils::getLink($element, 'enclosure'); + + $this->description = ActivityUtils::childContent( + $element, + ActivityObject::MEDIA_DESCRIPTION, + Activity::MEDIA + ); + + } } private function _fromAuthor($element) diff --git a/plugins/OStatus/actions/groupsalmon.php b/plugins/OStatus/actions/groupsalmon.php index 29377b5fa..d60725a71 100644 --- a/plugins/OStatus/actions/groupsalmon.php +++ b/plugins/OStatus/actions/groupsalmon.php @@ -60,7 +60,8 @@ class GroupsalmonAction extends SalmonAction function handlePost() { - switch ($this->act->object->type) { + // @fixme process all objects? + switch ($this->act->objects[0]->type) { case ActivityObject::ARTICLE: case ActivityObject::BLOGENTRY: case ActivityObject::NOTE: diff --git a/plugins/OStatus/actions/usersalmon.php b/plugins/OStatus/actions/usersalmon.php index 15e8c1869..ecdcfa193 100644 --- a/plugins/OStatus/actions/usersalmon.php +++ b/plugins/OStatus/actions/usersalmon.php @@ -55,9 +55,10 @@ class UsersalmonAction extends SalmonAction */ function handlePost() { - common_log(LOG_INFO, "Received post of '{$this->act->object->id}' from '{$this->act->actor->id}'"); + common_log(LOG_INFO, "Received post of '{$this->act->objects[0]->id}' from '{$this->act->actor->id}'"); - switch ($this->act->object->type) { + // @fixme: process all activity objects? + switch ($this->act->objects[0]->type) { case ActivityObject::ARTICLE: case ActivityObject::BLOGENTRY: case ActivityObject::NOTE: diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index 0eb5b8b82..df937643b 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -494,7 +494,7 @@ class Ostatus_profile extends Memcached_DataObject // It's not always an ActivityObject::NOTE, but... let's just say it is. - $note = $activity->object; + $note = $activity->objects[0]; // The id URI will be used as a unique identifier for for the notice, // protecting against duplicate saves. It isn't required to be a URL; diff --git a/scripts/importtwitteratom.php b/scripts/importtwitteratom.php index 7316f2108..c12e3b91a 100644 --- a/scripts/importtwitteratom.php +++ b/scripts/importtwitteratom.php @@ -102,7 +102,7 @@ function importActivityStream($user, $doc) for ($i = $entries->length - 1; $i >= 0; $i--) { $entry = $entries->item($i); $activity = new Activity($entry, $feed); - $object = $activity->object; + $object = $activity->objects[0]; if (!have_option('q', 'quiet')) { print $activity->content . "\n"; } diff --git a/tests/ActivityParseTests.php b/tests/ActivityParseTests.php index 02d2ed734..fec8829eb 100644 --- a/tests/ActivityParseTests.php +++ b/tests/ActivityParseTests.php @@ -25,11 +25,11 @@ class ActivityParseTests extends PHPUnit_Framework_TestCase $this->assertEquals($act->time, 1243860840); $this->assertEquals($act->verb, ActivityVerb::POST); - $this->assertFalse(empty($act->object)); - $this->assertEquals($act->object->title, 'Punctuation Changeset'); - $this->assertEquals($act->object->type, 'http://versioncentral.example.org/activity/changeset'); - $this->assertEquals($act->object->summary, 'Fixing punctuation because it makes it more readable.'); - $this->assertEquals($act->object->id, 'tag:versioncentral.example.org,2009:/change/1643245'); + $this->assertFalse(empty($act->objects[0])); + $this->assertEquals($act->objects[0]->title, 'Punctuation Changeset'); + $this->assertEquals($act->objects[0]->type, 'http://versioncentral.example.org/activity/changeset'); + $this->assertEquals($act->objects[0]->summary, 'Fixing punctuation because it makes it more readable.'); + $this->assertEquals($act->objects[0]->id, 'tag:versioncentral.example.org,2009:/change/1643245'); } public function testExample3() @@ -56,12 +56,12 @@ class ActivityParseTests extends PHPUnit_Framework_TestCase $this->assertEquals($act->actor->title, 'John Doe'); $this->assertEquals($act->actor->id, 'mailto:johndoe@example.com'); - $this->assertFalse(empty($act->object)); - $this->assertEquals($act->object->type, ActivityObject::NOTE); - $this->assertEquals($act->object->id, 'urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a'); - $this->assertEquals($act->object->title, 'Atom-Powered Robots Run Amok'); - $this->assertEquals($act->object->summary, 'Some text.'); - $this->assertEquals($act->object->link, 'http://example.org/2003/12/13/atom03.html'); + $this->assertFalse(empty($act->objects[0])); + $this->assertEquals($act->objects[0]->type, ActivityObject::NOTE); + $this->assertEquals($act->objects[0]->id, 'urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a'); + $this->assertEquals($act->objects[0]->title, 'Atom-Powered Robots Run Amok'); + $this->assertEquals($act->objects[0]->summary, 'Some text.'); + $this->assertEquals($act->objects[0]->link, 'http://example.org/2003/12/13/atom03.html'); $this->assertFalse(empty($act->context)); @@ -90,8 +90,8 @@ class ActivityParseTests extends PHPUnit_Framework_TestCase $this->assertEquals('http://example.net/conversation/11', $act->context->conversation); $this->assertEquals(array('http://example.net/user/1'), $act->context->attention); - $this->assertFalse(empty($act->object)); - $this->assertEquals($act->object->content, + $this->assertFalse(empty($act->objects[0])); + $this->assertEquals($act->objects[0]->content, '@evan now is the time for all good men to come to the aid of their country. #'); $this->assertFalse(empty($act->actor)); @@ -215,6 +215,96 @@ class ActivityParseTests extends PHPUnit_Framework_TestCase $this->assertNull($actor->poco->address); $this->assertEquals(0, count($actor->poco->urls)); } + + // Media test - cliqset + public function testExample8() + { + global $_example8; + $dom = DOMDocument::loadXML($_example8); + + $feed = $dom->documentElement; + + $entries = $feed->getElementsByTagName('entry'); + + $entry = $entries->item(0); + + $act = new Activity($entry, $feed); + + $this->assertFalse(empty($act)); + $this->assertEquals($act->time, 1269221753); + $this->assertEquals($act->verb, ActivityVerb::POST); + $this->assertEquals($act->summary, 'zcopley posted 5 photos on Flickr'); + + $this->assertFalse(empty($act->objects)); + $this->assertEquals(sizeof($act->objects), 5); + + $this->assertEquals($act->objects[0]->type, ActivityObject::PHOTO); + $this->assertEquals($act->objects[0]->title, 'IMG_1368'); + $this->assertNull($act->objects[0]->description); + $this->assertEquals( + $act->objects[0]->thumbnail, + 'http://media.cliqset.com/6f6fbee9d7dfbffc73b6ef626275eb5f_thumb.jpg' + ); + $this->assertEquals( + $act->objects[0]->link, + 'http://www.flickr.com/photos/zcopley/4452933806/' + ); + + $this->assertEquals($act->objects[1]->type, ActivityObject::PHOTO); + $this->assertEquals($act->objects[1]->title, 'IMG_1365'); + $this->assertNull($act->objects[1]->description); + $this->assertEquals( + $act->objects[1]->thumbnail, + 'http://media.cliqset.com/b8f3932cd0bba1b27f7c8b3ef986915e_thumb.jpg' + ); + $this->assertEquals( + $act->objects[1]->link, + 'http://www.flickr.com/photos/zcopley/4442630390/' + ); + + $this->assertEquals($act->objects[2]->type, ActivityObject::PHOTO); + $this->assertEquals($act->objects[2]->title, 'Classic'); + $this->assertEquals( + $act->objects[2]->description, + '-Powered by pikchur.com/n0u' + ); + $this->assertEquals( + $act->objects[2]->thumbnail, + 'http://media.cliqset.com/fc54c15f850b7a9a8efa644087a48c91_thumb.jpg' + ); + $this->assertEquals( + $act->objects[2]->link, + 'http://www.flickr.com/photos/zcopley/4430754103/' + ); + + $this->assertEquals($act->objects[3]->type, ActivityObject::PHOTO); + $this->assertEquals($act->objects[3]->title, 'IMG_1363'); + $this->assertNull($act->objects[3]->description); + + $this->assertEquals( + $act->objects[3]->thumbnail, + 'http://media.cliqset.com/4b1d307c9217e2114391a8b229d612cb_thumb.jpg' + ); + $this->assertEquals( + $act->objects[3]->link, + 'http://www.flickr.com/photos/zcopley/4416969717/' + ); + + $this->assertEquals($act->objects[4]->type, ActivityObject::PHOTO); + $this->assertEquals($act->objects[4]->title, 'IMG_1361'); + $this->assertNull($act->objects[4]->description); + + $this->assertEquals( + $act->objects[4]->thumbnail, + 'http://media.cliqset.com/23d9b4b96b286e0347d36052f22f6e60_thumb.jpg' + ); + $this->assertEquals( + $act->objects[4]->link, + 'http://www.flickr.com/photos/zcopley/4417734232/' + ); + + } + } $_example1 = << EXAMPLE7; + +$_example8 = << + + + Activity Stream for: zcopley + http://cliqset.com/feed/atom?uid=zcopley + + 0 + http://activitystrea.ms/schema/1.0/post + 2010-03-22T01:35:53.000Z + + flickr + http://flickr.com + http://cliqset-services.s3.amazonaws.com/flickr.png + + + http://activitystrea.ms/schema/1.0/photo + IMG_1368 + + + + + http://activitystrea.ms/schema/1.0/photo + IMG_1365 + + + + + http://activitystrea.ms/schema/1.0/photo + Classic + + + -Powered by pikchur.com/n0u + + + http://activitystrea.ms/schema/1.0/photo + IMG_1363 + + + + + http://activitystrea.ms/schema/1.0/photo + IMG_1361 + + + + zcopley posted some photos on Flickr + zcopley posted 5 photos on Flickr + + 2010-03-22T20:46:42.778Z + tag:cliqset.com,2010-03-22:/user/zcopley/SVgAZubGhtAnSAee + + + zcopley + http://cliqset.com/user/zcopley + + + http://activitystrea.ms/schema/1.0/person + zcopley + + Zach + Copley + + + + + + + +EXAMPLE8; + +$_example9 = << + + + + Google Buzz + 2010-03-22T01:55:53.596Z + tag:google.com,2009:buzz-feed/public/posted/117848251937215158042 + Google - Google Buzz + + Buzz by Zach Copley from Flickr + IMG_1366 + 2010-03-18T04:29:23.000Z + 2010-03-18T05:14:03.325Z + tag:google.com,2009:buzz/z12zwdhxowq2d13q204cjr04kzu0cns5gh0 + + + Zach Copley + http://www.google.com/profiles/zcopley + + <div>IMG_1366</div> + + + IMG_1366 + + + + + IMG_1365 + + + http://activitystrea.ms/schema/1.0/post + + http://activitystrea.ms/schema/1.0/photo + tag:google.com,2009:buzz/z12zwdhxowq2d13q204cjr04kzu0cns5gh0 + Buzz by Zach Copley from Flickr + <div>IMG_1366</div> + + + + + 0 + + +EXAMPLE9; diff --git a/tests/UserFeedParseTest.php b/tests/UserFeedParseTest.php index b3f9a6417..208e71be6 100644 --- a/tests/UserFeedParseTest.php +++ b/tests/UserFeedParseTest.php @@ -66,11 +66,11 @@ class UserFeedParseTests extends PHPUnit_Framework_TestCase // test the post //var_export($act1); - $this->assertEquals($act1->object->type, 'http://activitystrea.ms/schema/1.0/note'); - $this->assertEquals($act1->object->title, 'And now for something completely insane...'); + $this->assertEquals($act1->objects[0]->type, 'http://activitystrea.ms/schema/1.0/note'); + $this->assertEquals($act1->objects[0]->title, 'And now for something completely insane...'); - $this->assertEquals($act1->object->content, 'And now for something completely insane...'); - $this->assertEquals($act1->object->id, 'http://localhost/statusnet/notice/3'); + $this->assertEquals($act1->objects[0]->content, 'And now for something completely insane...'); + $this->assertEquals($act1->objects[0]->id, 'http://localhost/statusnet/notice/3'); } -- cgit v1.2.3-54-g00ecf From 5b0b6097e0e47c84c2e47c8a14421a58be1fac19 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Mon, 22 Mar 2010 21:48:21 -0700 Subject: Fix reference. Look at the first ActivityObject in the list. --- plugins/OStatus/classes/Ostatus_profile.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index df937643b..c7e3b0509 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -442,7 +442,8 @@ class Ostatus_profile extends Memcached_DataObject { $activity = new Activity($entry, $feed); - switch ($activity->object->type) { + // @todo process all activity objects + switch ($activity->objects[0]->type) { case ActivityObject::ARTICLE: case ActivityObject::BLOGENTRY: case ActivityObject::NOTE: -- cgit v1.2.3-54-g00ecf From fcdbf421ab2bbbe4d1b601a8c80d4612c91f62fe Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 23 Mar 2010 11:36:02 -0400 Subject: reformat OpenIDPlugin for PHPCS --- plugins/OpenID/OpenIDPlugin.php | 228 +++++++++++++++++++++++++++++++--------- 1 file changed, 179 insertions(+), 49 deletions(-) diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index 6b35ec3e1..1724b5f7b 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -59,6 +59,8 @@ class OpenIDPlugin extends Plugin * * Hook for RouterInitialized event. * + * @param Net_URL_Mapper $m URL mapper + * * @return boolean hook return */ @@ -67,54 +69,87 @@ class OpenIDPlugin extends Plugin $m->connect('main/openid', array('action' => 'openidlogin')); $m->connect('main/openidtrust', array('action' => 'openidtrust')); $m->connect('settings/openid', array('action' => 'openidsettings')); - $m->connect('index.php?action=finishopenidlogin', array('action' => 'finishopenidlogin')); - $m->connect('index.php?action=finishaddopenid', array('action' => 'finishaddopenid')); + $m->connect('index.php?action=finishopenidlogin', + array('action' => 'finishopenidlogin')); + $m->connect('index.php?action=finishaddopenid', + array('action' => 'finishaddopenid')); $m->connect('main/openidserver', array('action' => 'openidserver')); return true; } + /** + * Public XRDS output hook + * + * Puts the bits of code needed by some OpenID providers to show + * we're good citizens. + * + * @param Action $action Action being executed + * @param XMLOutputter &$xrdsOutputter Output channel + * + * @return boolean hook return + */ + function onEndPublicXRDS($action, &$xrdsOutputter) { $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', - 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', - 'version' => '2.0')); + 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', + 'version' => '2.0')); $xrdsOutputter->element('Type', null, 'xri://$xrds*simple'); //consumer foreach (array('finishopenidlogin', 'finishaddopenid') as $finish) { $xrdsOutputter->showXrdsService(Auth_OpenID_RP_RETURN_TO_URL_TYPE, - common_local_url($finish)); + common_local_url($finish)); } //provider $xrdsOutputter->showXrdsService('http://specs.openid.net/auth/2.0/server', - common_local_url('openidserver'), - null, - null, - 'http://specs.openid.net/auth/2.0/identifier_select'); + common_local_url('openidserver'), + null, + null, + 'http://specs.openid.net/auth/2.0/identifier_select'); $xrdsOutputter->elementEnd('XRD'); } + /** + * User XRDS output hook + * + * Puts the bits of code needed to discover OpenID endpoints. + * + * @param Action $action Action being executed + * @param XMLOutputter &$xrdsOutputter Output channel + * + * @return boolean hook return + */ + function onEndUserXRDS($action, &$xrdsOutputter) { $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', - 'xml:id' => 'openid', - 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', - 'version' => '2.0')); + 'xml:id' => 'openid', + 'xmlns:simple' => 'http://xrds-simple.net/core/1.0', + 'version' => '2.0')); $xrdsOutputter->element('Type', null, 'xri://$xrds*simple'); //consumer $xrdsOutputter->showXrdsService('http://specs.openid.net/auth/2.0/return_to', - common_local_url('finishopenidlogin')); + common_local_url('finishopenidlogin')); //provider $xrdsOutputter->showXrdsService('http://specs.openid.net/auth/2.0/signon', - common_local_url('openidserver'), - null, - null, - common_profile_url($action->user->nickname)); + common_local_url('openidserver'), + null, + null, + common_profile_url($action->user->nickname)); $xrdsOutputter->elementEnd('XRD'); } + /** + * Menu item for login + * + * @param Action &$action Action being executed + * + * @return boolean hook return + */ + function onEndLoginGroupNav(&$action) { $action_name = $action->trimmed('action'); @@ -127,6 +162,14 @@ class OpenIDPlugin extends Plugin return true; } + /** + * Menu item for OpenID admin + * + * @param Action &$action Action being executed + * + * @return boolean hook return + */ + function onEndAccountSettingsNav(&$action) { $action_name = $action->trimmed('action'); @@ -139,68 +182,102 @@ class OpenIDPlugin extends Plugin return true; } + /** + * Autoloader + * + * Loads our classes if they're requested. + * + * @param string $cls Class requested + * + * @return boolean hook return + */ + function onAutoload($cls) { switch ($cls) { - case 'OpenidloginAction': - case 'FinishopenidloginAction': - case 'FinishaddopenidAction': - case 'XrdsAction': - case 'PublicxrdsAction': - case 'OpenidsettingsAction': - case 'OpenidserverAction': - case 'OpenidtrustAction': - require_once(INSTALLDIR.'/plugins/OpenID/' . strtolower(mb_substr($cls, 0, -6)) . '.php'); + case 'OpenidloginAction': + case 'FinishopenidloginAction': + case 'FinishaddopenidAction': + case 'XrdsAction': + case 'PublicxrdsAction': + case 'OpenidsettingsAction': + case 'OpenidserverAction': + case 'OpenidtrustAction': + require_once INSTALLDIR.'/plugins/OpenID/' . strtolower(mb_substr($cls, 0, -6)) . '.php'; return false; - case 'User_openid': - require_once(INSTALLDIR.'/plugins/OpenID/User_openid.php'); + case 'User_openid': + require_once INSTALLDIR.'/plugins/OpenID/User_openid.php'; return false; - case 'User_openid_trustroot': - require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php'); + case 'User_openid_trustroot': + require_once INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php'; return false; - default: + default: return true; } } + /** + * Sensitive actions + * + * These actions should use https when SSL support is 'sometimes' + * + * @param Action $action Action to form an URL for + * @param boolean &$ssl Whether to mark it for SSL + * + * @return boolean hook return + */ + function onSensitiveAction($action, &$ssl) { switch ($action) { - case 'finishopenidlogin': - case 'finishaddopenid': + case 'finishopenidlogin': + case 'finishaddopenid': $ssl = true; return false; - default: + default: return true; } } + /** + * Login actions + * + * These actions should be visible even when the site is marked private + * + * @param Action $action Action to show + * @param boolean &$login Whether it's a login action + * + * @return boolean hook return + */ + function onLoginAction($action, &$login) { switch ($action) { - case 'openidlogin': - case 'finishopenidlogin': - case 'openidserver': + case 'openidlogin': + case 'finishopenidlogin': + case 'openidserver': $login = true; return false; - default: + default: return true; } } /** - * We include a element linking to the publicxrds page, for OpenID + * We include a element linking to the userxrds page, for OpenID * client-side authentication. * + * @param Action $action Action being shown + * * @return void */ function onEndShowHeadElements($action) { - if($action instanceof ShowstreamAction){ + if ($action instanceof ShowstreamAction) { $action->element('link', array('rel' => 'openid2.provider', 'href' => common_local_url('openidserver'))); $action->element('link', array('rel' => 'openid2.local_id', @@ -216,6 +293,9 @@ class OpenIDPlugin extends Plugin /** * Redirect to OpenID login if they have an OpenID * + * @param Action $action Action being executed + * @param User $user User doing the action + * * @return boolean whether to continue */ @@ -228,13 +308,21 @@ class OpenIDPlugin extends Plugin return true; } + /** + * Show some extra instructions for using OpenID + * + * @param Action $action Action being executed + * + * @return boolean hook value + */ + function onEndShowPageNotice($action) { $name = $action->trimmed('action'); switch ($name) { - case 'register': + case 'register': if (common_logged_in()) { $instr = '(Have an [OpenID](http://openid.net/)? ' . '[Add an OpenID to your account](%%action.openidsettings%%)!'; @@ -244,12 +332,12 @@ class OpenIDPlugin extends Plugin '(%%action.openidlogin%%)!)'; } break; - case 'login': + case 'login': $instr = '(Have an [OpenID](http://openid.net/)? ' . 'Try our [OpenID login]'. '(%%action.openidlogin%%)!)'; break; - default: + default: return true; } @@ -258,13 +346,21 @@ class OpenIDPlugin extends Plugin return true; } + /** + * Load our document if requested + * + * @param string &$title Title to fetch + * @param string &$output HTML to output + * + * @return boolean hook value + */ + function onStartLoadDoc(&$title, &$output) { - if ($title == 'openid') - { + if ($title == 'openid') { $filename = INSTALLDIR.'/plugins/OpenID/doc-src/openid'; - $c = file_get_contents($filename); + $c = file_get_contents($filename); $output = common_markup_to_html($c); return false; // success! } @@ -272,10 +368,18 @@ class OpenIDPlugin extends Plugin return true; } + /** + * Add our document to the global menu + * + * @param string $title Title being fetched + * @param string &$output HTML being output + * + * @return boolean hook value + */ + function onEndLoadDoc($title, &$output) { - if ($title == 'help') - { + if ($title == 'help') { $menuitem = '* [OpenID](%%doc.openid%%) - what OpenID is and how to use it with this service'; $output .= common_markup_to_html($menuitem); @@ -284,7 +388,16 @@ class OpenIDPlugin extends Plugin return true; } - function onCheckSchema() { + /** + * Data definitions + * + * Assure that our data objects are available in the DB + * + * @return boolean hook value + */ + + function onCheckSchema() + { $schema = Schema::get(); $schema->ensureTable('user_openid', array(new ColumnDef('canonical', 'varchar', @@ -307,6 +420,15 @@ class OpenIDPlugin extends Plugin return true; } + /** + * Add our tables to be deleted when a user is deleted + * + * @param User $user User being deleted + * @param array &$tables Array of table names + * + * @return boolean hook value + */ + function onUserDeleteRelated($user, &$tables) { $tables[] = 'User_openid'; @@ -314,6 +436,14 @@ class OpenIDPlugin extends Plugin return true; } + /** + * Add our version information to output + * + * @param array &$versions Array of version-data arrays + * + * @return boolean hook value + */ + function onPluginVersion(&$versions) { $versions[] = array('name' => 'OpenID', -- cgit v1.2.3-54-g00ecf From ff60cb4e6692558581f6588524eafbfa903b66a9 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 23 Mar 2010 12:10:26 -0400 Subject: start making OpenID-only mode work --- plugins/OpenID/OpenIDPlugin.php | 98 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 91 insertions(+), 7 deletions(-) diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index 1724b5f7b..24e4e0c32 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -45,13 +45,11 @@ if (!defined('STATUSNET')) { class OpenIDPlugin extends Plugin { - /** - * Initializer for the plugin. - */ + public $openidOnly = false; - function __construct() + function initialize() { - parent::__construct(); + common_debug("OpenID plugin running with openidonly = {$this->openidOnly}"); } /** @@ -142,6 +140,61 @@ class OpenIDPlugin extends Plugin $xrdsOutputter->elementEnd('XRD'); } + function onStartPrimaryNav($action) + { + if ($this->openidOnly && !common_logged_in()) { + // TRANS: Tooltip for main menu option "Login" + $tooltip = _m('TOOLTIP', 'Login to the site'); + // TRANS: Main menu option when not logged in to log in + $action->menuItem(common_local_url('openidlogin'), + _m('MENU', 'Login'), + $tooltip, + false, + 'nav_login'); + // TRANS: Tooltip for main menu option "Help" + $tooltip = _m('TOOLTIP', 'Help me!'); + // TRANS: Main menu option for help on the StatusNet site + $action->menuItem(common_local_url('doc', array('title' => 'help')), + _m('MENU', 'Help'), + $tooltip, + false, + 'nav_help'); + if (!common_config('site', 'private')) { + // TRANS: Tooltip for main menu option "Search" + $tooltip = _m('TOOLTIP', 'Search for people or text'); + // TRANS: Main menu option when logged in or when the StatusNet instance is not private + $action->menuItem(common_local_url('peoplesearch'), + _m('MENU', 'Search'), $tooltip, false, 'nav_search'); + } + Event::handle('EndPrimaryNav', array($action)); + return false; + } + return true; + } + + /** + * Menu for login + * + * If we're in openidOnly mode, we disable the menu for all other login. + * + * @param Action &$action Action being executed + * + * @return boolean hook return + */ + + function onStartLoginGroupNav(&$action) + { + if ($this->openidOnly) { + $this->showOpenIDLoginTab($action); + // Even though we replace this code, we + // DON'T run the End* hook, to keep others from + // adding tabs. Not nice, but. + return false; + } + + return true; + } + /** * Menu item for login * @@ -151,6 +204,21 @@ class OpenIDPlugin extends Plugin */ function onEndLoginGroupNav(&$action) + { + $this->showOpenIDLoginTab($action); + + return true; + } + + /** + * Show menu item for login + * + * @param Action $action Action being executed + * + * @return void + */ + + function showOpenIDLoginTab($action) { $action_name = $action->trimmed('action'); @@ -158,12 +226,28 @@ class OpenIDPlugin extends Plugin _m('OpenID'), _m('Login or register with OpenID'), $action_name === 'openidlogin'); + } + /** + * Show menu item for password + * + * We hide it in openID-only mode + * + * @param Action $menu Widget for menu + * @param void &$unused Unused value + * + * @return void + */ + + function onStartAccountSettingsPasswordMenuItem($menu, &$unused) { + if ($this->openidOnly) { + return false; + } return true; } /** - * Menu item for OpenID admin + * Menu item for OpenID settings * * @param Action &$action Action being executed * @@ -301,7 +385,7 @@ class OpenIDPlugin extends Plugin function onRedirectToLogin($action, $user) { - if (!empty($user) && User_openid::hasOpenID($user->id)) { + if ($this->openidOnly || (!empty($user) && User_openid::hasOpenID($user->id))) { common_redirect(common_local_url('openidlogin'), 303); return false; } -- cgit v1.2.3-54-g00ecf From dd115fcb080bbd06ccefdd091604574945b6ec54 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 23 Mar 2010 12:33:41 -0400 Subject: change router to allow hooking path connections --- lib/router.php | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/lib/router.php b/lib/router.php index a48ee875e..a9d07276f 100644 --- a/lib/router.php +++ b/lib/router.php @@ -33,6 +33,33 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { require_once 'Net/URL/Mapper.php'; +class StatusNet_URL_Mapper extends Net_URL_Mapper { + + private static $_singleton = null; + + private function __construct() + { + } + + public static function getInstance($id = '__default__') + { + if (empty(self::$_singleton)) { + self::$_singleton = new StatusNet_URL_Mapper(); + } + return self::$_singleton; + } + + public function connect($path, $defaults = array(), $rules = array()) + { + $result = null; + if (Event::handle('StartConnectPath', array(&$path, &$defaults, &$rules, &$result))) { + $result = parent::connect($path, $defaults, $rules); + Event::handle('EndConnectPath', array($path, $defaults, $rules, $result)); + } + return $result; + } +} + /** * URL Router * @@ -69,7 +96,7 @@ class Router function initialize() { - $m = Net_URL_Mapper::getInstance(); + $m = StatusNet_URL_Mapper::getInstance(); if (Event::handle('StartInitializeRouter', array(&$m))) { -- cgit v1.2.3-54-g00ecf From 2d79455a1fb7627a23a6ca77fbab060193f6c43a Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 09:50:01 -0700 Subject: Don't add PHPSESSID parameter onto notice and conversation URIs if we save a notice during a session override. This was being triggered by welcomebot messages created at account creation time, then propagated through replies. --- classes/Conversation.php | 3 ++- lib/util.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/classes/Conversation.php b/classes/Conversation.php index ea8bd87b5..f540004ef 100755 --- a/classes/Conversation.php +++ b/classes/Conversation.php @@ -63,7 +63,8 @@ class Conversation extends Memcached_DataObject } $orig = clone($conv); - $orig->uri = common_local_url('conversation', array('id' => $id)); + $orig->uri = common_local_url('conversation', array('id' => $id), + null, null, false); $result = $orig->update($conv); if (empty($result)) { diff --git a/lib/util.php b/lib/util.php index a30d69100..795997868 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1529,7 +1529,8 @@ function common_user_uri(&$user) function common_notice_uri(&$notice) { return common_local_url('shownotice', - array('notice' => $notice->id)); + array('notice' => $notice->id), + null, null, false); } // 36 alphanums - lookalikes (0, O, 1, I) = 32 chars = 5 bits -- cgit v1.2.3-54-g00ecf From 80b16c8499d0cfdb4deb442ba18345befed4e29d Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 09:50:01 -0700 Subject: Don't add PHPSESSID parameter onto notice and conversation URIs if we save a notice during a session override. This was being triggered by welcomebot messages created at account creation time, then propagated through replies. --- classes/Conversation.php | 3 ++- lib/util.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/classes/Conversation.php b/classes/Conversation.php index ea8bd87b5..f540004ef 100755 --- a/classes/Conversation.php +++ b/classes/Conversation.php @@ -63,7 +63,8 @@ class Conversation extends Memcached_DataObject } $orig = clone($conv); - $orig->uri = common_local_url('conversation', array('id' => $id)); + $orig->uri = common_local_url('conversation', array('id' => $id), + null, null, false); $result = $orig->update($conv); if (empty($result)) { diff --git a/lib/util.php b/lib/util.php index 44ccc0def..3d4ed087f 100644 --- a/lib/util.php +++ b/lib/util.php @@ -1521,7 +1521,8 @@ function common_user_uri(&$user) function common_notice_uri(&$notice) { return common_local_url('shownotice', - array('notice' => $notice->id)); + array('notice' => $notice->id), + null, null, false); } // 36 alphanums - lookalikes (0, O, 1, I) = 32 chars = 5 bits -- cgit v1.2.3-54-g00ecf From ad608ab9add1615d6aae3fde239e54d1eb36b0ca Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 23 Mar 2010 12:58:10 -0400 Subject: prevent password login actions in OpenID-only mode --- plugins/OpenID/OpenIDPlugin.php | 67 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 5 deletions(-) diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index 24e4e0c32..270e2c624 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -47,11 +47,6 @@ class OpenIDPlugin extends Plugin { public $openidOnly = false; - function initialize() - { - common_debug("OpenID plugin running with openidonly = {$this->openidOnly}"); - } - /** * Add OpenID-related paths to the router table * @@ -76,6 +71,60 @@ class OpenIDPlugin extends Plugin return true; } + /** + * In OpenID-only mode, disable paths for password stuff + * + * @param string $path path to connect + * @param array $defaults path defaults + * @param array $rules path rules + * @param array $result unused + * + * @return boolean hook return + */ + + function onStartConnectPath(&$path, &$defaults, &$rules, &$result) + { + if ($this->openidOnly) { + static $block = array('main/login', + 'main/register', + 'main/recoverpassword', + 'settings/password'); + + if (in_array($path, $block)) { + return false; + } + } + + return true; + } + + /** + * If we've been hit with password-login args, redirect + * + * @param array $args args (URL, Get, post) + * + * @return boolean hook return + */ + + function onArgsInitialize($args) + { + if ($this->openidOnly) { + if (array_key_exists('action', $args)) { + $action = trim($args['action']); + if (in_array($action, array('login', 'register'))) { + common_redirect(common_local_url('openidlogin')); + exit(0); + } else if ($action == 'passwordsettings') { + common_redirect(common_local_url('openidsettings')); + exit(0); + } else if ($action == 'recoverpassword') { + throw new ClientException('Unavailable action'); + } + } + } + return true; + } + /** * Public XRDS output hook * @@ -140,6 +189,14 @@ class OpenIDPlugin extends Plugin $xrdsOutputter->elementEnd('XRD'); } + /** + * If we're in OpenID-only mode, hide all the main menu except OpenID login. + * + * @param Action $action Action being run + * + * @return boolean hook return + */ + function onStartPrimaryNav($action) { if ($this->openidOnly && !common_logged_in()) { -- cgit v1.2.3-54-g00ecf From 533a3bf6a3180237cfffb8baf29ea3a3f7ec34f8 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 11:06:37 -0700 Subject: Consistently send Profiles into Fave::addNew() --- actions/apifavoritecreate.php | 2 +- classes/Fave.php | 10 +++++++++- lib/command.php | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php index 3618f9401..00b6349b0 100644 --- a/actions/apifavoritecreate.php +++ b/actions/apifavoritecreate.php @@ -123,7 +123,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction return; } - $fave = Fave::addNew($this->user, $this->notice); + $fave = Fave::addNew($this->user->getProfile(), $this->notice); if (empty($fave)) { $this->clientError( diff --git a/classes/Fave.php b/classes/Fave.php index a04f15e9c..7ca9ade7f 100644 --- a/classes/Fave.php +++ b/classes/Fave.php @@ -21,7 +21,15 @@ class Fave extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE - static function addNew($profile, $notice) { + /** + * Save a favorite record. + * @fixme post-author notification should be moved here + * + * @param Profile $profile the local or remote user who likes + * @param Notice $notice the notice that is liked + * @return mixed false on failure, or Fave record on success + */ + static function addNew(Profile $profile, Notice $notice) { $fave = null; diff --git a/lib/command.php b/lib/command.php index f7421269d..216f9e649 100644 --- a/lib/command.php +++ b/lib/command.php @@ -273,7 +273,7 @@ class FavCommand extends Command function handle($channel) { $notice = $this->getNotice($this->other); - $fave = Fave::addNew($this->user, $notice); + $fave = Fave::addNew($this->user->getProfile(), $notice); if (!$fave) { $channel->error($this->user, _('Could not create favorite.')); -- cgit v1.2.3-54-g00ecf From 44caa3a93f452777c795006edb52ef4c5c2c4997 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 11:06:37 -0700 Subject: Consistently send Profiles into Fave::addNew() --- actions/apifavoritecreate.php | 2 +- classes/Fave.php | 10 +++++++++- lib/command.php | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/actions/apifavoritecreate.php b/actions/apifavoritecreate.php index 3618f9401..00b6349b0 100644 --- a/actions/apifavoritecreate.php +++ b/actions/apifavoritecreate.php @@ -123,7 +123,7 @@ class ApiFavoriteCreateAction extends ApiAuthAction return; } - $fave = Fave::addNew($this->user, $this->notice); + $fave = Fave::addNew($this->user->getProfile(), $this->notice); if (empty($fave)) { $this->clientError( diff --git a/classes/Fave.php b/classes/Fave.php index a04f15e9c..7ca9ade7f 100644 --- a/classes/Fave.php +++ b/classes/Fave.php @@ -21,7 +21,15 @@ class Fave extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE - static function addNew($profile, $notice) { + /** + * Save a favorite record. + * @fixme post-author notification should be moved here + * + * @param Profile $profile the local or remote user who likes + * @param Notice $notice the notice that is liked + * @return mixed false on failure, or Fave record on success + */ + static function addNew(Profile $profile, Notice $notice) { $fave = null; diff --git a/lib/command.php b/lib/command.php index 9d550550f..8080fb8bc 100644 --- a/lib/command.php +++ b/lib/command.php @@ -273,7 +273,7 @@ class FavCommand extends Command function handle($channel) { $notice = $this->getNotice($this->other); - $fave = Fave::addNew($this->user, $notice); + $fave = Fave::addNew($this->user->getProfile(), $notice); if (!$fave) { $channel->error($this->user, _('Could not create favorite.')); -- cgit v1.2.3-54-g00ecf From 16fa03212bc6cabe2f47e93d06c0def10d46b353 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 11:25:36 -0700 Subject: Ticket 2188: add a daily average post count to profile statistics sidebar. When we have more detailed history stats, this'd be a good place to link to details/graphs. --- lib/profileaction.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/profileaction.php b/lib/profileaction.php index 029c21845..072c024c7 100644 --- a/lib/profileaction.php +++ b/lib/profileaction.php @@ -169,6 +169,12 @@ class ProfileAction extends OwnerDesignAction $subbed_count = $this->profile->subscriberCount(); $notice_count = $this->profile->noticeCount(); $group_count = $this->user->getGroups()->N; + $age_days = (time() - strtotime($this->profile->created)) / 86400; + if ($age_days < 1) { + // Rather than extrapolating out to a bajillion... + $age_days = 1; + } + $daily_count = round($notice_count / $age_days); $this->elementStart('div', array('id' => 'entity_statistics', 'class' => 'section')); @@ -219,6 +225,12 @@ class ProfileAction extends OwnerDesignAction $this->element('dd', null, $notice_count); $this->elementEnd('dl'); + $this->elementStart('dl', 'entity_daily_notices'); + // TRANS: Average count of posts made per day since account registration + $this->element('dt', null, _('Daily average')); + $this->element('dd', null, $daily_count); + $this->elementEnd('dl'); + $this->elementEnd('div'); } -- cgit v1.2.3-54-g00ecf From 7dc24b4ca7dffda85338d35da3618ec50ce0dbf7 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 13:10:23 -0700 Subject: FOAF was missing OStatus remote subscriptions, now fixed. --- actions/foaf.php | 68 +++++++++++++++++++------------------------------------- 1 file changed, 23 insertions(+), 45 deletions(-) diff --git a/actions/foaf.php b/actions/foaf.php index fc2ec9b12..fc56e19b4 100644 --- a/actions/foaf.php +++ b/actions/foaf.php @@ -162,40 +162,29 @@ class FoafAction extends Action if ($sub->find()) { while ($sub->fetch()) { - if ($sub->token) { - $other = Remote_profile::staticGet('id', $sub->subscriber); - $profile = Profile::staticGet('id', $sub->subscriber); - } else { - $other = User::staticGet('id', $sub->subscriber); - $profile = Profile::staticGet('id', $sub->subscriber); - } - if (!$other) { + $profile = Profile::staticGet('id', $sub->subscriber); + if (empty($profile)) { common_debug('Got a bad subscription: '.print_r($sub,true)); continue; } - if (array_key_exists($other->uri, $person)) { - $person[$other->uri][0] = BOTH; + $user = $profile->getUser(); + $other_uri = $profile->getUri(); + if (array_key_exists($other_uri, $person)) { + $person[$other_uri][0] = BOTH; } else { - $person[$other->uri] = array(LISTENER, - $other->id, - $profile->nickname, - (empty($sub->token)) ? 'User' : 'Remote_profile'); + $person[$other_uri] = array(LISTENER, + $profile->id, + $profile->nickname, + $user ? 'local' : 'remote'); } - $other->free(); - $other = null; - unset($other); - $profile->free(); - $profile = null; unset($profile); } } - $sub->free(); - $sub = null; unset($sub); foreach ($person as $uri => $p) { - list($type, $id, $nickname, $cls) = $p; + list($type, $id, $nickname, $local) = $p; if ($type == BOTH) { $this->element('knows', array('rdf:resource' => $uri)); } @@ -206,8 +195,8 @@ class FoafAction extends Action foreach ($person as $uri => $p) { $foaf_url = null; - list($type, $id, $nickname, $cls) = $p; - if ($cls == 'User') { + list($type, $id, $nickname, $local) = $p; + if ($local == 'local') { $foaf_url = common_local_url('foaf', array('nickname' => $nickname)); } $profile = Profile::staticGet($id); @@ -216,7 +205,7 @@ class FoafAction extends Action $this->element('knows', array('rdf:resource' => $this->user->uri)); } $this->showMicrobloggingAccount($profile, - ($cls == 'User') ? common_root_url() : null, + ($local == 'local') ? common_root_url() : null, $uri, true); if ($foaf_url) { @@ -275,33 +264,22 @@ class FoafAction extends Action if ($sub->find()) { while ($sub->fetch()) { - if (!empty($sub->token)) { - $other = Remote_profile::staticGet('id', $sub->subscribed); - $profile = Profile::staticGet('id', $sub->subscribed); - } else { - $other = User::staticGet('id', $sub->subscribed); - $profile = Profile::staticGet('id', $sub->subscribed); - } - if (empty($other)) { + $profile = Profile::staticGet('id', $sub->subscribed); + if (empty($profile)) { common_debug('Got a bad subscription: '.print_r($sub,true)); continue; } - $this->element('sioc:follows', array('rdf:resource' => $other->uri.'#acct')); - $person[$other->uri] = array(LISTENEE, - $other->id, - $profile->nickname, - (empty($sub->token)) ? 'User' : 'Remote_profile'); - $other->free(); - $other = null; - unset($other); - $profile->free(); - $profile = null; + $user = $profile->getUser(); + $other_uri = $profile->getUri(); + $this->element('sioc:follows', array('rdf:resource' => $other_uri.'#acct')); + $person[$other_uri] = array(LISTENEE, + $profile->id, + $profile->nickname, + $user ? 'local' : 'remote'); unset($profile); } } - $sub->free(); - $sub = null; unset($sub); } -- cgit v1.2.3-54-g00ecf From 80ed39132890a78c9bade22c43b25781fe7c12c8 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Tue, 23 Mar 2010 21:15:20 +0100 Subject: Localisation updates for !StatusNet from !translatewiki.net !sntrans Signed-off-by: Siebrand Mazeland --- locale/ar/LC_MESSAGES/statusnet.po | 111 +++++++++------- locale/arz/LC_MESSAGES/statusnet.po | 111 +++++++++------- locale/bg/LC_MESSAGES/statusnet.po | 111 +++++++++------- locale/br/LC_MESSAGES/statusnet.po | 147 ++++++++++++---------- locale/ca/LC_MESSAGES/statusnet.po | 110 +++++++++------- locale/cs/LC_MESSAGES/statusnet.po | 110 +++++++++------- locale/de/LC_MESSAGES/statusnet.po | 113 +++++++++-------- locale/el/LC_MESSAGES/statusnet.po | 109 +++++++++------- locale/en_GB/LC_MESSAGES/statusnet.po | 111 +++++++++------- locale/es/LC_MESSAGES/statusnet.po | 110 +++++++++------- locale/fa/LC_MESSAGES/statusnet.po | 110 +++++++++------- locale/fi/LC_MESSAGES/statusnet.po | 110 +++++++++------- locale/fr/LC_MESSAGES/statusnet.po | 113 +++++++++-------- locale/ga/LC_MESSAGES/statusnet.po | 110 +++++++++------- locale/he/LC_MESSAGES/statusnet.po | 110 +++++++++------- locale/hsb/LC_MESSAGES/statusnet.po | 110 +++++++++------- locale/ia/LC_MESSAGES/statusnet.po | 111 +++++++++------- locale/is/LC_MESSAGES/statusnet.po | 110 +++++++++------- locale/it/LC_MESSAGES/statusnet.po | 111 +++++++++------- locale/ja/LC_MESSAGES/statusnet.po | 111 +++++++++------- locale/ko/LC_MESSAGES/statusnet.po | 110 +++++++++------- locale/mk/LC_MESSAGES/statusnet.po | 113 +++++++++-------- locale/nb/LC_MESSAGES/statusnet.po | 110 +++++++++------- locale/nl/LC_MESSAGES/statusnet.po | 113 +++++++++-------- locale/nn/LC_MESSAGES/statusnet.po | 110 +++++++++------- locale/pl/LC_MESSAGES/statusnet.po | 113 +++++++++-------- locale/pt/LC_MESSAGES/statusnet.po | 111 +++++++++------- locale/pt_BR/LC_MESSAGES/statusnet.po | 229 ++++++++++++++++------------------ locale/ru/LC_MESSAGES/statusnet.po | 113 +++++++++-------- locale/statusnet.po | 105 +++++++++------- locale/sv/LC_MESSAGES/statusnet.po | 113 +++++++++-------- locale/te/LC_MESSAGES/statusnet.po | 111 +++++++++------- locale/tr/LC_MESSAGES/statusnet.po | 110 +++++++++------- locale/uk/LC_MESSAGES/statusnet.po | 114 +++++++++-------- locale/vi/LC_MESSAGES/statusnet.po | 110 +++++++++------- locale/zh_CN/LC_MESSAGES/statusnet.po | 110 +++++++++------- locale/zh_TW/LC_MESSAGES/statusnet.po | 109 +++++++++------- 37 files changed, 2378 insertions(+), 1875 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 16ea19752..e4142e9b1 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:39:53+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:08+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -751,23 +751,28 @@ msgstr "ارفع" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "لا ملف شخصي مُحدّد." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "رُفع الأفتار." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "فشل تحديث الأفتار." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "حُذف الأفتار." @@ -902,7 +907,7 @@ msgid "Conversation" msgstr "محادثة" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "الإشعارات" @@ -1700,7 +1705,7 @@ msgstr "مسار %s الزمني" msgid "Updates from members of %1$s on %2$s!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "مجموعات" @@ -3240,7 +3245,7 @@ msgid "Description" msgstr "الوصف" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "إحصاءات" @@ -3402,7 +3407,7 @@ msgid "Members" msgstr "الأعضاء" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(لا شيء)" @@ -3574,7 +3579,8 @@ msgid "Unknown language \"%s\"." msgstr "لغة غير معروفة \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "حد النص الأدنى هو 140 حرفًا." #: actions/siteadminpanel.php:171 @@ -3838,8 +3844,7 @@ msgstr "اذف إعدادت الموقع" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "تعذّر حفظ الاشتراك." @@ -4378,36 +4383,36 @@ msgstr "مشكلة أثناء حفظ الإشعار." msgid "RT @%1$s %2$s" msgstr "آر تي @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "مُشترك أصلا!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "لقد منعك المستخدم." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "غير مشترك!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "لم يمكن حذف اشتراك ذاتي." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "تعذّر حذف الاشتراك." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "تعذّر حذف الاشتراك." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "أهلا بكم في %1$s يا @%2$s!" @@ -4694,22 +4699,22 @@ msgstr "بعد" msgid "Before" msgstr "قبل" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5227,19 +5232,19 @@ msgstr "" "tracks - لم يطبق بعد.\n" "tracking - لم يطبق بعد.\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "" -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "اذهب إلى المُثبّت." @@ -5413,40 +5418,40 @@ msgstr "وسوم في إشعارات المجموعة %s" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "" -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "نوع ملف غير معروف" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "ميجابايت" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "كيلوبايت" @@ -5911,7 +5916,7 @@ msgstr "وسوم في إشعارات %s" msgid "Unknown" msgstr "غير معروفة" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "الاشتراكات" @@ -5919,7 +5924,7 @@ msgstr "الاشتراكات" msgid "All subscriptions" msgstr "جميع الاشتراكات" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "المشتركون" @@ -5927,15 +5932,20 @@ msgstr "المشتركون" msgid "All subscribers" msgstr "جميع المشتركين" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "هوية المستخدم" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "عضو منذ" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "كل المجموعات" @@ -6106,6 +6116,11 @@ msgstr "ألغِ الاشتراك مع هذا المستخدم" msgid "Unsubscribe" msgstr "ألغِ الاشتراك" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "ليس للمستخدم ملف شخصي." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "عدّل الأفتار" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 1426c4d04..77e246f82 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:39:57+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:11+0000\n" "Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -757,23 +757,28 @@ msgstr "ارفع" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "لا ملف شخصى مُحدّد." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "رُفع الأفتار." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "فشل تحديث الأفتار." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "حُذف الأفتار." @@ -908,7 +913,7 @@ msgid "Conversation" msgstr "محادثة" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "الإشعارات" @@ -1712,7 +1717,7 @@ msgstr "مسار %s الزمني" msgid "Updates from members of %1$s on %2$s!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "مجموعات" @@ -3250,7 +3255,7 @@ msgid "Description" msgstr "الوصف" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "إحصاءات" @@ -3412,7 +3417,7 @@ msgid "Members" msgstr "الأعضاء" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(لا شيء)" @@ -3572,7 +3577,8 @@ msgid "Unknown language \"%s\"." msgstr "لغه مش معروفه \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "حد النص الأدنى هو 140 حرفًا." #: actions/siteadminpanel.php:171 @@ -3841,8 +3847,7 @@ msgstr "اذف إعدادت الموقع" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "تعذّر حفظ الاشتراك." @@ -4382,36 +4387,36 @@ msgstr "مشكله أثناء حفظ الإشعار." msgid "RT @%1$s %2$s" msgstr "آر تى @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "مُشترك أصلا!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "لقد منعك المستخدم." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "غير مشترك!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "ما نفعش يمسح الاشتراك الشخصى." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "تعذّر حذف الاشتراك." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "تعذّر حذف الاشتراك." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "أهلا بكم فى %1$s يا @%2$s!" @@ -4714,22 +4719,22 @@ msgstr "بعد" msgid "Before" msgstr "قبل" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5215,19 +5220,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "" -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "اذهب إلى المُثبّت." @@ -5401,40 +5406,40 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "" -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "نوع ملف غير معروف" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "ميجابايت" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "كيلوبايت" @@ -5878,7 +5883,7 @@ msgstr "" msgid "Unknown" msgstr "مش معروف" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "الاشتراكات" @@ -5886,7 +5891,7 @@ msgstr "الاشتراكات" msgid "All subscriptions" msgstr "جميع الاشتراكات" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "المشتركون" @@ -5894,15 +5899,20 @@ msgstr "المشتركون" msgid "All subscribers" msgstr "جميع المشتركين" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "هويه المستخدم" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "عضو منذ" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "كل المجموعات" @@ -6073,6 +6083,11 @@ msgstr "ألغِ الاشتراك مع هذا المستخدم" msgid "Unsubscribe" msgstr "ألغِ الاشتراك" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "ليس للمستخدم ملف شخصى." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "عدّل الأفتار" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index 83acdaab6..c1f83849a 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:00+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:15+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -766,23 +766,28 @@ msgstr "Качване" msgid "Crop" msgstr "Изрязване" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Не е указан профил." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Изберете квадратна област от изображението за аватар" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Аватарът е обновен." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Неуспешно обновяване на аватара." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Аватарът е изтрит." @@ -919,7 +924,7 @@ msgid "Conversation" msgstr "Разговор" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Бележки" @@ -1762,7 +1767,7 @@ msgstr "Поток на %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Бележки от %1$s в %2$s." -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Групи" @@ -3399,7 +3404,7 @@ msgid "Description" msgstr "Описание" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Статистики" @@ -3558,7 +3563,7 @@ msgid "Members" msgstr "Членове" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3719,7 +3724,8 @@ msgid "Unknown language \"%s\"." msgstr "Непознат език \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Минималното ограничение на текста е 140 знака." #: actions/siteadminpanel.php:171 @@ -3998,8 +4004,7 @@ msgstr "Запазване настройките на сайта" msgid "You are not subscribed to that profile." msgstr "Не сте абонирани за този профил" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "Грешка при създаване на нов абонамент." @@ -4572,39 +4577,39 @@ msgstr "Проблем при записване на бележката." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 #, fuzzy msgid "You have been banned from subscribing." msgstr "Потребителят е забранил да се абонирате за него." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Потребителят ви е блокирал." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Не сте абонирани!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Грешка при изтриване на абонамента." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Грешка при изтриване на абонамента." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Грешка при изтриване на абонамента." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добре дошли в %1$s, @%2$s!" @@ -4911,22 +4916,22 @@ msgstr "След" msgid "Before" msgstr "Преди" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5415,19 +5420,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Не е открит файл с настройки. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 #, fuzzy msgid "Go to the installer." msgstr "Влизане в сайта" @@ -5607,41 +5612,41 @@ msgstr "Етикети в бележките към групата %s" msgid "This page is not available in a media type you accept" msgstr "Страницата не е достъпна във вида медия, който приемате" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Форматът на файла с изображението не се поддържа." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Може да качите лого за групата ви." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Частично качване на файла." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Системна грешка при качване на файл." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Файлът не е изображение или е повреден." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "Няма такава бележка." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Неподдържан вид файл" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6100,7 +6105,7 @@ msgstr "Етикети в бележките на %s" msgid "Unknown" msgstr "Непознато действие" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Абонаменти" @@ -6108,7 +6113,7 @@ msgstr "Абонаменти" msgid "All subscriptions" msgstr "Всички абонаменти" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Абонати" @@ -6116,16 +6121,21 @@ msgstr "Абонати" msgid "All subscribers" msgstr "Всички абонати" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 #, fuzzy msgid "User ID" msgstr "Потребител" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Участник от" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Всички групи" @@ -6303,6 +6313,11 @@ msgstr "Отписване от този потребител" msgid "Unsubscribe" msgstr "Отписване" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Потребителят няма профил." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Редактиране на аватара" diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po index 6e241f553..8316ecc15 100644 --- a/locale/br/LC_MESSAGES/statusnet.po +++ b/locale/br/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:14+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:18+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: br\n" "X-Message-Group: out-statusnet\n" @@ -750,23 +750,28 @@ msgstr "Enporzhiañ" msgid "Crop" msgstr "Adframmañ" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "N'eo bet resisaet profil ebet" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Kollet eo bet roadennoù." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Hizivaet eo bet an avatar." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Ur gudenn 'zo bet e-pad hizivadenn an avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Dilammet eo bet an Avatar." @@ -902,7 +907,7 @@ msgid "Conversation" msgstr "Kaozeadenn" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Ali" @@ -1697,7 +1702,7 @@ msgstr "Oberezhioù %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Hizivadenn izili %1$s e %2$s !" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Strolladoù" @@ -3238,7 +3243,7 @@ msgid "Description" msgstr "" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Stadegoù" @@ -3395,7 +3400,7 @@ msgid "Members" msgstr "Izili" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(hini ebet)" @@ -3555,7 +3560,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -3607,9 +3612,8 @@ msgid "Default timezone for the site; usually UTC." msgstr "" #: actions/siteadminpanel.php:262 -#, fuzzy msgid "Default language" -msgstr "Yezh d'ober ganti da gentañ" +msgstr "Yezh dre ziouer" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" @@ -3663,9 +3667,8 @@ msgid "Site-wide notice text (255 chars max; HTML okay)" msgstr "" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Dilemel un ali" +msgstr "Enrollañ ali ul lec'hienn" #: actions/smssettings.php:58 msgid "SMS settings" @@ -3822,8 +3825,7 @@ msgstr "Enrollañ an arventennoù moned" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "" @@ -4359,36 +4361,36 @@ msgstr "" msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Diposubl eo dilemel ar postel kadarnadur." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "" -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4667,22 +4669,22 @@ msgstr "War-lerc'h" msgid "Before" msgstr "Kent" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -4757,9 +4759,8 @@ msgstr "" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:396 -#, fuzzy msgid "Edit site notice" -msgstr "Eilañ an ali" +msgstr "Kemmañ ali al lec'hienn" #. TRANS: Menu item title/tooltip #: lib/adminpanelaction.php:404 @@ -4818,7 +4819,7 @@ msgstr "Merdeer" #: lib/applicationeditform.php:274 msgid "Desktop" -msgstr "" +msgstr "Burev" #: lib/applicationeditform.php:275 msgid "Type of application, browser or desktop" @@ -4826,11 +4827,11 @@ msgstr "" #: lib/applicationeditform.php:297 msgid "Read-only" -msgstr "" +msgstr "Lenn hepken" #: lib/applicationeditform.php:315 msgid "Read-write" -msgstr "" +msgstr "Lenn-skrivañ" #: lib/applicationeditform.php:316 msgid "Default access for this application: read-only, or read-write" @@ -4842,7 +4843,7 @@ msgstr "" #: lib/attachmentlist.php:87 msgid "Attachments" -msgstr "" +msgstr "Pezhioù stag" #: lib/attachmentlist.php:263 msgid "Author" @@ -4909,7 +4910,7 @@ msgstr "" #: lib/command.php:228 #, php-format msgid "Nudge sent to %s" -msgstr "" +msgstr "Blinkadenn kaset da %s" #: lib/command.php:254 #, php-format @@ -4955,12 +4956,12 @@ msgstr "Anv klok : %s" #: lib/command.php:404 lib/mail.php:258 #, php-format msgid "Location: %s" -msgstr "" +msgstr "Lec'hiadur : %s" #: lib/command.php:407 lib/mail.php:260 #, php-format msgid "Homepage: %s" -msgstr "" +msgstr "Lec'hienn Web : %s" #: lib/command.php:410 #, php-format @@ -5013,7 +5014,7 @@ msgstr "" #: lib/command.php:545 #, php-format msgid "Reply to %s sent" -msgstr "" +msgstr "Respont kaset da %s" #: lib/command.php:547 msgid "Error saving notice." @@ -5150,19 +5151,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "" -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5336,40 +5337,40 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "" -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "Mo" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "Ko" @@ -5665,7 +5666,7 @@ msgstr "" #: lib/messageform.php:178 lib/noticeform.php:236 msgctxt "Send button for sending notice" msgid "Send" -msgstr "" +msgstr "Kas" #: lib/noticeform.php:160 msgid "Send a notice" @@ -5729,7 +5730,7 @@ msgstr "" #: lib/noticelist.php:604 msgid "Repeated by" -msgstr "" +msgstr "Adkemeret gant" #: lib/noticelist.php:631 msgid "Reply to this notice" @@ -5812,7 +5813,7 @@ msgstr "" msgid "Unknown" msgstr "Dianav" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Koumanantoù" @@ -5820,7 +5821,7 @@ msgstr "Koumanantoù" msgid "All subscriptions" msgstr "" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Ar re koumanantet" @@ -5828,15 +5829,20 @@ msgstr "Ar re koumanantet" msgid "All subscribers" msgstr "An holl re koumanantet" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ID an implijer" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Ezel abaoe" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "An holl strolladoù" @@ -6007,6 +6013,11 @@ msgstr "" msgid "Unsubscribe" msgstr "" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "An implijer-mañ n'eus profil ebet dezhañ." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Kemmañ an Avatar" @@ -6045,16 +6056,14 @@ msgid "User role" msgstr "Strolladoù implijerien" #: lib/userprofile.php:366 -#, fuzzy msgctxt "role" msgid "Administrator" -msgstr "Merourien" +msgstr "Merour" #: lib/userprofile.php:367 -#, fuzzy msgctxt "role" msgid "Moderator" -msgstr "Habaskaat" +msgstr "Habasker" #: lib/util.php:1046 msgid "a few seconds ago" @@ -6103,7 +6112,7 @@ msgstr "bloaz zo well-wazh" #: lib/webcolor.php:82 #, php-format msgid "%s is not a valid color!" -msgstr "" +msgstr "n'eo ket %s ul liv reizh !" #: lib/webcolor.php:123 #, php-format diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index 3ed2516c9..aaaa9f557 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:17+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:21+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -784,25 +784,30 @@ msgstr "Puja" msgid "Crop" msgstr "Retalla" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "No s'ha especificat perfil." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" "Selecciona un quadrat de l'àrea de la imatge que vols que sigui el teu " "avatar." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "S'ha perdut el nostre fitxer de dades." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar actualitzat." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Error en actualitzar avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "S'ha suprimit l'avatar." @@ -939,7 +944,7 @@ msgid "Conversation" msgstr "Conversa" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Avisos" @@ -1781,7 +1786,7 @@ msgstr "%s línia temporal" msgid "Updates from members of %1$s on %2$s!" msgstr "Actualitzacions dels membres de %1$s el %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grups" @@ -3450,7 +3455,7 @@ msgid "Description" msgstr "Descripció" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Estadístiques" @@ -3609,7 +3614,7 @@ msgid "Members" msgstr "Membres" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Cap)" @@ -3777,7 +3782,7 @@ msgid "Unknown language \"%s\"." msgstr "Llengua desconeguda «%s»" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4059,8 +4064,7 @@ msgstr "Desa els paràmetres del lloc" msgid "You are not subscribed to that profile." msgstr "No estàs subscrit a aquest perfil." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "No s'ha pogut guardar la subscripció." @@ -4637,38 +4641,38 @@ msgstr "Problema en guardar l'avís." msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Se us ha banejat la subscripció." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Ja hi esteu subscrit!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Un usuari t'ha bloquejat." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "No estàs subscrit!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "No s'ha pogut eliminar la subscripció." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "No s'ha pogut eliminar la subscripció." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "No s'ha pogut eliminar la subscripció." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Us donem la benvinguda a %1$s, @%2$s!" @@ -4972,22 +4976,22 @@ msgstr "Posteriors" msgid "Before" msgstr "Anteriors" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5476,19 +5480,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "No s'ha trobat cap fitxer de configuració. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 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:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Vés a l'instal·lador." @@ -5664,40 +5668,40 @@ msgstr "Etiquetes en les notificacions del grup %s" msgid "This page is not available in a media type you accept" msgstr "Aquesta pàgina no està disponible en un tipus de mèdia que acceptis." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Format d'imatge no suportat." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Pots pujar una imatge de logo per al grup." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Càrrega parcial." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Error del sistema en pujar el fitxer." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "No és una imatge o és un fitxer corrupte." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Hem perdut el nostre arxiu." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Tipus de fitxer desconegut" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6164,7 +6168,7 @@ msgstr "Etiquetes en les notificacions de %s's" msgid "Unknown" msgstr "Acció desconeguda" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscripcions" @@ -6172,7 +6176,7 @@ msgstr "Subscripcions" msgid "All subscriptions" msgstr "Totes les subscripcions" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Subscriptors" @@ -6180,15 +6184,20 @@ msgstr "Subscriptors" msgid "All subscribers" msgstr "Tots els subscriptors" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ID de l'usuari" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Membre des de" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Tots els grups" @@ -6364,6 +6373,11 @@ msgstr "Deixar d'estar subscrit des d'aquest usuari" msgid "Unsubscribe" msgstr "Cancel·lar subscripció" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "L'usuari no té perfil." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Edita l'avatar" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 4790caf6c..d9669c2d6 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:20+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:24+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -782,23 +782,28 @@ msgstr "Upload" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Částečné náhrání." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Obrázek nahrán" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Nahrávání obrázku selhalo." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar smazán." @@ -941,7 +946,7 @@ msgid "Conversation" msgstr "Umístění" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Sdělení" @@ -1788,7 +1793,7 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "Mikroblog od %s" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Skupiny" @@ -3403,7 +3408,7 @@ msgid "Description" msgstr "Odběry" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistiky" @@ -3562,7 +3567,7 @@ msgid "Members" msgstr "Členem od" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3725,7 +3730,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4000,8 +4005,7 @@ msgstr "Nastavení" msgid "You are not subscribed to that profile." msgstr "Neodeslal jste nám profil" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "Nelze vytvořit odebírat" @@ -4576,39 +4580,39 @@ msgstr "Problém při ukládání sdělení" msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 #, fuzzy msgid "User has blocked you." msgstr "Uživatel nemá profil." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Nepřihlášen!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Nelze smazat odebírání" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Nelze smazat odebírání" -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Nelze smazat odebírání" -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4916,22 +4920,22 @@ msgstr "« Novější" msgid "Before" msgstr "Starší »" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5426,20 +5430,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Žádný potvrzující kód." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5621,41 +5625,41 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "Tato stránka není k dispozici v typu média která přijímáte." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Nepodporovaný formát obrázku." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Částečné náhrání." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Chyba systému při nahrávání souboru" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Není obrázkem, nebo jde o poškozený soubor." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "Žádné takové oznámení." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6119,7 +6123,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Odběry" @@ -6127,7 +6131,7 @@ msgstr "Odběry" msgid "All subscriptions" msgstr "Všechny odběry" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Odběratelé" @@ -6135,15 +6139,20 @@ msgstr "Odběratelé" msgid "All subscribers" msgstr "Všichni odběratelé" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Členem od" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "" @@ -6325,6 +6334,11 @@ msgstr "" msgid "Unsubscribe" msgstr "Odhlásit" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Uživatel nemá profil." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Upravit avatar" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 014c75565..60835cf96 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -15,12 +15,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:23+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:27+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -781,24 +781,29 @@ msgstr "Hochladen" msgid "Crop" msgstr "Zuschneiden" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Kein Profil angegeben." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" "Wähle eine quadratische Fläche aus dem Bild, um dein Avatar zu speichern" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Daten verloren." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar aktualisiert." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Aktualisierung des Avatars fehlgeschlagen." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar gelöscht." @@ -936,7 +941,7 @@ msgid "Conversation" msgstr "Unterhaltung" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Nachrichten" @@ -1763,7 +1768,7 @@ msgstr "%s Zeitleiste" msgid "Updates from members of %1$s on %2$s!" msgstr "Aktualisierungen von %1$s auf %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Gruppen" @@ -3439,7 +3444,7 @@ msgid "Description" msgstr "Beschreibung" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistiken" @@ -3601,7 +3606,7 @@ msgid "Members" msgstr "Mitglieder" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Kein)" @@ -3773,7 +3778,8 @@ msgid "Unknown language \"%s\"." msgstr "Unbekannte Sprache „%s“" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Minimale Textlänge ist 140 Zeichen." #: actions/siteadminpanel.php:171 @@ -4050,8 +4056,7 @@ msgstr "Site-Einstellungen speichern" msgid "You are not subscribed to that profile." msgstr "Du hast dieses Profil nicht abonniert." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Konnte Abonnement nicht erstellen." @@ -4628,36 +4633,36 @@ msgstr "Problem bei Speichern der Nachricht." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Bereits abonniert!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Dieser Benutzer hat dich blockiert." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Nicht abonniert!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Konnte Abonnement nicht löschen." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Konnte OMB-Abonnement nicht löschen." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Konnte Abonnement nicht löschen." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Herzlich willkommen bei %1$s, @%2$s!" @@ -4945,22 +4950,22 @@ msgstr "Später" msgid "Before" msgstr "Vorher" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Fremdinhalt kann noch nicht eingebunden werden." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Kann eingebundenen XML Inhalt nicht verarbeiten." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Eingebundener Base64 Inhalt kann noch nicht verarbeitet werden." -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5470,19 +5475,19 @@ msgstr "" "tracks - not yet implemented.\n" "tracking - not yet implemented.\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Keine Konfigurationsdatei gefunden." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Ich habe an folgenden Stellen nach Konfigurationsdateien gesucht: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Bitte die Installation erneut starten um das Problem zu beheben." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Zur Installation gehen." @@ -5661,40 +5666,40 @@ msgstr "Stichworte in den Nachrichten der Gruppe %s" msgid "This page is not available in a media type you accept" msgstr "Dies Seite liegt in keinem von dir akzeptierten Mediatype vor." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Bildformat wird nicht unterstützt." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Du kannst ein Logo für Deine Gruppe hochladen." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Unvollständiges Hochladen." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Systemfehler beim hochladen der Datei." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Kein Bild oder defekte Datei." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Daten verloren." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Unbekannter Dateityp" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6216,7 +6221,7 @@ msgstr "Stichworte in %ss Nachrichten" msgid "Unknown" msgstr "Unbekannter Befehl" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonnements" @@ -6224,7 +6229,7 @@ msgstr "Abonnements" msgid "All subscriptions" msgstr "Alle Abonnements" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abonnenten" @@ -6232,15 +6237,20 @@ msgstr "Abonnenten" msgid "All subscribers" msgstr "Alle Abonnenten" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "Nutzer ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Mitglied seit" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Alle Gruppen" @@ -6412,6 +6422,11 @@ msgstr "Lösche dein Abonnement von diesem Benutzer" msgid "Unsubscribe" msgstr "Abbestellen" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Benutzer hat kein Profil." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Avatar bearbeiten" @@ -6422,7 +6437,7 @@ msgstr "Benutzeraktionen" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Löschung des Nutzers in Arbeit..." #: lib/userprofile.php:263 msgid "Edit profile settings" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index d2552a088..b001bc7af 100644 --- a/locale/el/LC_MESSAGES/statusnet.po +++ b/locale/el/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:26+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:30+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -767,23 +767,27 @@ msgstr "" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "Ρυθμίσεις OpenID" @@ -923,7 +927,7 @@ msgid "Conversation" msgstr "Συζήτηση" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "" @@ -1759,7 +1763,7 @@ msgstr "χρονοδιάγραμμα του χρήστη %s" msgid "Updates from members of %1$s on %2$s!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "" @@ -3358,7 +3362,7 @@ msgid "Description" msgstr "Περιγραφή" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "" @@ -3517,7 +3521,7 @@ msgid "Members" msgstr "Μέλη" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3678,7 +3682,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -3951,8 +3955,7 @@ msgstr "Ρυθμίσεις OpenID" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" @@ -4502,38 +4505,38 @@ msgstr "" msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Απέτυχε η συνδρομή." -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Απέτυχε η διαγραφή συνδρομής." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Απέτυχε η διαγραφή συνδρομής." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Απέτυχε η διαγραφή συνδρομής." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4830,22 +4833,22 @@ msgstr "" msgid "Before" msgstr "" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5326,20 +5329,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Ο κωδικός επιβεβαίωσης δεν βρέθηκε." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5515,41 +5518,41 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -5999,7 +6002,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "" @@ -6007,7 +6010,7 @@ msgstr "" msgid "All subscriptions" msgstr "Όλες οι συνδρομές" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "" @@ -6015,15 +6018,20 @@ msgstr "" msgid "All subscribers" msgstr "" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Μέλος από" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "" @@ -6200,6 +6208,11 @@ msgstr "" msgid "Unsubscribe" msgstr "" +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "" + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 361270cbb..d1f9ea3f3 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:29+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:33+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -768,23 +768,28 @@ msgstr "Upload" msgid "Crop" msgstr "Crop" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "No profile specified." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Pick a square area of the image to be your avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Lost our file data." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar updated." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Failed updating avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar deleted." @@ -922,7 +927,7 @@ msgid "Conversation" msgstr "Conversation" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Notices" @@ -1744,7 +1749,7 @@ msgstr "%s timeline" msgid "Updates from members of %1$s on %2$s!" msgstr "Updates from members of %1$s on %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Groups" @@ -3372,7 +3377,7 @@ msgid "Description" msgstr "Description" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistics" @@ -3536,7 +3541,7 @@ msgid "Members" msgstr "Members" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(None)" @@ -3710,7 +3715,8 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Minimum text limit is 140 characters." #: actions/siteadminpanel.php:171 @@ -3986,8 +3992,7 @@ msgstr "Save site settings" msgid "You are not subscribed to that profile." msgstr "You are not subscribed to that profile." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Could not save subscription." @@ -4552,37 +4557,37 @@ msgstr "Problem saving group inbox." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "You have been banned from subscribing." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "User has blocked you." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Not subscribed!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Couldn't delete self-subscription." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Couldn't delete subscription." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Couldn't delete subscription." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Welcome to %1$s, @%2$s!" @@ -4883,22 +4888,22 @@ msgstr "After" msgid "Before" msgstr "Before" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5367,19 +5372,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "No configuration file found" -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Go to the installer." @@ -5555,40 +5560,40 @@ msgstr "Tags in %s group's notices" msgid "This page is not available in a media type you accept" msgstr "This page is not available in a media type you accept" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Unsupported image file format." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "That file is too big. The maximum file size is %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Partial upload." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "System error uploading file." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Not an image or corrupt file." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Lost our file." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Unknown file type" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6049,7 +6054,7 @@ msgstr "Tags in %s's notices" msgid "Unknown" msgstr "Unknown" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscriptions" @@ -6057,7 +6062,7 @@ msgstr "Subscriptions" msgid "All subscriptions" msgstr "All subscriptions" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Subscribers" @@ -6065,15 +6070,20 @@ msgstr "Subscribers" msgid "All subscribers" msgstr "All subscribers" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "User ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Member since" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "All groups" @@ -6244,6 +6254,11 @@ msgstr "Unsubscribe from this user" msgid "Unsubscribe" msgstr "Unsubscribe" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "User has no profile." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Edit Avatar" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index 9b21560f9..e3d3ac2e6 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -13,12 +13,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:32+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:37+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -775,23 +775,28 @@ msgstr "Cargar" msgid "Crop" msgstr "Cortar" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "No se especificó perfil." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Elige un área cuadrada de la imagen para que sea tu avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Se perdió nuestros datos de archivo." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar actualizado" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Error al actualizar avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar borrado." @@ -930,7 +935,7 @@ msgid "Conversation" msgstr "Conversación" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Avisos" @@ -1757,7 +1762,7 @@ msgstr "línea temporal de %s" msgid "Updates from members of %1$s on %2$s!" msgstr "¡Actualizaciones de miembros de %1$s en %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupos" @@ -3413,7 +3418,7 @@ msgid "Description" msgstr "Descripción" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Estadísticas" @@ -3571,7 +3576,7 @@ msgid "Members" msgstr "Miembros" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ninguno)" @@ -3739,7 +3744,7 @@ msgid "Unknown language \"%s\"." msgstr "Idioma desconocido \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4018,8 +4023,7 @@ msgstr "Guardar la configuración del sitio" msgid "You are not subscribed to that profile." msgstr "No te has suscrito a ese perfil." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "No se ha podido guardar la suscripción." @@ -4588,38 +4592,38 @@ msgstr "Hubo un problema al guardar el aviso." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Se te ha prohibido la suscripción." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "El usuario te ha bloqueado." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "¡No estás suscrito!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "No se pudo eliminar la suscripción." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "No se pudo eliminar la suscripción." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "No se pudo eliminar la suscripción." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Bienvenido a %1$s, @%2$s!" @@ -4925,22 +4929,22 @@ msgstr "Después" msgid "Before" msgstr "Antes" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5423,19 +5427,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Ningún archivo de configuración encontrado. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Ir al instalador." @@ -5615,40 +5619,40 @@ msgstr "Tags en avisos del grupo %s" msgid "This page is not available in a media type you accept" msgstr "Esta página no está disponible en el tipo de medio que aceptas." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Formato de imagen no soportado." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Puedes cargar una imagen de logo para tu grupo." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Carga parcial." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Error del sistema al cargar el archivo." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "No es una imagen o es un fichero corrupto." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Se perdió nuestro archivo." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Tipo de archivo desconocido" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6116,7 +6120,7 @@ msgstr "Tags en avisos de %s" msgid "Unknown" msgstr "Acción desconocida" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Suscripciones" @@ -6124,7 +6128,7 @@ msgstr "Suscripciones" msgid "All subscriptions" msgstr "Todas las suscripciones" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Suscriptores" @@ -6133,15 +6137,20 @@ msgstr "Suscriptores" msgid "All subscribers" msgstr "Todos los suscriptores" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ID de usuario" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Miembro desde" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Todos los grupos" @@ -6322,6 +6331,11 @@ msgstr "Desuscribirse de este usuario" msgid "Unsubscribe" msgstr "Cancelar suscripción" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "El usuario no tiene un perfil." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "editar avatar" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 7d948015a..23fa734de 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:38+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:43+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.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); Translate extension (2010-01-16)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #. TRANS: Page title @@ -770,23 +770,28 @@ msgstr "پایین‌گذاری" msgid "Crop" msgstr "برش" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "کاربری مشخص نشده است." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "یک مربع از عکس خود را انتخاب کنید تا چهره‌ی شما باشد." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "فایل اطلاعات خود را گم کرده ایم." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "چهره به روز رسانی شد." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "به روز رسانی چهره موفقیت آمیر نبود." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "چهره پاک شد." @@ -926,7 +931,7 @@ msgid "Conversation" msgstr "مکالمه" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "پیام‌ها" @@ -1759,7 +1764,7 @@ msgstr "خط زمانی %s" msgid "Updates from members of %1$s on %2$s!" msgstr "به روز رسانی کابران %1$s در %2$s" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "گروه‌ها" @@ -3359,7 +3364,7 @@ msgid "Description" msgstr "" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "آمار" @@ -3518,7 +3523,7 @@ msgid "Members" msgstr "اعضا" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "هیچ" @@ -3683,7 +3688,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -3958,8 +3963,7 @@ msgstr "تنظیمات چهره" msgid "You are not subscribed to that profile." msgstr "شما به این پروفيل متعهد نشدید" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "" @@ -4507,36 +4511,36 @@ msgstr "مشکل در ذخیره کردن آگهی." msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "قبلا تایید شده !" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "تایید نشده!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "" -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "خوش امدید به %1$s , @%2$s!" @@ -4833,22 +4837,22 @@ msgstr "بعد از" msgid "Before" msgstr "قبل از" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5329,19 +5333,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "" -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "شما ممکن است بخواهید نصاب را اجرا کنید تا این را تعمیر کند." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "برو به نصاب." @@ -5516,41 +5520,41 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "فرمت(فایل) عکس پشتیبانی نشده." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" "است . این فایل بسیار یزرگ است %s بیشترین مقدار قابل قبول برای اندازه ی فایل." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "خطای سیستم ارسال فایل." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "تصویر یا فایل خرابی نیست" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "فایلمان گم شده" -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "نوع فایل پشتیبانی نشده" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "مگابایت" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "کیلوبایت" @@ -6004,7 +6008,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "اشتراک‌ها" @@ -6012,7 +6016,7 @@ msgstr "اشتراک‌ها" msgid "All subscriptions" msgstr "تمام اشتراک‌ها" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "مشترک‌ها" @@ -6020,15 +6024,20 @@ msgstr "مشترک‌ها" msgid "All subscribers" msgstr "تمام مشترک‌ها" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "شناسه کاربر" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "عضو شده از" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "تمام گروه‌ها" @@ -6200,6 +6209,11 @@ msgstr "" msgid "Unsubscribe" msgstr "" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "کاربر هیچ شناس‌نامه‌ای ندارد." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "ویرایش اواتور" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 7892ef932..035d69816 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:35+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:40+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -787,23 +787,28 @@ msgstr "Lataa" msgid "Crop" msgstr "Rajaa" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Profiilia ei ole määritelty." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Valitse neliön muotoinen alue kuvasta profiilikuvaksi" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Tiedoston data hävisi." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Kuva päivitetty." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Profiilikuvan päivittäminen epäonnistui." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Kuva poistettu." @@ -941,7 +946,7 @@ msgid "Conversation" msgstr "Keskustelu" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Päivitykset" @@ -1791,7 +1796,7 @@ msgstr "%s aikajana" msgid "Updates from members of %1$s on %2$s!" msgstr "Ryhmän %1$s käyttäjien päivitykset palvelussa %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Ryhmät" @@ -3485,7 +3490,7 @@ msgid "Description" msgstr "Kuvaus" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Tilastot" @@ -3643,7 +3648,7 @@ msgid "Members" msgstr "Jäsenet" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Tyhjä)" @@ -3814,7 +3819,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4096,8 +4101,7 @@ msgstr "Profiilikuva-asetukset" 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 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Tilausta ei onnistuttu tallentamaan." @@ -4678,39 +4682,39 @@ msgstr "Ongelma päivityksen tallentamisessa." msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 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 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Käyttäjä on asettanut eston sinulle." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Ei ole tilattu!." -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Ei voitu poistaa tilausta." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Ei voitu poistaa tilausta." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Ei voitu poistaa tilausta." -#: classes/User.php:378 +#: classes/User.php:363 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Viesti käyttäjälle %1$s, %2$s" @@ -5016,22 +5020,22 @@ msgstr "Myöhemmin" msgid "Before" msgstr "Aiemmin" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 #, fuzzy @@ -5527,20 +5531,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Varmistuskoodia ei ole annettu." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 #, fuzzy msgid "Go to the installer." msgstr "Kirjaudu sisään palveluun" @@ -5723,40 +5727,40 @@ msgstr "Tagit ryhmän %s päivityksissä" msgid "This page is not available in a media type you accept" msgstr "Tämä sivu ei ole saatavilla sinulle sopivassa mediatyypissä." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Kuvatiedoston formaattia ei ole tuettu." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Voit ladata ryhmälle logon." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Osittain ladattu palvelimelle." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Tiedoston lähetyksessä tapahtui järjestelmävirhe." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Tuo ei ole kelvollinen kuva tai tiedosto on rikkoutunut." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Tiedosto hävisi." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Tunnistamaton tiedoston tyyppi" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6230,7 +6234,7 @@ msgstr "Tagit käyttäjän %s päivityksissä" msgid "Unknown" msgstr "Tuntematon toiminto" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Tilaukset" @@ -6238,7 +6242,7 @@ msgstr "Tilaukset" msgid "All subscriptions" msgstr "Kaikki tilaukset" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Tilaajat" @@ -6246,16 +6250,21 @@ msgstr "Tilaajat" msgid "All subscribers" msgstr "Kaikki tilaajat" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 #, fuzzy msgid "User ID" msgstr "Käyttäjä" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Käyttäjänä alkaen" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Kaikki ryhmät" @@ -6437,6 +6446,11 @@ msgstr "Peruuta tämän käyttäjän tilaus" msgid "Unsubscribe" msgstr "Peruuta tilaus" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Käyttäjällä ei ole profiilia." + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 70155e450..76d83ea6c 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:41+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:47+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -785,23 +785,28 @@ msgstr "Transfert" msgid "Crop" msgstr "Recadrer" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Aucun profil n’a été spécifié." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Données perdues." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar mis à jour." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "La mise à jour de l’avatar a échoué." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar supprimé." @@ -939,7 +944,7 @@ msgid "Conversation" msgstr "Conversation" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Avis" @@ -1763,7 +1768,7 @@ msgstr "Activité de %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Mises à jour des membres de %1$s dans %2$s !" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Groupes" @@ -3449,7 +3454,7 @@ msgid "Description" msgstr "Description" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistiques" @@ -3616,7 +3621,7 @@ msgid "Members" msgstr "Membres" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(aucun)" @@ -3800,7 +3805,8 @@ msgid "Unknown language \"%s\"." msgstr "Langue « %s » inconnue." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "La limite minimale de texte est de 140 caractères." #: actions/siteadminpanel.php:171 @@ -4077,8 +4083,7 @@ msgstr "Sauvegarder les paramètres des instantanés" msgid "You are not subscribed to that profile." msgstr "Vous n’êtes pas abonné(e) à ce profil." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Impossible d’enregistrer l’abonnement." @@ -4667,35 +4672,35 @@ msgstr "Problème lors de l’enregistrement de la boîte de réception du group msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Il vous avez été interdit de vous abonner." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Déjà abonné !" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Cet utilisateur vous a bloqué." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Pas abonné !" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Impossible de supprimer l’abonnement à soi-même." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Impossible de supprimer le jeton OMB de l'abonnement ." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Impossible de cesser l’abonnement" -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Bienvenue à %1$s, @%2$s !" @@ -4983,22 +4988,22 @@ msgstr "Après" msgid "Before" msgstr "Avant" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "Attendait un élément racine mais a reçu tout un document XML." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Impossible de gérer le contenu distant pour le moment." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Impossible de gérer le contenu XML embarqué pour le moment." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Impossible de gérer le contenu en Base64 embarqué pour le moment." -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5518,20 +5523,20 @@ msgstr "" "tracks - pas encore implémenté.\n" "tracking - pas encore implémenté.\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Aucun fichier de configuration n’a été trouvé. " -#: lib/common.php:137 +#: lib/common.php:136 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:139 +#: lib/common.php:138 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:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Aller au programme d’installation" @@ -5712,40 +5717,40 @@ msgid "This page is not available in a media type you accept" msgstr "" "Cette page n’est pas disponible dans un des formats que vous avez autorisés." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Format de fichier d’image non supporté." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Ce fichier est trop grand. La taille maximale est %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Transfert partiel." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Erreur système lors du transfert du fichier." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Ceci n’est pas une image, ou c’est un fichier corrompu." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Fichier perdu." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Type de fichier inconnu" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "Mo" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "Ko" @@ -6280,7 +6285,7 @@ msgstr "Marques dans les avis de %s" msgid "Unknown" msgstr "Inconnu" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonnements" @@ -6288,7 +6293,7 @@ msgstr "Abonnements" msgid "All subscriptions" msgstr "Tous les abonnements" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abonnés" @@ -6296,15 +6301,20 @@ msgstr "Abonnés" msgid "All subscribers" msgstr "Tous les abonnés" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ID de l’utilisateur" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Membre depuis" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Tous les groupes" @@ -6475,6 +6485,11 @@ msgstr "Ne plus suivre cet utilisateur" msgid "Unsubscribe" msgstr "Désabonnement" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Aucun profil ne correspond à cet utilisateur." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Modifier l’avatar" @@ -6485,7 +6500,7 @@ msgstr "Actions de l’utilisateur" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Suppression de l'utilisateur en cours..." #: lib/userprofile.php:263 msgid "Edit profile settings" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 9d7775580..6e5d0d232 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:44+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:50+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -788,23 +788,28 @@ msgstr "Subir" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Non se especificou ningún perfil." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar actualizado." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Acounteceu un fallo ó actualizar o avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "Avatar actualizado." @@ -952,7 +957,7 @@ msgid "Conversation" msgstr "Código de confirmación." #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Chíos" @@ -1825,7 +1830,7 @@ msgstr "Liña de tempo de %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Actualizacións dende %1$s en %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "" @@ -3521,7 +3526,7 @@ msgid "Description" msgstr "Subscricións" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Estatísticas" @@ -3683,7 +3688,7 @@ msgid "Members" msgstr "Membro dende" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 #, fuzzy msgid "(None)" @@ -3864,7 +3869,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4147,8 +4152,7 @@ msgstr "Configuracións de Twitter" msgid "You are not subscribed to that profile." msgstr "Non estás suscrito a ese perfil" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Non se pode gardar a subscrición." @@ -4734,39 +4738,39 @@ msgstr "Aconteceu un erro ó gardar o chío." msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 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 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "O usuario bloqueoute." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Non está suscrito!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Non se pode eliminar a subscrición." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Non se pode eliminar a subscrición." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Non se pode eliminar a subscrición." -#: classes/User.php:378 +#: classes/User.php:363 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Mensaxe de %1$s en %2$s" @@ -5077,22 +5081,22 @@ msgstr "« Despois" msgid "Before" msgstr "Antes »" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 #, fuzzy @@ -5628,20 +5632,20 @@ msgstr "" "tracks - non implementado por agora.\n" "tracking - non implementado por agora.\n" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Sen código de confirmación." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5826,42 +5830,42 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Formato de ficheiro de imaxe non soportado." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Podes actualizar a túa información do perfil persoal aquí" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Carga parcial." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Aconteceu un erro no sistema namentras se estaba cargando o ficheiro." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Non é unha imaxe ou está corrupta." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "Bloqueo de usuario fallido." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 #, fuzzy msgid "Unknown file type" msgstr "tipo de ficheiro non soportado" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6389,7 +6393,7 @@ msgstr "O usuario non ten último chio." msgid "Unknown" msgstr "Acción descoñecida" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscricións" @@ -6397,7 +6401,7 @@ msgstr "Subscricións" msgid "All subscriptions" msgstr "Tódalas subscricións" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Subscritores" @@ -6406,16 +6410,21 @@ msgstr "Subscritores" msgid "All subscribers" msgstr "Subscritores" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 #, fuzzy msgid "User ID" msgstr "Usuario" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Membro dende" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 #, fuzzy msgid "All groups" msgstr "Tódalas etiquetas" @@ -6604,6 +6613,11 @@ msgstr "Desuscribir de %s" msgid "Unsubscribe" msgstr "Eliminar subscrición" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "O usuario non ten perfil." + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 27c7af90f..f1fd35346 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:47+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:53+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -780,23 +780,28 @@ msgstr "ההעלה" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "העלאה חלקית." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "התמונה עודכנה." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "עדכון התמונה נכשל." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "התמונה עודכנה." @@ -941,7 +946,7 @@ msgid "Conversation" msgstr "מיקום" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "הודעות" @@ -1796,7 +1801,7 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "מיקרובלוג מאת %s" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "קבוצות" @@ -3406,7 +3411,7 @@ msgid "Description" msgstr "הרשמות" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "סטטיסטיקה" @@ -3566,7 +3571,7 @@ msgid "Members" msgstr "חבר מאז" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3728,7 +3733,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4002,8 +4007,7 @@ msgstr "הגדרות" msgid "You are not subscribed to that profile." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "יצירת המנוי נכשלה." @@ -4578,39 +4582,39 @@ msgstr "בעיה בשמירת ההודעה." msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 #, fuzzy msgid "User has blocked you." msgstr "למשתמש אין פרופיל." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "לא מנוי!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "מחיקת המנוי לא הצליחה." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "מחיקת המנוי לא הצליחה." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "מחיקת המנוי לא הצליחה." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4918,22 +4922,22 @@ msgstr "<< אחרי" msgid "Before" msgstr "לפני >>" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5425,20 +5429,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "אין קוד אישור." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5621,41 +5625,41 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "פורמט התמונה אינו נתמך." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "העלאה חלקית." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "שגיאת מערכת בהעלאת הקובץ." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "זהו לא קובץ תמונה, או שחל בו שיבוש." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "אין הודעה כזו." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6119,7 +6123,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "הרשמות" @@ -6127,7 +6131,7 @@ msgstr "הרשמות" msgid "All subscriptions" msgstr "כל המנויים" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "מנויים" @@ -6136,16 +6140,21 @@ msgstr "מנויים" msgid "All subscribers" msgstr "מנויים" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 #, fuzzy msgid "User ID" msgstr "מתשמש" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "חבר מאז" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "" @@ -6328,6 +6337,11 @@ msgstr "" msgid "Unsubscribe" msgstr "בטל מנוי" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "למשתמש אין פרופיל." + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index f61fb0a82..1411d983f 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:50+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:56+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -749,23 +749,28 @@ msgstr "Nahrać" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Žadyn profil podaty." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Awatar zaktualizowany." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Awatar zničeny." @@ -900,7 +905,7 @@ msgid "Conversation" msgstr "Konwersacija" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Zdźělenki" @@ -1698,7 +1703,7 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Skupiny" @@ -3227,7 +3232,7 @@ msgid "Description" msgstr "Wopisanje" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistika" @@ -3384,7 +3389,7 @@ msgid "Members" msgstr "Čłonojo" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Žadyn)" @@ -3543,7 +3548,7 @@ msgid "Unknown language \"%s\"." msgstr "Njeznata rěč \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -3804,8 +3809,7 @@ msgstr "Nastajenja wobrazowkoweho fota składować" msgid "You are not subscribed to that profile." msgstr "Njejsy tón profil abonował." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "" @@ -4341,35 +4345,35 @@ msgstr "" msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Hižo abonowany!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Wužiwar je će zablokował." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Njeje abonowany!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Sebjeabonement njeje so dał zničić." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Znamjo OMB-abonementa njeda so zhašeć." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Abonoment njeje so dał zničić." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4648,22 +4652,22 @@ msgstr "" msgid "Before" msgstr "" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5133,19 +5137,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Žana konfiguraciska dataja namakana. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5319,40 +5323,40 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Dźělne nahraće." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Naša dataja je so zhubiła." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Njeznaty datajowy typ" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "KB" @@ -5795,7 +5799,7 @@ msgstr "" msgid "Unknown" msgstr "Njeznaty" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonementy" @@ -5803,7 +5807,7 @@ msgstr "Abonementy" msgid "All subscriptions" msgstr "Wšě abonementy" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abonenća" @@ -5811,15 +5815,20 @@ msgstr "Abonenća" msgid "All subscribers" msgstr "Wšitcy abonenća" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "Wužiwarski ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Čłon wot" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Wšě skupiny" @@ -5990,6 +5999,11 @@ msgstr "Tutoho wužiwarja wotskazać" msgid "Unsubscribe" msgstr "Wotskazać" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Wužiwar nima profil." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Awatar wobdźěłać" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index b31fc0d2d..c8aa5e616 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:53+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:09:59+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -771,23 +771,28 @@ msgstr "Incargar" msgid "Crop" msgstr "Taliar" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Nulle profilo specificate." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Selige un area quadrate del imagine pro facer lo tu avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Datos del file perdite." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar actualisate." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Actualisation del avatar fallite." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar delite." @@ -925,7 +930,7 @@ msgid "Conversation" msgstr "Conversation" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Notas" @@ -1747,7 +1752,7 @@ msgstr "Chronologia de %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Actualisationes de membros de %1$s in %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Gruppos" @@ -3408,7 +3413,7 @@ msgid "Description" msgstr "Description" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statisticas" @@ -3575,7 +3580,7 @@ msgid "Members" msgstr "Membros" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Nulle)" @@ -3756,7 +3761,8 @@ msgid "Unknown language \"%s\"." msgstr "Lingua \"%s\" incognite." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Le limite minimal del texto es 140 characteres." #: actions/siteadminpanel.php:171 @@ -4029,8 +4035,7 @@ msgstr "Salveguardar configuration de instantaneos" msgid "You are not subscribed to that profile." msgstr "Tu non es subscribite a iste profilo." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Non poteva salveguardar le subscription." @@ -4612,35 +4617,35 @@ msgstr "Problema salveguardar le cassa de entrata del gruppo." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Tu ha essite blocate del subscription." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Ja subscribite!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Le usator te ha blocate." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Non subscribite!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Non poteva deler auto-subscription." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Non poteva deler le indicio OMB del subscription." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Non poteva deler subscription." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Benvenite a %1$s, @%2$s!" @@ -4925,22 +4930,22 @@ msgstr "Post" msgid "Before" msgstr "Ante" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Non pote ancora tractar contento remote." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Non pote ancora tractar contento XML incastrate." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Non pote ancora tractar contento Base64 incastrate." -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5455,19 +5460,19 @@ msgstr "" "tracks - non ancora implementate.\n" "tracking - non ancora implementate.\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Nulle file de configuration trovate. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Io cercava files de configuration in le sequente locos: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Considera executar le installator pro reparar isto." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Ir al installator." @@ -5645,40 +5650,40 @@ msgstr "Etiquettas in le notas del gruppo %s" msgid "This page is not available in a media type you accept" msgstr "Iste pagina non es disponibile in un formato que tu accepta" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Formato de file de imagine non supportate." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Iste file es troppo grande. Le dimension maximal es %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Incargamento partial." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Error de systema durante le incargamento del file." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Le file non es un imagine o es defectuose." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "File perdite." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Typo de file incognite" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "KB" @@ -6213,7 +6218,7 @@ msgstr "Etiquettas in le notas de %s" msgid "Unknown" msgstr "Incognite" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscriptiones" @@ -6221,7 +6226,7 @@ msgstr "Subscriptiones" msgid "All subscriptions" msgstr "Tote le subscriptiones" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Subscriptores" @@ -6229,15 +6234,20 @@ msgstr "Subscriptores" msgid "All subscribers" msgstr "Tote le subscriptores" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ID del usator" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Membro depost" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Tote le gruppos" @@ -6408,6 +6418,11 @@ msgstr "Cancellar subscription a iste usator" msgid "Unsubscribe" msgstr "Cancellar subscription" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Le usator non ha un profilo." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Modificar avatar" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index 595431e9a..ca72d54a3 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:56+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:10+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -777,24 +777,29 @@ msgstr "Hlaða upp" msgid "Crop" msgstr "Skera af" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Engin persónuleg síða tilgreind" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" "Veldu ferningslaga svæði á upphaflegu myndinni sem einkennismyndina þína" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Týndum skráargögnunum okkar" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Mynd hefur verið uppfærð." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Mistókst að uppfæra mynd" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "" @@ -934,7 +939,7 @@ msgid "Conversation" msgstr "" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Babl" @@ -1778,7 +1783,7 @@ msgstr "Rás %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Færslur frá %1$s á %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Hópar" @@ -3450,7 +3455,7 @@ msgid "Description" msgstr "Lýsing" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Tölfræði" @@ -3608,7 +3613,7 @@ msgid "Members" msgstr "Meðlimir" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ekkert)" @@ -3770,7 +3775,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4050,8 +4055,7 @@ msgstr "Stillingar fyrir mynd" msgid "You are not subscribed to that profile." msgstr "Þú ert ekki áskrifandi." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Gat ekki vistað áskrift." @@ -4627,39 +4631,39 @@ msgstr "Vandamál komu upp við að vista babl." msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 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 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Notandinn hefur lokað á þig." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Ekki í áskrift!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Gat ekki eytt áskrift." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Gat ekki eytt áskrift." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Gat ekki eytt áskrift." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4965,22 +4969,22 @@ msgstr "Eftir" msgid "Before" msgstr "Áður" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 #, fuzzy @@ -5474,20 +5478,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Enginn staðfestingarlykill." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 #, fuzzy msgid "Go to the installer." msgstr "Skrá þig inn á síðuna" @@ -5667,40 +5671,40 @@ msgid "This page is not available in a media type you accept" msgstr "" "Þessi síða er ekki aðgengileg í margmiðlunargerðinni sem þú tekur á móti" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Skráarsnið myndar ekki stutt." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Upphal að hluta til." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Kerfisvilla kom upp við upphal skráar." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Annaðhvort ekki mynd eða þá að skráin er gölluð." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Týndum skránni okkar" -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Óþekkt skráargerð" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6163,7 +6167,7 @@ msgstr "Merki í babli %s" msgid "Unknown" msgstr "Óþekkt aðgerð" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Áskriftir" @@ -6171,7 +6175,7 @@ msgstr "Áskriftir" msgid "All subscriptions" msgstr "Allar áskriftir" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Áskrifendur" @@ -6179,15 +6183,20 @@ msgstr "Áskrifendur" msgid "All subscribers" msgstr "Allir áskrifendur" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Meðlimur síðan" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Allir hópar" @@ -6367,6 +6376,11 @@ msgstr "Hætta sem áskrifandi að þessum notanda" msgid "Unsubscribe" msgstr "Fara úr áskrift" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Notandi hefur enga persónulega síðu." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index d4d6fc3ef..681f60f0a 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:40:59+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:13+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -772,23 +772,28 @@ msgstr "Carica" msgid "Crop" msgstr "Ritaglia" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Nessun profilo specificato." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Scegli un'area quadrata per la tua immagine personale" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Perso il nostro file di dati." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Immagine aggiornata." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Aggiornamento dell'immagine non riuscito." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Immagine eliminata." @@ -926,7 +931,7 @@ msgid "Conversation" msgstr "Conversazione" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Messaggi" @@ -1751,7 +1756,7 @@ msgstr "Attività di %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Messaggi dai membri di %1$s su %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Gruppi" @@ -3408,7 +3413,7 @@ msgid "Description" msgstr "Descrizione" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistiche" @@ -3574,7 +3579,7 @@ msgid "Members" msgstr "Membri" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(nessuno)" @@ -3754,7 +3759,8 @@ msgid "Unknown language \"%s\"." msgstr "Lingua \"%s\" sconosciuta." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Il limite minimo del testo è di 140 caratteri." #: actions/siteadminpanel.php:171 @@ -4026,8 +4032,7 @@ msgstr "Salva impostazioni snapshot" msgid "You are not subscribed to that profile." msgstr "Non hai una abbonamento a quel profilo." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Impossibile salvare l'abbonamento." @@ -4612,35 +4617,35 @@ msgstr "Problema nel salvare la casella della posta del gruppo." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Non ti è possibile abbonarti." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Hai già l'abbonamento!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "L'utente non ti consente di seguirlo." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Non hai l'abbonamento!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Impossibile eliminare l'auto-abbonamento." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Impossibile eliminare il token di abbonamento OMB." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Impossibile eliminare l'abbonamento." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Benvenuti su %1$s, @%2$s!" @@ -4927,22 +4932,22 @@ msgstr "Successivi" msgid "Before" msgstr "Precedenti" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Impossibile gestire contenuti remoti." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Impossibile gestire contenuti XML incorporati." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Impossibile gestire contenuti Base64." -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5458,21 +5463,21 @@ msgstr "" "tracks - non ancora implementato\n" "tracking - non ancora implementato\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Non è stato trovato alcun file di configurazione. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "I file di configurazione sono stati cercati in questi posti: " -#: lib/common.php:139 +#: lib/common.php:138 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:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Vai al programma d'installazione." @@ -5649,40 +5654,40 @@ msgstr "Etichette nei messaggi del gruppo %s" msgid "This page is not available in a media type you accept" msgstr "Questa pagina non è disponibile in un tipo di supporto che tu accetti" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Formato file immagine non supportato." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Quel file è troppo grande. La dimensione massima è %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Caricamento parziale." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Errore di sistema nel caricare il file." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Non è un'immagine o il file è danneggiato." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Perso il nostro file." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Tipo di file sconosciuto" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6216,7 +6221,7 @@ msgstr "Etichette nei messaggi di %s" msgid "Unknown" msgstr "Sconosciuto" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abbonamenti" @@ -6224,7 +6229,7 @@ msgstr "Abbonamenti" msgid "All subscriptions" msgstr "Tutti gli abbonamenti" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abbonati" @@ -6232,15 +6237,20 @@ msgstr "Abbonati" msgid "All subscribers" msgstr "Tutti gli abbonati" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ID utente" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Membro dal" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Tutti i gruppi" @@ -6411,6 +6421,11 @@ msgstr "Annulla l'abbonamento da questo utente" msgid "Unsubscribe" msgstr "Disabbonati" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "L'utente non ha un profilo." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Modifica immagine" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 85b83bfe9..a50da36c4 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:02+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:29+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -766,23 +766,28 @@ msgstr "アップロード" msgid "Crop" msgstr "切り取り" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "プロファイル記述がありません。" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "あなたのアバターとなるイメージを正方形で指定" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "ファイルデータを紛失しました。" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "アバターが更新されました。" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "アバターの更新に失敗しました。" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "アバターが削除されました。" @@ -921,7 +926,7 @@ msgid "Conversation" msgstr "会話" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "つぶやき" @@ -1749,7 +1754,7 @@ msgstr "%s のタイムライン" msgid "Updates from members of %1$s on %2$s!" msgstr "%2$s 上の %1$s のメンバーから更新する" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "グループ" @@ -3404,7 +3409,7 @@ msgid "Description" msgstr "概要" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "統計データ" @@ -3572,7 +3577,7 @@ msgid "Members" msgstr "メンバー" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(なし)" @@ -3753,7 +3758,8 @@ msgid "Unknown language \"%s\"." msgstr "不明な言語 \"%s\"" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "最小のテキスト制限は140字です。" #: actions/siteadminpanel.php:171 @@ -4035,8 +4041,7 @@ msgstr "サイト設定の保存" msgid "You are not subscribed to that profile." msgstr "あなたはそのプロファイルにフォローされていません。" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "フォローを保存できません。" @@ -4612,36 +4617,36 @@ msgstr "グループ受信箱を保存する際に問題が発生しました。 msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "あなたはフォローが禁止されました。" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "すでにフォローしています!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "ユーザはあなたをブロックしました。" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "フォローしていません！" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "自己フォローを削除できません。" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "フォローを削除できません" -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "フォローを削除できません" -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "ようこそ %1$s、@%2$s!" @@ -4944,22 +4949,22 @@ msgstr "<<後" msgid "Before" msgstr "前>>" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5432,21 +5437,21 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "コンフィギュレーションファイルがありません。 " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "私は以下の場所でコンフィギュレーションファイルを探しました: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" "あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ" "ん。" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "インストーラへ。" @@ -5622,40 +5627,40 @@ msgstr "%s グループのつぶやきにあるタグ" msgid "This page is not available in a media type you accept" msgstr "このページはあなたが承認したメディアタイプでは利用できません。" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "サポート外の画像形式です。" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "ファイルが大きすぎます。最大ファイルサイズは %s 。" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "不完全なアップロード。" -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "ファイルのアップロードでシステムエラー" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "画像ではないかファイルが破損しています。" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "ファイルを紛失。" -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "不明なファイルタイプ" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6196,7 +6201,7 @@ msgstr "%s のつぶやきのタグ" msgid "Unknown" msgstr "不明" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "フォロー" @@ -6204,7 +6209,7 @@ msgstr "フォロー" msgid "All subscriptions" msgstr "すべてのフォロー" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "フォローされている" @@ -6212,15 +6217,20 @@ msgstr "フォローされている" msgid "All subscribers" msgstr "すべてのフォローされている" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ユーザＩＤ" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "利用開始日" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "全てのグループ" @@ -6391,6 +6401,11 @@ msgstr "この利用者からのフォローを解除する" msgid "Unsubscribe" msgstr "フォロー解除" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "ユーザはプロフィールをもっていません。" + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "アバターを編集する" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 41533a426..d62e6ac5b 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:05+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:33+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -782,23 +782,28 @@ msgstr "올리기" msgid "Crop" msgstr "자르기" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "프로필을 지정하지 않았습니다." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "당신의 아바타가 될 이미지영역을 지정하세요." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "파일 데이터를 잃어버렸습니다." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "아바타가 업데이트 되었습니다." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "아바타 업데이트 실패" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "아바타가 업데이트 되었습니다." @@ -941,7 +946,7 @@ msgid "Conversation" msgstr "인증 코드" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "통지" @@ -1807,7 +1812,7 @@ msgstr "%s 타임라인" msgid "Updates from members of %1$s on %2$s!" msgstr "%2$s에 있는 %1$s의 업데이트!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "그룹" @@ -3466,7 +3471,7 @@ msgid "Description" msgstr "설명" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "통계" @@ -3624,7 +3629,7 @@ msgid "Members" msgstr "회원" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(없습니다.)" @@ -3793,7 +3798,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4074,8 +4079,7 @@ msgstr "아바타 설정" msgid "You are not subscribed to that profile." msgstr "당신은 이 프로필에 구독되지 않고있습니다." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "구독을 저장할 수 없습니다." @@ -4652,39 +4656,39 @@ msgstr "통지를 저장하는데 문제가 발생했습니다." msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 #, fuzzy msgid "You have been banned from subscribing." msgstr "이 회원은 구독으로부터 당신을 차단해왔다." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "회원이 당신을 차단해왔습니다." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "구독하고 있지 않습니다!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "예약 구독을 삭제 할 수 없습니다." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "예약 구독을 삭제 할 수 없습니다." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "예약 구독을 삭제 할 수 없습니다." -#: classes/User.php:378 +#: classes/User.php:363 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%2$s에서 %1$s까지 메시지" @@ -4990,22 +4994,22 @@ msgstr "뒷 페이지" msgid "Before" msgstr "앞 페이지" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 #, fuzzy @@ -5498,20 +5502,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "확인 코드가 없습니다." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 #, fuzzy msgid "Go to the installer." msgstr "이 사이트 로그인" @@ -5692,40 +5696,40 @@ msgstr "%s 그룹 게시글의 태그" msgid "This page is not available in a media type you accept" msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "지원하지 않는 그림 파일 형식입니다." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "불완전한 업로드." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "파일을 올리는데 시스템 오류 발생" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "그림 파일이 아니거나 손상된 파일 입니다." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "파일을 잃어버렸습니다." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "알 수 없는 종류의 파일입니다" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6187,7 +6191,7 @@ msgstr "%s의 게시글의 태그" msgid "Unknown" msgstr "알려지지 않은 행동" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "구독" @@ -6195,7 +6199,7 @@ msgstr "구독" msgid "All subscriptions" msgstr "모든 예약 구독" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "구독자" @@ -6203,16 +6207,21 @@ msgstr "구독자" msgid "All subscribers" msgstr "모든 구독자" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 #, fuzzy msgid "User ID" msgstr "이용자" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "가입한 때" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "모든 그룹" @@ -6394,6 +6403,11 @@ msgstr "이 사용자로부터 구독취소합니다." msgid "Unsubscribe" msgstr "구독 해제" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "이용자가 프로필을 가지고 있지 않습니다." + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 764a91b15..1be316859 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:08+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:37+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -774,23 +774,28 @@ msgstr "Подигни" msgid "Crop" msgstr "Отсечи" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Нема назначено профил." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Одберете квадратна површина од сликата за аватар" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Податоците за податотеката се изгубени." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Аватарот е подновен." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Подновата на аватарот не успеа." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Аватарот е избришан." @@ -929,7 +934,7 @@ msgid "Conversation" msgstr "Разговор" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Забелешки" @@ -1756,7 +1761,7 @@ msgstr "Историја на %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Подновувања од членови на %1$s на %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Групи" @@ -3423,7 +3428,7 @@ msgid "Description" msgstr "Опис" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Статистики" @@ -3592,7 +3597,7 @@ msgid "Members" msgstr "Членови" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Нема)" @@ -3773,7 +3778,8 @@ msgid "Unknown language \"%s\"." msgstr "Непознат јазик „%s“" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Минималното ограничување на текстот изнесува 140 знаци." #: actions/siteadminpanel.php:171 @@ -4049,8 +4055,7 @@ msgstr "Зачувај поставки за снимки" msgid "You are not subscribed to that profile." msgstr "Не сте претплатени на тој профил." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Не можев да ја зачувам претплатата." @@ -4634,36 +4639,36 @@ msgstr "Проблем при зачувувањето на групното п msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Блокирани сте од претплаќање." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Веќе претплатено!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Корисникот Ве има блокирано." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Не сте претплатени!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Не можам да ја избришам самопретплатата." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Не можете да го избришете OMB-жетонот за претплата." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Претплата не може да се избрише." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добредојдовте на %1$s, @%2$s!" @@ -4951,22 +4956,22 @@ msgstr "По" msgid "Before" msgstr "Пред" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "Се очекува коренски каналски елемент, но добив цел XML документ." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Сè уште не е поддржана обработката на далечинска содржина." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Сè уште не е поддржана обработката на XML содржина." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Сè уште не е достапна обработката на вметната Base64 содржина." -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5478,19 +5483,19 @@ msgstr "" "tracks - сè уште не е имплементирано.\n" "tracking - сè уште не е имплементирано.\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Нема пронајдено конфигурациска податотека. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Побарав конфигурациони податотеки на следниве места: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Препорачуваме да го пуштите инсталатерот за да го поправите ова." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Оди на инсталаторот." @@ -5668,40 +5673,40 @@ msgstr "Ознаки во забелешките на групата %s" msgid "This page is not available in a media type you accept" msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Неподдржан фомрат на слики." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Ова е предолго. Максималната должина е 140 знаци." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Делумно подигање." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Системска грешка при подигањето на податотеката." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Не е слика или податотеката е пореметена." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Податотеката е изгубена." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Непознат тип на податотека" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "МБ" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "кб" @@ -6240,7 +6245,7 @@ msgstr "Ознаки во забелешките на %s" msgid "Unknown" msgstr "Непознато" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Претплати" @@ -6248,7 +6253,7 @@ msgstr "Претплати" msgid "All subscriptions" msgstr "Сите претплати" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Претплатници" @@ -6256,15 +6261,20 @@ msgstr "Претплатници" msgid "All subscribers" msgstr "Сите претплатници" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "Кориснички ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Член од" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Сите групи" @@ -6435,6 +6445,11 @@ msgstr "Откажи претплата од овој корсиник" msgid "Unsubscribe" msgstr "Откажи ја претплатата" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Корисникот нема профил." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Уреди аватар" @@ -6445,7 +6460,7 @@ msgstr "Кориснички дејства" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Бришењето на корисникот е во тек..." #: lib/userprofile.php:263 msgid "Edit profile settings" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 617280c33..63e45a273 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:11+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:40+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -763,23 +763,28 @@ msgstr "Last opp" msgid "Crop" msgstr "Beskjær" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Ingen profil oppgitt." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Velg et kvadratisk utsnitt av bildet som din avatar." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Mistet våre fildata." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Brukerbildet har blitt oppdatert." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Oppdatering av avatar mislyktes." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar slettet." @@ -917,7 +922,7 @@ msgid "Conversation" msgstr "Samtale" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Notiser" @@ -1727,7 +1732,7 @@ msgstr "%s tidslinje" msgid "Updates from members of %1$s on %2$s!" msgstr "Oppdateringer fra medlemmer av %1$s på %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupper" @@ -3326,7 +3331,7 @@ msgid "Description" msgstr "Beskrivelse" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistikk" @@ -3484,7 +3489,7 @@ msgid "Members" msgstr "Medlemmer" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ingen)" @@ -3665,7 +3670,7 @@ msgid "Unknown language \"%s\"." msgstr "Ukjent språk «%s»." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -3936,8 +3941,7 @@ msgstr "Innstillinger for IM" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "Klarte ikke å lagre avatar-informasjonen" @@ -4486,38 +4490,38 @@ msgstr "" msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Bruker har blokkert deg." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Alle abonnementer" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Klarte ikke å lagre avatar-informasjonen" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Klarte ikke å lagre avatar-informasjonen" -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "" -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Velkommen til %1$s, @%2$s." @@ -4800,22 +4804,22 @@ msgstr "Etter" msgid "Before" msgstr "Før" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5290,20 +5294,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Fant ikke bekreftelseskode." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5483,40 +5487,40 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "Denne siden er ikke tilgjengelig i en mediatype du aksepterer" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Bildefilformatet støttes ikke." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Filen er for stor. Maks filstørrelse er %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Delvis opplasting." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Systemfeil ved opplasting av fil." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Ikke et bilde eller en korrupt fil." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Mistet filen vår." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Ukjent filtype" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6046,7 +6050,7 @@ msgstr "" msgid "Unknown" msgstr "Ukjent" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonnement" @@ -6054,7 +6058,7 @@ msgstr "Abonnement" msgid "All subscriptions" msgstr "Alle abonnementer" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abonnenter" @@ -6062,15 +6066,20 @@ msgstr "Abonnenter" msgid "All subscribers" msgstr "Alle abonnenter" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "Bruker-ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Medlem siden" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Alle grupper" @@ -6246,6 +6255,11 @@ msgstr "" msgid "Unsubscribe" msgstr "" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Brukeren har ingen profil." + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 745e666c2..6d3148c18 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:17+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:46+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -783,24 +783,29 @@ msgstr "Uploaden" msgid "Crop" msgstr "Uitsnijden" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Er is geen profiel opgegeven." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" "Selecteer een vierkant in de afbeelding om deze als uw avatar in te stellen" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Ons bestand is verloren gegaan." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "De avatar is bijgewerkt." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Het bijwerken van de avatar is mislukt." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "De avatar is verwijderd." @@ -938,7 +943,7 @@ msgid "Conversation" msgstr "Dialoog" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Mededelingen" @@ -1770,7 +1775,7 @@ msgstr "%s tijdlijn" msgid "Updates from members of %1$s on %2$s!" msgstr "Updates voor leden van %1$s op %2$s." -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Groepen" @@ -3444,7 +3449,7 @@ msgid "Description" msgstr "Beschrijving" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistieken" @@ -3613,7 +3618,7 @@ msgid "Members" msgstr "Leden" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(geen)" @@ -3796,7 +3801,8 @@ msgid "Unknown language \"%s\"." msgstr "De taal \"%s\" is niet bekend." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "De minimale tekstlimiet is 140 tekens." #: actions/siteadminpanel.php:171 @@ -4075,8 +4081,7 @@ msgstr "Snapshotinstellingen opslaan" msgid "You are not subscribed to that profile." msgstr "U bent niet geabonneerd op dat profiel." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Het was niet mogelijk het abonnement op te slaan." @@ -4672,36 +4677,36 @@ msgstr "" msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "U mag zich niet abonneren." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "U bent al gebonneerd!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Deze gebruiker negeert u." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Niet geabonneerd!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Het was niet mogelijk het abonnement op uzelf te verwijderen." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "" "Het was niet mogelijk om het OMB-token voor het abonnement te verwijderen." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Kon abonnement niet verwijderen." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Welkom bij %1$s, @%2$s!" @@ -4989,22 +4994,22 @@ msgstr "Later" msgid "Before" msgstr "Eerder" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "Verwachtte een root-feed element maar kreeg een heel XML-document." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Het is nog niet mogelijk inhoud uit andere omgevingen te verwerken." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Het is nog niet mogelijk ingebedde XML-inhoud te verwerken" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Het is nog niet mogelijk ingebedde Base64-inhoud te verwerken" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5524,20 +5529,20 @@ msgstr "" "tracks - nog niet beschikbaar\n" "tracking - nog niet beschikbaar\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Er is geen instellingenbestand aangetroffen. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen: " -#: lib/common.php:139 +#: lib/common.php:138 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:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Naar het installatieprogramma gaan." @@ -5715,40 +5720,40 @@ msgstr "Labels in de groepsmededelingen van %s" msgid "This page is not available in a media type you accept" msgstr "Deze pagina is niet beschikbaar in een mediatype dat u accepteert" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Niet ondersteund beeldbestandsformaat." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Dat bestand is te groot. De maximale bestandsgrootte is %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Gedeeltelijke upload." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Er is een systeemfout opgetreden tijdens het uploaden van het bestand." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Het bestand is geen afbeelding of het bestand is beschadigd." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Het bestand is zoekgeraakt." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Onbekend bestandstype" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6287,7 +6292,7 @@ msgstr "Labels in de mededelingen van %s" msgid "Unknown" msgstr "Onbekend" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonnementen" @@ -6295,7 +6300,7 @@ msgstr "Abonnementen" msgid "All subscriptions" msgstr "Alle abonnementen" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abonnees" @@ -6303,15 +6308,20 @@ msgstr "Abonnees" msgid "All subscribers" msgstr "Alle abonnees" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "Gebruikers-ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Lid sinds" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Alle groepen" @@ -6482,6 +6492,11 @@ msgstr "Uitschrijven van deze gebruiker" msgid "Unsubscribe" msgstr "Abonnement opheffen" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Deze gebruiker heeft geen profiel." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Avatar bewerken" @@ -6492,7 +6507,7 @@ msgstr "Gebruikershandelingen" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Bezig met het verwijderen van de gebruiker..." #: lib/userprofile.php:263 msgid "Edit profile settings" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 4b1110eae..30f1adc0f 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:14+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:43+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -780,23 +780,28 @@ msgstr "Last opp" msgid "Crop" msgstr "Skaler" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Ingen vald profil." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Velg eit utvalg av bildet som vil blir din avatar." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Fant ikkje igjen fil data." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Lasta opp brukarbilete." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Feil ved oppdatering av brukarbilete." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "Lasta opp brukarbilete." @@ -939,7 +944,7 @@ msgid "Conversation" msgstr "Stadfestingskode" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Notisar" @@ -1807,7 +1812,7 @@ msgstr "%s tidsline" msgid "Updates from members of %1$s on %2$s!" msgstr "Oppdateringar frå %1$s på %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupper" @@ -3479,7 +3484,7 @@ msgid "Description" msgstr "Beskriving" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistikk" @@ -3637,7 +3642,7 @@ msgid "Members" msgstr "Medlemmar" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ingen)" @@ -3806,7 +3811,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4088,8 +4093,7 @@ msgstr "Avatar-innstillingar" msgid "You are not subscribed to that profile." msgstr "Du tingar ikkje oppdateringar til den profilen." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Kunne ikkje lagra abonnement." @@ -4669,39 +4673,39 @@ msgstr "Eit problem oppstod ved lagring av notis." msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 #, fuzzy msgid "You have been banned from subscribing." msgstr "Brukaren tillet deg ikkje å tinga meldingane sine." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Brukar har blokkert deg." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Ikkje tinga." -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Kan ikkje sletta tinging." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Kan ikkje sletta tinging." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Kan ikkje sletta tinging." -#: classes/User.php:378 +#: classes/User.php:363 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Melding til %1$s på %2$s" @@ -5007,22 +5011,22 @@ msgstr "« Etter" msgid "Before" msgstr "Før »" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 #, fuzzy @@ -5518,20 +5522,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Ingen stadfestingskode." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 #, fuzzy msgid "Go to the installer." msgstr "Logg inn or sida" @@ -5712,40 +5716,40 @@ msgstr "Merkelappar i %s gruppa sine notisar" msgid "This page is not available in a media type you accept" msgstr "Denne sida er ikkje tilgjengeleg i nokon mediatype du aksepterer." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Støttar ikkje bileteformatet." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Du kan lasta opp ein logo for gruppa." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Hallvegs opplasta." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Systemfeil ved opplasting av fil." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Korrupt bilete." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Mista fila vår." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Ukjend fil type" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6214,7 +6218,7 @@ msgstr "Merkelappar i %s sine notisar" msgid "Unknown" msgstr "Uventa handling." -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Tingingar" @@ -6222,7 +6226,7 @@ msgstr "Tingingar" msgid "All subscriptions" msgstr "Alle tingingar" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Tingarar" @@ -6230,16 +6234,21 @@ msgstr "Tingarar" msgid "All subscribers" msgstr "Tingarar" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 #, fuzzy msgid "User ID" msgstr "Brukar" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Medlem sidan" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Alle gruppar" @@ -6421,6 +6430,11 @@ msgstr "Fjern tinging fra denne brukaren" msgid "Unsubscribe" msgstr "Fjern tinging" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Brukaren har inga profil." + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index 816eb6e85..e2656b003 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:20+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:49+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \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.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -770,23 +770,28 @@ msgstr "Wyślij" msgid "Crop" msgstr "Przytnij" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Nie podano profilu." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Wybierz kwadratowy obszar obrazu do awatara" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Utracono dane pliku." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Zaktualizowano awatar." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Zaktualizowanie awatara nie powiodło się." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Usunięto awatar." @@ -924,7 +929,7 @@ msgid "Conversation" msgstr "Rozmowa" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Wpisy" @@ -1740,7 +1745,7 @@ msgstr "Oś czasu użytkownika %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Aktualizacje od członków %1$s na %2$s." -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupy" @@ -3396,7 +3401,7 @@ msgid "Description" msgstr "Opis" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statystyki" @@ -3563,7 +3568,7 @@ msgid "Members" msgstr "Członkowie" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Brak)" @@ -3745,7 +3750,8 @@ msgid "Unknown language \"%s\"." msgstr "Nieznany język \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Maksymalne ograniczenie tekstu to 14 znaków." #: actions/siteadminpanel.php:171 @@ -4018,8 +4024,7 @@ msgstr "Zapisz ustawienia migawki" msgid "You are not subscribed to that profile." msgstr "Nie jesteś subskrybowany do tego profilu." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Nie można zapisać subskrypcji." @@ -4605,35 +4610,35 @@ msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Zablokowano subskrybowanie." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Już subskrybowane." -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Użytkownik zablokował cię." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Niesubskrybowane." -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Nie można usunąć autosubskrypcji." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Nie można usunąć tokenu subskrypcji OMB." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Nie można usunąć subskrypcji." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Witaj w %1$s, @%2$s." @@ -4921,22 +4926,22 @@ msgstr "Później" msgid "Before" msgstr "Wcześniej" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "Oczekiwano elementu kanału roota, ale otrzymano cały dokument XML." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Nie można jeszcze obsługiwać zdalnej treści." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Nie można jeszcze obsługiwać zagnieżdżonej treści XML." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Nie można jeszcze obsługiwać zagnieżdżonej treści Base64." -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5455,19 +5460,19 @@ msgstr "" "tracks - jeszcze nie zaimplementowano\n" "tracking - jeszcze nie zaimplementowano\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Nie odnaleziono pliku konfiguracji." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Szukano plików konfiguracji w następujących miejscach: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Należy uruchomić instalator, aby to naprawić." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Przejdź do instalatora." @@ -5645,40 +5650,40 @@ msgstr "Znaczniki we wpisach grupy %s" msgid "This page is not available in a media type you accept" msgstr "Ta strona jest niedostępna dla akceptowanego typu medium" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Nieobsługiwany format pliku obrazu." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Ten plik jest za duży. Maksymalny rozmiar pliku to %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Częściowo wysłano." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Błąd systemu podczas wysyłania pliku." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "To nie jest obraz lub lub plik jest uszkodzony." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Utracono plik." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Nieznany typ pliku" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "KB" @@ -6211,7 +6216,7 @@ msgstr "Znaczniki we wpisach użytkownika %s" msgid "Unknown" msgstr "Nieznane" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subskrypcje" @@ -6219,7 +6224,7 @@ msgstr "Subskrypcje" msgid "All subscriptions" msgstr "Wszystkie subskrypcje" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Subskrybenci" @@ -6227,15 +6232,20 @@ msgstr "Subskrybenci" msgid "All subscribers" msgstr "Wszyscy subskrybenci" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "Identyfikator użytkownika" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Członek od" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Wszystkie grupy" @@ -6407,6 +6417,11 @@ msgstr "Zrezygnuj z subskrypcji tego użytkownika" msgid "Unsubscribe" msgstr "Zrezygnuj z subskrypcji" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Użytkownik nie posiada profilu." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Zmodyfikuj awatar" @@ -6417,7 +6432,7 @@ msgstr "Czynności użytkownika" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Trwa usuwanie użytkownika..." #: lib/userprofile.php:263 msgid "Edit profile settings" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 4d94d95b0..4d1a30ea4 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:23+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:52+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -770,23 +770,28 @@ msgstr "Carregar" msgid "Crop" msgstr "Cortar" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Não foi especificado um perfil." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Escolha uma área quadrada da imagem para ser o seu avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Perdi os dados do nosso ficheiro." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar actualizado." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Falha ao actualizar avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar apagado." @@ -925,7 +930,7 @@ msgid "Conversation" msgstr "Conversação" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Notas" @@ -1772,7 +1777,7 @@ msgstr "Notas de %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Actualizações dos membros de %1$s em %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupos" @@ -3450,7 +3455,7 @@ msgid "Description" msgstr "Descrição" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Estatísticas" @@ -3617,7 +3622,7 @@ msgid "Members" msgstr "Membros" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Nenhum)" @@ -3799,7 +3804,8 @@ msgid "Unknown language \"%s\"." msgstr "Língua desconhecida \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "O valor mínimo de limite para o texto é 140 caracteres." #: actions/siteadminpanel.php:171 @@ -4078,8 +4084,7 @@ msgstr "Gravar configurações do site" msgid "You are not subscribed to that profile." msgstr "Não subscreveu esse perfil." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Não foi possível gravar a subscrição." @@ -4668,36 +4673,36 @@ msgstr "Problema na gravação da nota." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Foi bloqueado de fazer subscrições" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Já subscrito!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "O utilizador bloqueou-o." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Não subscrito!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Não foi possível apagar a auto-subscrição." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Não foi possível apagar a subscrição." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Não foi possível apagar a subscrição." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%1$s dá-lhe as boas-vindas, @%2$s!" @@ -5000,22 +5005,22 @@ msgstr "Posteriores" msgid "Before" msgstr "Anteriores" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5535,19 +5540,19 @@ msgstr "" "tracks - ainda não implementado.\n" "tracking - ainda não implementado.\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Ficheiro de configuração não encontrado. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Procurei ficheiros de configuração nos seguintes sítios: " -#: lib/common.php:139 +#: lib/common.php:138 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:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Ir para o instalador." @@ -5725,40 +5730,40 @@ msgstr "Categorias nas notas do grupo %s" msgid "This page is not available in a media type you accept" msgstr "Esta página não está disponível num formato que você aceite" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Formato do ficheiro da imagem não é suportado." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Esse ficheiro é demasiado grande. O tamanho máximo de ficheiro é %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Transferência parcial." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Ocorreu um erro de sistema ao transferir o ficheiro." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Ficheiro não é uma imagem ou está corrompido." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Perdi o nosso ficheiro." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Tipo do ficheiro é desconhecido" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6293,7 +6298,7 @@ msgstr "Categorias nas notas de %s" msgid "Unknown" msgstr "Desconhecida" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Subscrições" @@ -6301,7 +6306,7 @@ msgstr "Subscrições" msgid "All subscriptions" msgstr "Todas as subscrições" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Subscritores" @@ -6309,15 +6314,20 @@ msgstr "Subscritores" msgid "All subscribers" msgstr "Todos os subscritores" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ID do utilizador" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Membro desde" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Todos os grupos" @@ -6488,6 +6498,11 @@ msgstr "Deixar de subscrever este utilizador" msgid "Unsubscribe" msgstr "Abandonar" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Utilizador não tem perfil." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Editar Avatar" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index a431c99b8..78c07d4b8 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:27+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:55+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -46,10 +46,9 @@ msgstr "Impedir usuários anônimos (não autenticados) de visualizar o site?" #. TRANS: Checkbox label for prohibiting anonymous users from viewing site. #: actions/accessadminpanel.php:167 -#, fuzzy msgctxt "LABEL" msgid "Private" -msgstr "Particular" +msgstr "Privado" #. TRANS: Checkbox instructions for admin setting "Invite only" #: actions/accessadminpanel.php:174 @@ -627,7 +626,7 @@ msgstr "Essa mensagem não existe." #: actions/apistatusesretweet.php:83 msgid "Cannot repeat your own notice." -msgstr "Você não pode repetria sua própria mensagem." +msgstr "Você não pode repetir a sua própria mensagem." #: actions/apistatusesretweet.php:91 msgid "Already repeated that notice." @@ -778,23 +777,28 @@ msgstr "Enviar" msgid "Crop" msgstr "Cortar" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Não foi especificado nenhum perfil." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Selecione uma área quadrada da imagem para ser seu avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Os dados do nosso arquivo foram perdidos." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "O avatar foi atualizado." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Não foi possível atualizar o avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "O avatar foi excluído." @@ -933,7 +937,7 @@ msgid "Conversation" msgstr "Conversa" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Mensagens" @@ -1587,23 +1591,20 @@ msgid "Cannot read file." msgstr "Não foi possível ler o arquivo." #: actions/grantrole.php:62 actions/revokerole.php:62 -#, fuzzy msgid "Invalid role." -msgstr "Token inválido." +msgstr "Papel inválido." #: actions/grantrole.php:66 actions/revokerole.php:66 msgid "This role is reserved and cannot be set." -msgstr "" +msgstr "Este papel está reservado e não pode ser definido." #: actions/grantrole.php:75 -#, fuzzy msgid "You cannot grant user roles on this site." -msgstr "Você não pode colocar usuários deste site em isolamento." +msgstr "Você não pode definir papéis para os usuários neste site." #: actions/grantrole.php:82 -#, fuzzy msgid "User already has this role." -msgstr "O usuário já está silenciado." +msgstr "O usuário já possui este papel." #: actions/groupblock.php:71 actions/groupunblock.php:71 #: actions/makeadmin.php:71 actions/subedit.php:46 @@ -1764,7 +1765,7 @@ msgstr "Mensagens de %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Atualizações dos membros de %1$s no %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupos" @@ -2098,9 +2099,8 @@ msgid "You must be logged in to join a group." msgstr "Você deve estar autenticado para se associar a um grupo." #: actions/joingroup.php:88 actions/leavegroup.php:88 -#, fuzzy msgid "No nickname or ID." -msgstr "Nenhuma identificação." +msgstr "Nenhum apelido ou identificação." #: actions/joingroup.php:141 #, php-format @@ -3358,14 +3358,12 @@ msgid "Replies to %1$s on %2$s!" msgstr "Respostas para %1$s no %2$s" #: actions/revokerole.php:75 -#, fuzzy msgid "You cannot revoke user roles on this site." -msgstr "Você não pode silenciar os usuários neste site." +msgstr "Não é possível revogar os papéis dos usuários neste site." #: actions/revokerole.php:82 -#, fuzzy msgid "User doesn't have this role." -msgstr "Usuário sem um perfil correspondente" +msgstr "O usuário não possui este papel." #: actions/rsd.php:146 actions/version.php:157 msgid "StatusNet" @@ -3395,7 +3393,7 @@ msgstr "Gerenciar sessões" #: actions/sessionsadminpanel.php:177 msgid "Whether to handle sessions ourselves." -msgstr "Define se nós cuidamos do gerenciamento das sessões." +msgstr "Define se as sessões terão gerenciamento próprio." #: actions/sessionsadminpanel.php:181 msgid "Session debugging" @@ -3437,7 +3435,7 @@ msgid "Description" msgstr "Descrição" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Estatísticas" @@ -3604,7 +3602,7 @@ msgid "Members" msgstr "Membros" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Nenhum)" @@ -3770,7 +3768,6 @@ msgid "User is already silenced." msgstr "O usuário já está silenciado." #: actions/siteadminpanel.php:69 -#, fuzzy msgid "Basic settings for this StatusNet site" msgstr "Configurações básicas para esta instância do StatusNet." @@ -3788,7 +3785,8 @@ msgid "Unknown language \"%s\"." msgstr "Idioma \"%s\" desconhecido." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "O comprimento máximo do texto é de 140 caracteres." #: actions/siteadminpanel.php:171 @@ -3846,6 +3844,8 @@ msgstr "Idioma padrão" #: actions/siteadminpanel.php:263 msgid "Site language when autodetection from browser settings is not available" msgstr "" +"Idioma do site quando as configurações de autodetecção a partir do navegador " +"não estiverem disponíveis" #: actions/siteadminpanel.php:271 msgid "Limits" @@ -3870,37 +3870,32 @@ msgstr "" "coisa novamente." #: actions/sitenoticeadminpanel.php:56 -#, fuzzy msgid "Site Notice" -msgstr "Mensagem do site" +msgstr "Avisos do site" #: actions/sitenoticeadminpanel.php:67 -#, fuzzy msgid "Edit site-wide message" -msgstr "Nova mensagem" +msgstr "Editar os avisos do site (exibidos em todas as páginas)" #: actions/sitenoticeadminpanel.php:103 -#, fuzzy msgid "Unable to save site notice." -msgstr "Não foi possível salvar suas configurações de aparência." +msgstr "Não foi possível salvar os avisos do site." #: actions/sitenoticeadminpanel.php:113 msgid "Max length for the site-wide notice is 255 chars" -msgstr "" +msgstr "O tamanho máximo para os avisos é de 255 caracteres." #: actions/sitenoticeadminpanel.php:176 -#, fuzzy msgid "Site notice text" -msgstr "Mensagem do site" +msgstr "Texto dos avisos" #: actions/sitenoticeadminpanel.php:178 msgid "Site-wide notice text (255 chars max; HTML okay)" -msgstr "" +msgstr "Texto dos avisos do site (no máximo 255 caracteres; pode usar HTML)" #: actions/sitenoticeadminpanel.php:198 -#, fuzzy msgid "Save site notice" -msgstr "Mensagem do site" +msgstr "Salvar os avisos do site" #: actions/smssettings.php:58 msgid "SMS settings" @@ -4007,9 +4002,8 @@ msgid "Snapshots" msgstr "Estatísticas" #: actions/snapshotadminpanel.php:65 -#, fuzzy msgid "Manage snapshot configuration" -msgstr "Mude as configurações do site" +msgstr "Gerenciar as configurações das estatísticas" #: actions/snapshotadminpanel.php:127 msgid "Invalid snapshot run value." @@ -4056,32 +4050,28 @@ msgid "Snapshots will be sent to this URL" msgstr "As estatísticas serão enviadas para esta URL" #: actions/snapshotadminpanel.php:248 -#, fuzzy msgid "Save snapshot settings" -msgstr "Salvar as configurações do site" +msgstr "Salvar as configurações de estatísticas" #: actions/subedit.php:70 msgid "You are not subscribed to that profile." msgstr "Você não está assinando esse perfil." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Não foi possível salvar a assinatura." #: actions/subscribe.php:77 msgid "This action only accepts POST requests." -msgstr "" +msgstr "Esta ação aceita somente requisições POST." #: actions/subscribe.php:107 -#, fuzzy msgid "No such profile." -msgstr "Esse arquivo não existe." +msgstr "Este perfil 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." +msgstr "Não é possível assinar um perfil OMB 0.1 remoto com essa ação." #: actions/subscribe.php:145 msgid "Subscribed" @@ -4586,9 +4576,8 @@ msgid "Group leave failed." msgstr "Não foi possível deixar o grupo." #: classes/Local_group.php:41 -#, fuzzy msgid "Could not update local group." -msgstr "Não foi possível atualizar o grupo." +msgstr "Não foi possível atualizar o grupo local." #: classes/Login_token.php:76 #, php-format @@ -4652,36 +4641,35 @@ msgstr "Problema no salvamento das mensagens recebidas do grupo." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Você está proibido de assinar." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Já assinado!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "O usuário bloqueou você." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Não assinado!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Não foi possível excluir a auto-assinatura." -#: classes/Subscription.php:190 -#, fuzzy +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." -msgstr "Não foi possível excluir a assinatura." +msgstr "Não foi possível excluir o token de assinatura OMB." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Não foi possível excluir a assinatura." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Bem vindo(a) a %1$s, @%2$s!" @@ -4691,18 +4679,16 @@ msgid "Could not create group." msgstr "Não foi possível criar o grupo." #: classes/User_group.php:489 -#, fuzzy msgid "Could not set group URI." -msgstr "Não foi possível configurar a associação ao grupo." +msgstr "Não foi possível definir a URI do grupo." #: classes/User_group.php:510 msgid "Could not set group membership." msgstr "Não foi possível configurar a associação ao grupo." #: classes/User_group.php:524 -#, fuzzy msgid "Could not save local group info." -msgstr "Não foi possível salvar a assinatura." +msgstr "Não foi possível salvar a informação do grupo local." #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" @@ -4747,27 +4733,23 @@ msgstr "Navegação primária no site" #. TRANS: Tooltip for main menu option "Personal" #: lib/action.php:430 -#, fuzzy msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" msgstr "Perfil pessoal e fluxo de mensagens dos amigos" #: lib/action.php:433 -#, fuzzy msgctxt "MENU" msgid "Personal" msgstr "Pessoal" #. TRANS: Tooltip for main menu option "Account" #: lib/action.php:435 -#, fuzzy msgctxt "TOOLTIP" msgid "Change your email, avatar, password, profile" -msgstr "Mude seu e-mail, avatar, senha, perfil" +msgstr "Altere seu e-mail, avatar, senha, perfil" #. TRANS: Tooltip for main menu option "Services" #: lib/action.php:440 -#, fuzzy msgctxt "TOOLTIP" msgid "Connect to services" msgstr "Conecte-se a outros serviços" @@ -4778,16 +4760,14 @@ msgstr "Conectar" #. TRANS: Tooltip for menu option "Admin" #: lib/action.php:446 -#, fuzzy msgctxt "TOOLTIP" msgid "Change site configuration" -msgstr "Mude as configurações do site" +msgstr "Altere as configurações do site" #: lib/action.php:449 -#, fuzzy msgctxt "MENU" msgid "Admin" -msgstr "Admin" +msgstr "Administrar" #. TRANS: Tooltip for main menu option "Invite" #: lib/action.php:453 @@ -4979,22 +4959,22 @@ msgstr "Próximo" msgid "Before" msgstr "Anterior" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5214,9 +5194,9 @@ msgid "Could not find a user with nickname %s" msgstr "Não foi possível encontrar um usuário com a identificação %s" #: lib/command.php:143 -#, fuzzy, php-format +#, php-format msgid "Could not find a local user with nickname %s" -msgstr "Não foi possível encontrar um usuário com a identificação %s" +msgstr "Não foi possível encontrar um usuário local com a identificação %s" #: lib/command.php:176 msgid "Sorry, this command is not yet implemented." @@ -5296,6 +5276,8 @@ msgid "" "%s is a remote profile; you can only send direct messages to users on the " "same server." msgstr "" +"%s é um perfil remoto; você pode só pode enviar mensagens diretas para " +"usuários do mesmo servidor." #: lib/command.php:450 #, php-format @@ -5349,9 +5331,8 @@ msgid "Specify the name of the user to subscribe to" msgstr "Especifique o nome do usuário que será assinado" #: lib/command.php:602 -#, fuzzy msgid "Can't subscribe to OMB profiles by command." -msgstr "Você não está assinando esse perfil." +msgstr "Não é possível assinar perfis OMB com comandos." #: lib/command.php:608 #, php-format @@ -5399,7 +5380,7 @@ msgstr "" "s" #: lib/command.php:735 -#, fuzzy, php-format +#, php-format msgid "Unsubscribed %s" msgstr "Cancelada a assinatura de %s" @@ -5434,7 +5415,6 @@ msgstr[0] "Você é membro deste grupo:" msgstr[1] "Você é membro destes grupos:" #: lib/command.php:812 -#, fuzzy msgid "" "Commands:\n" "on - turn on notifications\n" @@ -5485,8 +5465,9 @@ msgstr "" "subscribers - lista as pessoas que seguem você\n" "leave - deixa de assinar o usuário\n" "d - mensagem direta para o usuário\n" -"get - obtém a última mensagem do usuário\n" -"whois - obtém as informações do perfil do usuário\n" +"get - obtém a última mensagem do usuário\n" +"whois - obtém as informações do perfil do usuário\n" +"lose - obriga o usuário a deixar de segui-lo\n" "fav - adiciona a último mensagem do usuário como uma " "'favorita'\n" "fav # - adiciona a mensagem identificada como 'favorita'\n" @@ -5514,19 +5495,19 @@ msgstr "" "tracks - não implementado ainda\n" "tracking - não implementado ainda\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Não foi encontrado nenhum arquivo de configuração. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Eu procurei pelos arquivos de configuração nos seguintes lugares: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Você pode querer executar o instalador para corrigir isto." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Ir para o instalador." @@ -5627,7 +5608,7 @@ msgstr "Ir" #: lib/grantroleform.php:91 #, php-format msgid "Grant this user the \"%s\" role" -msgstr "" +msgstr "Associa o papel \"%s\" a este usuário" #: lib/groupeditform.php:163 msgid "URL of the homepage or blog of the group or topic" @@ -5704,40 +5685,40 @@ msgstr "Etiquetas nas mensagens do grupo %s" msgid "This page is not available in a media type you accept" msgstr "Esta página não está disponível em um tipo de mídia que você aceita" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Formato de imagem não suportado." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "O arquivo é muito grande. O tamanho máximo é de %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Envio parcial." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Erro no sistema durante o envio do arquivo." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Imagem inválida ou arquivo corrompido." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Nosso arquivo foi perdido." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Tipo de arquivo desconhecido" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "Mb" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "Kb" @@ -6273,7 +6254,7 @@ msgstr "Etiquetas nas mensagens de %s" msgid "Unknown" msgstr "Desconhecido" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Assinaturas" @@ -6281,7 +6262,7 @@ msgstr "Assinaturas" msgid "All subscriptions" msgstr "Todas as assinaturas" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Assinantes" @@ -6289,15 +6270,20 @@ msgstr "Assinantes" msgid "All subscribers" msgstr "Todos os assinantes" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ID do usuário" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Membro desde" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Todos os grupos" @@ -6338,9 +6324,9 @@ msgid "Repeat this notice" msgstr "Repetir esta mensagem" #: lib/revokeroleform.php:91 -#, fuzzy, php-format +#, php-format msgid "Revoke the \"%s\" role from this user" -msgstr "Bloquear este usuário neste grupo" +msgstr "Revoga o papel \"%s\" deste usuário" #: lib/router.php:677 msgid "No single user defined for single-user mode." @@ -6468,6 +6454,11 @@ msgstr "Cancelar a assinatura deste usuário" msgid "Unsubscribe" msgstr "Cancelar" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "O usuário não tem perfil." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Editar o avatar" @@ -6478,7 +6469,7 @@ msgstr "Ações do usuário" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Exclusão do usuário em andamento..." #: lib/userprofile.php:263 msgid "Edit profile settings" @@ -6501,9 +6492,8 @@ msgid "Moderate" msgstr "Moderar" #: lib/userprofile.php:364 -#, fuzzy msgid "User role" -msgstr "Perfil do usuário" +msgstr "Papel do usuário" #: lib/userprofile.php:366 msgctxt "role" @@ -6511,10 +6501,9 @@ msgid "Administrator" msgstr "Administrador" #: lib/userprofile.php:367 -#, fuzzy msgctxt "role" msgid "Moderator" -msgstr "Moderar" +msgstr "Moderador" #: lib/util.php:1046 msgid "a few seconds ago" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index b436d9f1e..472b3cbbe 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:30+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:10:59+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -774,23 +774,28 @@ msgstr "Загрузить" msgid "Crop" msgstr "Обрезать" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Профиль не определен." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Подберите нужный квадратный участок для вашей аватары" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Потеряна информация о файле." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Аватара обновлена." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Неудача при обновлении аватары." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Аватара удалена." @@ -928,7 +933,7 @@ msgid "Conversation" msgstr "Дискуссия" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Записи" @@ -1760,7 +1765,7 @@ msgstr "Лента %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Обновления участников %1$s на %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Группы" @@ -3414,7 +3419,7 @@ msgid "Description" msgstr "Описание" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Статистика" @@ -3581,7 +3586,7 @@ msgid "Members" msgstr "Участники" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(пока ничего нет)" @@ -3765,7 +3770,8 @@ msgid "Unknown language \"%s\"." msgstr "Неизвестный язык «%s»." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Минимальное ограничение текста составляет 140 символов." #: actions/siteadminpanel.php:171 @@ -4039,8 +4045,7 @@ msgstr "Сохранить настройки снимка" msgid "You are not subscribed to that profile." msgstr "Вы не подписаны на этот профиль." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Не удаётся сохранить подписку." @@ -4623,35 +4628,35 @@ msgstr "Проблемы с сохранением входящих сообще msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Вы заблокированы от подписки." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Уже подписаны!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Пользователь заблокировал Вас." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Не подписаны!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Невозможно удалить самоподписку." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Не удаётся удалить подписочный жетон OMB." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Не удаётся удалить подписку." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добро пожаловать на %1$s, @%2$s!" @@ -4939,22 +4944,22 @@ msgstr "Сюда" msgid "Before" msgstr "Туда" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "Ожидался корневой элемент потока, а получен XML-документ целиком." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Пока ещё нельзя обрабатывать удалённое содержимое." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Пока ещё нельзя обрабатывать встроенный XML." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Пока ещё нельзя обрабатывать встроенное содержание Base64." -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5469,19 +5474,19 @@ msgstr "" "tracks — пока не реализовано.\n" "tracking — пока не реализовано.\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Конфигурационный файл не найден. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Конфигурационные файлы искались в следующих местах: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Возможно, вы решите запустить установщик для исправления этого." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Перейти к установщику" @@ -5659,40 +5664,40 @@ msgstr "Теги записей группы %s" msgid "This page is not available in a media type you accept" msgstr "Страница недоступна для того типа, который Вы задействовали." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Неподдерживаемый формат файла изображения." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Этот файл слишком большой. Максимальный размер файла составляет %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Частичная загрузка." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Системная ошибка при загрузке файла." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Не является изображением или повреждённый файл." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Потерян файл." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Неподдерживаемый тип файла" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "МБ" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "КБ" @@ -6226,7 +6231,7 @@ msgstr "Теги записей пользователя %s" msgid "Unknown" msgstr "Неизвестно" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Подписки" @@ -6234,7 +6239,7 @@ msgstr "Подписки" msgid "All subscriptions" msgstr "Все подписки." -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Подписчики" @@ -6242,15 +6247,20 @@ msgstr "Подписчики" msgid "All subscribers" msgstr "Все подписчики" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ID пользователя" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Регистрация" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Все группы" @@ -6421,6 +6431,11 @@ msgstr "Отписаться от этого пользователя" msgid "Unsubscribe" msgstr "Отписаться" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "У пользователя нет профиля." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Изменить аватару" @@ -6431,7 +6446,7 @@ msgstr "Действия пользователя" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Идёт удаление пользователя…" #: lib/userprofile.php:263 msgid "Edit profile settings" diff --git a/locale/statusnet.po b/locale/statusnet.po index eccc291e2..f8d6ea29c 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-03-17 21:39+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -744,23 +744,27 @@ msgstr "" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "" @@ -895,7 +899,7 @@ msgid "Conversation" msgstr "" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "" @@ -1690,7 +1694,7 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "" @@ -3216,7 +3220,7 @@ msgid "Description" msgstr "" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "" @@ -3373,7 +3377,7 @@ msgid "Members" msgstr "" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3532,7 +3536,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -3793,8 +3797,7 @@ msgstr "" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "" @@ -4330,35 +4333,35 @@ msgstr "" msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "" -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "" -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4637,22 +4640,22 @@ msgstr "" msgid "Before" msgstr "" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5116,19 +5119,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "" -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5302,40 +5305,40 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "" -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -5778,7 +5781,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "" @@ -5786,7 +5789,7 @@ msgstr "" msgid "All subscriptions" msgstr "" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "" @@ -5794,15 +5797,20 @@ msgstr "" msgid "All subscribers" msgstr "" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "" @@ -5973,6 +5981,11 @@ msgstr "" msgid "Unsubscribe" msgstr "" +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "" + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index eee7b6d72..681dfedce 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:33+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:11:02+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -762,23 +762,28 @@ msgstr "Ladda upp" msgid "Crop" msgstr "Beskär" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Ingen profil angiven." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Välj ett kvadratiskt område i bilden som din avatar" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Förlorade vår fildata." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar uppdaterad." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Misslyckades uppdatera avatar." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Avatar borttagen." @@ -917,7 +922,7 @@ msgid "Conversation" msgstr "Konversationer" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Notiser" @@ -1739,7 +1744,7 @@ msgstr "%s tidslinje" msgid "Updates from members of %1$s on %2$s!" msgstr "Uppdateringar från medlemmar i %1$s på %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Grupper" @@ -3398,7 +3403,7 @@ msgid "Description" msgstr "Beskrivning" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Statistik" @@ -3566,7 +3571,7 @@ msgid "Members" msgstr "Medlemmar" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Ingen)" @@ -3745,7 +3750,8 @@ msgid "Unknown language \"%s\"." msgstr "Okänt språk \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Minsta textbegränsning är 140 tecken." #: actions/siteadminpanel.php:171 @@ -4016,8 +4022,7 @@ msgstr "Spara inställningar för ögonblicksbild" msgid "You are not subscribed to that profile." msgstr "Du är inte prenumerat hos den profilen." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Kunde inte spara prenumeration." @@ -4601,35 +4606,35 @@ msgstr "Problem med att spara gruppinkorg." msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 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 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Redan prenumerant!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Användaren har blockerat dig." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Inte prenumerant!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Kunde inte ta bort själv-prenumeration." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Kunde inte radera OMB prenumerations-token." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Kunde inte ta bort prenumeration." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Välkommen till %1$s, @%2$s!" @@ -4914,22 +4919,22 @@ msgstr "Senare" msgid "Before" msgstr "Tidigare" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "Förväntade ett flödes rotelement, men fick ett helt XML-dokument." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Kan inte hantera fjärrinnehåll ännu." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Kan inte hantera inbäddat XML-innehåll ännu." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Kan inte hantera inbäddat Base64-innehåll ännu." -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5441,19 +5446,19 @@ msgstr "" "tracks - inte implementerat än.\n" "tracking - inte implementerat än.\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Ingen konfigurationsfil hittades. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Jag letade efter konfigurationsfiler på följande platser: " -#: lib/common.php:139 +#: lib/common.php:138 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:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Gå till installeraren." @@ -5629,40 +5634,40 @@ msgstr "Taggar i %s grupps notiser" msgid "This page is not available in a media type you accept" msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Bildfilens format stödjs inte." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Denna fil är för stor. Den maximala filstorleken är %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Bitvis uppladdad." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Systemfel vid uppladdning av fil." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Inte en bildfil eller så är filen korrupt." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Förlorade vår fil." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Okänd filtyp" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "MB" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "kB" @@ -6196,7 +6201,7 @@ msgstr "Taggar i %ss notiser" msgid "Unknown" msgstr "Okänd" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Prenumerationer" @@ -6204,7 +6209,7 @@ msgstr "Prenumerationer" msgid "All subscriptions" msgstr "Alla prenumerationer" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Prenumeranter" @@ -6212,15 +6217,20 @@ msgstr "Prenumeranter" msgid "All subscribers" msgstr "Alla prenumeranter" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "Användar-ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Medlem sedan" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Alla grupper" @@ -6391,6 +6401,11 @@ msgstr "Avsluta prenumerationen på denna användare" msgid "Unsubscribe" msgstr "Avsluta pren." +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Användaren har ingen profil." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Redigera avatar" @@ -6401,7 +6416,7 @@ msgstr "Åtgärder för användare" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Borttagning av användare pågår..." #: lib/userprofile.php:263 msgid "Edit profile settings" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index 091dd8fda..270bf6885 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:36+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:11:06+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -758,23 +758,28 @@ msgstr "ఎగుమతించు" msgid "Crop" msgstr "కత్తిరించు" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "పాక్షిక ఎగుమతి." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "మీ అవతారానికి గానూ ఈ చిత్రం నుండి ఒక చతురస్రపు ప్రదేశాన్ని ఎంచుకోండి" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "అవతారాన్ని తాజాకరించాం." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "అవతారపు తాజాకరణ విఫలమైంది." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "అవతారాన్ని తొలగించాం." @@ -913,7 +918,7 @@ msgid "Conversation" msgstr "సంభాషణ" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "సందేశాలు" @@ -1722,7 +1727,7 @@ msgstr "%s కాలరేఖ" msgid "Updates from members of %1$s on %2$s!" msgstr "%s యొక్క మైక్రోబ్లాగు" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "గుంపులు" @@ -3316,7 +3321,7 @@ msgid "Description" msgstr "వివరణ" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "గణాంకాలు" @@ -3475,7 +3480,7 @@ msgid "Members" msgstr "సభ్యులు" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(ఏమీలేదు)" @@ -3637,7 +3642,8 @@ msgid "Unknown language \"%s\"." msgstr "గుర్తు తెలియని భాష \"%s\"." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "కనిష్ఠ పాఠ్య పరిమితి 140 అక్షరాలు." #: actions/siteadminpanel.php:171 @@ -3908,8 +3914,7 @@ msgstr "సైటు అమరికలను భద్రపరచు" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "చందాని సృష్టించలేకపోయాం." @@ -4457,38 +4462,38 @@ msgstr "సందేశాన్ని భద్రపరచడంలో పొ msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "చందాచేరడం నుండి మిమ్మల్ని నిషేధించారు." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "ఇప్పటికే చందాచేరారు!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "వాడుకరి మిమ్మల్ని నిరోధించారు." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "చందాదార్లు" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "చందాని తొలగించలేకపోయాం." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "చందాని తొలగించలేకపోయాం." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "చందాని తొలగించలేకపోయాం." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "@%2$s, %1$sకి స్వాగతం!" @@ -4779,22 +4784,22 @@ msgstr "తర్వాత" msgid "Before" msgstr "ఇంతక్రితం" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5276,20 +5281,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "నిర్ధారణ సంకేతం లేదు." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5467,41 +5472,41 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం 140 అక్షరాలు." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "పాక్షిక ఎగుమతి." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "బొమ్మ కాదు లేదా పాడైపోయిన ఫైలు." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "అటువంటి సందేశమేమీ లేదు." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "తెలియని ఫైలు రకం" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "మెబై" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "కిబై" @@ -5989,7 +5994,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "చందాలు" @@ -5997,7 +6002,7 @@ msgstr "చందాలు" msgid "All subscriptions" msgstr "అన్ని చందాలు" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "చందాదార్లు" @@ -6005,15 +6010,20 @@ msgstr "చందాదార్లు" msgid "All subscribers" msgstr "అందరు చందాదార్లు" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "వాడుకరి ID" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "సభ్యులైన తేదీ" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "అన్ని గుంపులు" @@ -6190,6 +6200,11 @@ msgstr "ఈ వాడుకరి నుండి చందామాను" msgid "Unsubscribe" msgstr "చందామాను" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "వాడుకరికి ప్రొఫైలు లేదు." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "అవతారాన్ని మార్చు" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index b6668adcd..051abd983 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:39+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:11:09+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -785,23 +785,28 @@ msgstr "Yükle" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Kısmi yükleme." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Avatar güncellendi." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Avatar güncellemede hata." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "Avatar güncellendi." @@ -946,7 +951,7 @@ msgid "Conversation" msgstr "Yer" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Durum mesajları" @@ -1797,7 +1802,7 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "%s adli kullanicinin durum mesajlari" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "" @@ -3418,7 +3423,7 @@ msgid "Description" msgstr "Abonelikler" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "İstatistikler" @@ -3578,7 +3583,7 @@ msgid "Members" msgstr "Üyelik başlangıcı" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3741,7 +3746,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4015,8 +4020,7 @@ msgstr "Ayarlar" msgid "You are not subscribed to that profile." msgstr "Bize o profili yollamadınız" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "Abonelik oluşturulamadı." @@ -4584,39 +4588,39 @@ msgstr "Durum mesajını kaydederken hata oluştu." msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 #, fuzzy msgid "User has blocked you." msgstr "Kullanıcının profili yok." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Abonelik silinemedi." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Abonelik silinemedi." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Abonelik silinemedi." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4924,22 +4928,22 @@ msgstr "« Sonra" msgid "Before" msgstr "Önce »" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5430,20 +5434,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Onay kodu yok." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5628,42 +5632,42 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Desteklenmeyen görüntü dosyası biçemi." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Kısmi yükleme." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Dosya yüklemede sistem hatası." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Bu bir resim dosyası değil ya da dosyada hata var" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "Böyle bir durum mesajı yok." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6127,7 +6131,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Abonelikler" @@ -6135,7 +6139,7 @@ msgstr "Abonelikler" msgid "All subscriptions" msgstr "Bütün abonelikler" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Abone olanlar" @@ -6144,15 +6148,20 @@ msgstr "Abone olanlar" msgid "All subscribers" msgstr "Abone olanlar" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Üyelik başlangıcı" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "" @@ -6334,6 +6343,11 @@ msgstr "" msgid "Unsubscribe" msgstr "Aboneliği sonlandır" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Kullanıcının profili yok." + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 39b7d186b..8121f2068 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:42+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:11:12+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -772,23 +772,28 @@ msgstr "Завантажити" msgid "Crop" msgstr "Втяти" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Не визначено жодного профілю." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "Оберіть квадратну ділянку зображення, яка й буде Вашою автарою." -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "Дані Вашого файлу десь загубились." -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Аватару оновлено." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Оновлення аватари невдале." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 msgid "Avatar deleted." msgstr "Аватару видалено." @@ -926,7 +931,7 @@ msgid "Conversation" msgstr "Розмова" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Дописи" @@ -1744,7 +1749,7 @@ msgstr "%s стрічка" msgid "Updates from members of %1$s on %2$s!" msgstr "Оновлення членів %1$s на %2$s!" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "Групи" @@ -3405,7 +3410,7 @@ msgid "Description" msgstr "Опис" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Статистика" @@ -3572,7 +3577,7 @@ msgid "Members" msgstr "Учасники" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "(Пусто)" @@ -3752,7 +3757,8 @@ msgid "Unknown language \"%s\"." msgstr "Невідома мова «%s»." #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +#, fuzzy +msgid "Minimum text limit is 0 (unlimited)." msgstr "Ліміт текстових повідомлень становить 140 знаків." #: actions/siteadminpanel.php:171 @@ -4026,8 +4032,7 @@ msgstr "Зберегти налаштування знімку" msgid "You are not subscribed to that profile." msgstr "Ви не підписані до цього профілю." -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 msgid "Could not save subscription." msgstr "Не вдалося зберегти підписку." @@ -4608,35 +4613,35 @@ msgstr "Проблема при збереженні вхідних дописі msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "Вас позбавлено можливості підписатись." -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "Вже підписаний!" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "Користувач заблокував Вас." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 msgid "Not subscribed!" msgstr "Не підписано!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 msgid "Couldn't delete self-subscription." msgstr "Не можу видалити самопідписку." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 msgid "Couldn't delete subscription OMB token." msgstr "Не вдається видалити токен підписки OMB." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Не вдалося видалити підписку." -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Вітаємо на %1$s, @%2$s!" @@ -4921,22 +4926,23 @@ msgstr "Вперед" msgid "Before" msgstr "Назад" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" +"В очікуванні кореневого елементу веб-стрічки, отримали цілий документ XML." + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "Поки що не можу обробити віддалений контент." -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "Поки що не можу обробити вбудований XML контент." -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "Поки що не можу обробити вбудований контент Base64." -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5448,19 +5454,19 @@ msgstr "" "tracks — наразі не виконується\n" "tracking — наразі не виконується\n" -#: lib/common.php:136 +#: lib/common.php:135 msgid "No configuration file found. " msgstr "Файлу конфігурації не знайдено. " -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "Шукав файли конфігурації в цих місцях: " -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "Запустіть файл інсталяції, аби полагодити це." -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "Іти до файлу інсталяції." @@ -5637,40 +5643,40 @@ msgstr "Теґи у дописах групи %s" msgid "This page is not available in a media type you accept" msgstr "Ця сторінка не доступна для того типу медіа, з яким ви погодились" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Формат зображення не підтримується." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "Цей файл завеликий. Максимальний розмір %s." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Часткове завантаження." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Система відповіла помилкою при завантаженні цього файла." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "Це не зображення, або файл зіпсовано." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 msgid "Lost our file." msgstr "Файл втрачено." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "Тип файлу не підтримується" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "Мб" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "кб" @@ -6204,7 +6210,7 @@ msgstr "Теґи у дописах %s" msgid "Unknown" msgstr "Невідомо" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Підписки" @@ -6212,7 +6218,7 @@ msgstr "Підписки" msgid "All subscriptions" msgstr "Всі підписки" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Підписчики" @@ -6220,15 +6226,20 @@ msgstr "Підписчики" msgid "All subscribers" msgstr "Всі підписчики" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "ІД" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "З нами від" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "Всі групи" @@ -6399,6 +6410,11 @@ msgstr "Відписатись від цього користувача" msgid "Unsubscribe" msgstr "Відписатись" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Користувач не має профілю." + #: lib/userprofile.php:117 msgid "Edit Avatar" msgstr "Аватара" @@ -6409,7 +6425,7 @@ msgstr "Діяльність користувача" #: lib/userprofile.php:237 msgid "User deletion in progress..." -msgstr "" +msgstr "Видалення користувача у процесі..." #: lib/userprofile.php:263 msgid "Edit profile settings" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index 0f560f41d..c934fa28d 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:45+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:11:15+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -790,23 +790,28 @@ msgstr "Tải file" msgid "Crop" msgstr "Nhóm" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "Upload từng phần." + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "Hình đại diện đã được cập nhật." -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "Cập nhật hình đại diện không thành công." -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "Hình đại diện đã được cập nhật." @@ -950,7 +955,7 @@ msgid "Conversation" msgstr "Không có mã số xác nhận." #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "Tin nhắn" @@ -1842,7 +1847,7 @@ msgstr "Dòng tin nhắn của %s" msgid "Updates from members of %1$s on %2$s!" msgstr "Dòng tin nhắn cho %s" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 #, fuzzy msgid "Groups" @@ -3537,7 +3542,7 @@ msgid "Description" msgstr "Mô tả" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "Số liệu thống kê" @@ -3698,7 +3703,7 @@ msgid "Members" msgstr "Thành viên" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3864,7 +3869,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4155,8 +4160,7 @@ msgstr "Thay đổi hình đại diện" 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 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "Không thể tạo đăng nhận." @@ -4737,39 +4741,39 @@ msgstr "Có lỗi xảy ra khi lưu tin nhắn." msgid "RT @%1$s %2$s" msgstr "%s (%s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 #, fuzzy msgid "User has blocked you." msgstr "Người dùng không có thông tin." -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "Chưa đăng nhận!" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Không thể xóa đăng nhận." -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "Không thể xóa đăng nhận." -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "Không thể xóa đăng nhận." -#: classes/User.php:378 +#: classes/User.php:363 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%s chào mừng bạn " @@ -5081,22 +5085,22 @@ msgstr "Sau" msgid "Before" msgstr "Trước" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 #, fuzzy @@ -5595,20 +5599,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "Không có mã số xác nhận." -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5798,44 +5802,44 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "Trang này không phải là phương tiện truyền thông mà bạn chấp nhận." -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "Không hỗ trợ kiểu file ảnh này." -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" "Bạn có thể cập nhật hồ sơ cá nhân tại đây để mọi người có thể biết thông tin " "về bạn." -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "Upload từng phần." -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "Hệ thống xảy ra lỗi trong khi tải file." -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "File hỏng hoặc không phải là file ảnh." -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "Không có tin nhắn nào." -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 #, fuzzy msgid "Unknown file type" msgstr "Không hỗ trợ kiểu file ảnh này." -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6357,7 +6361,7 @@ msgstr "cảnh báo tin nhắn" msgid "Unknown" msgstr "Không tìm thấy action" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "Tôi theo bạn này" @@ -6365,7 +6369,7 @@ msgstr "Tôi theo bạn này" msgid "All subscriptions" msgstr "Tất cả đăng nhận" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "Bạn này theo tôi" @@ -6374,15 +6378,20 @@ msgstr "Bạn này theo tôi" msgid "All subscribers" msgstr "Bạn này theo tôi" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "Gia nhập từ" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 #, fuzzy msgid "All groups" msgstr "Nhóm" @@ -6573,6 +6582,11 @@ msgstr "Ngừng đăng ký từ người dùng này" msgid "Unsubscribe" msgstr "Hết theo" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "Người dùng không có thông tin." + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index a5cef8add..f67435d91 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:49+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:11:18+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -784,23 +784,28 @@ msgstr "上传" msgid "Crop" msgstr "剪裁" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +#, fuzzy +msgid "No file uploaded." +msgstr "没有收件人。" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "请选择一块方形区域作为你的头像" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "文件数据丢失" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "头像已更新。" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "更新头像失败。" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "头像已更新。" @@ -946,7 +951,7 @@ msgid "Conversation" msgstr "确认码" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "通告" @@ -1819,7 +1824,7 @@ msgstr "%s 时间表" msgid "Updates from members of %1$s on %2$s!" msgstr "%2$s 上 %1$s 的更新！" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "组" @@ -3472,7 +3477,7 @@ msgid "Description" msgstr "描述" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "统计" @@ -3633,7 +3638,7 @@ msgid "Members" msgstr "注册于" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "（没有）" @@ -3802,7 +3807,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -4084,8 +4089,7 @@ msgstr "头像设置" msgid "You are not subscribed to that profile." msgstr "您未告知此个人信息" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "无法删除订阅。" @@ -4664,40 +4668,40 @@ msgstr "保存通告时出错。" msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 #, fuzzy msgid "You have been banned from subscribing." msgstr "那个用户阻止了你的订阅。" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 #, fuzzy msgid "User has blocked you." msgstr "用户没有个人信息。" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "未订阅！" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "无法删除订阅。" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "无法删除订阅。" -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "无法删除订阅。" -#: classes/User.php:378 +#: classes/User.php:363 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "发送给 %1$s 的 %2$s 消息" @@ -5009,22 +5013,22 @@ msgstr "« 之后" msgid "Before" msgstr "之前 »" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 #, fuzzy @@ -5517,20 +5521,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "没有验证码" -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 #, fuzzy msgid "Go to the installer." msgstr "登入本站" @@ -5718,41 +5722,41 @@ msgstr "这个组所发布的消息的标签" msgid "This page is not available in a media type you accept" msgstr "这个页面不提供您想要的媒体类型" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "不支持这种图像格式。" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, fuzzy, php-format msgid "That file is too big. The maximum file size is %s." msgstr "你可以给你的组上载一个logo图。" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "部分上传。" -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "上传文件时出错。" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "不是图片文件或文件已损坏。" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "没有这份通告。" -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "未知文件类型" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6230,7 +6234,7 @@ msgstr "%s's 的消息的标签" msgid "Unknown" msgstr "未知动作" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "订阅" @@ -6238,7 +6242,7 @@ msgstr "订阅" msgid "All subscriptions" msgstr "所有订阅" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "订阅者" @@ -6247,16 +6251,21 @@ msgstr "订阅者" msgid "All subscribers" msgstr "订阅者" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 #, fuzzy msgid "User ID" msgstr "用户" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "用户始于" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "所有组" @@ -6444,6 +6453,11 @@ msgstr "取消订阅 %s" msgid "Unsubscribe" msgstr "退订" +#: lib/usernoprofileexception.php:58 +#, fuzzy, php-format +msgid "User %s (%d) has no profile record." +msgstr "用户没有个人信息。" + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index a7b777d9d..6b5c237b5 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-03-17 21:39+0000\n" -"PO-Revision-Date: 2010-03-17 21:41:53+0000\n" +"POT-Creation-Date: 2010-03-23 20:09+0000\n" +"PO-Revision-Date: 2010-03-23 20:11:21+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.17alpha (r63880); Translate extension (2010-01-16)\n" +"X-Generator: MediaWiki 1.17alpha (r64087); 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" @@ -774,23 +774,27 @@ msgstr "" msgid "Crop" msgstr "" -#: actions/avatarsettings.php:328 +#: actions/avatarsettings.php:305 +msgid "No file uploaded." +msgstr "" + +#: actions/avatarsettings.php:332 msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:380 +#: actions/avatarsettings.php:347 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" -#: actions/avatarsettings.php:366 +#: actions/avatarsettings.php:370 msgid "Avatar updated." msgstr "更新個人圖像" -#: actions/avatarsettings.php:369 +#: actions/avatarsettings.php:373 msgid "Failed updating avatar." msgstr "無法上傳個人圖像" -#: actions/avatarsettings.php:393 +#: actions/avatarsettings.php:397 #, fuzzy msgid "Avatar deleted." msgstr "更新個人圖像" @@ -935,7 +939,7 @@ msgid "Conversation" msgstr "地點" #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87 -#: lib/profileaction.php:218 lib/searchgroupnav.php:82 +#: lib/profileaction.php:224 lib/searchgroupnav.php:82 msgid "Notices" msgstr "" @@ -1777,7 +1781,7 @@ msgstr "" msgid "Updates from members of %1$s on %2$s!" msgstr "&s的微型部落格" -#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232 +#: actions/groups.php:62 lib/profileaction.php:218 lib/profileaction.php:244 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98 msgid "Groups" msgstr "" @@ -3348,7 +3352,7 @@ msgid "Description" msgstr "所有訂閱" #: actions/showapplication.php:192 actions/showgroup.php:439 -#: lib/profileaction.php:176 +#: lib/profileaction.php:182 msgid "Statistics" msgstr "" @@ -3507,7 +3511,7 @@ msgid "Members" msgstr "何時加入會員的呢？" #: actions/showgroup.php:396 lib/profileaction.php:117 -#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95 +#: lib/profileaction.php:150 lib/profileaction.php:250 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" @@ -3669,7 +3673,7 @@ msgid "Unknown language \"%s\"." msgstr "" #: actions/siteadminpanel.php:165 -msgid "Minimum text limit is 140 characters." +msgid "Minimum text limit is 0 (unlimited)." msgstr "" #: actions/siteadminpanel.php:171 @@ -3942,8 +3946,7 @@ msgstr "線上即時通設定" msgid "You are not subscribed to that profile." msgstr "" -#: actions/subedit.php:83 classes/Subscription.php:89 -#: classes/Subscription.php:116 +#: actions/subedit.php:83 classes/Subscription.php:132 #, fuzzy msgid "Could not save subscription." msgstr "註冊失敗" @@ -4501,38 +4504,38 @@ msgstr "儲存使用者發生錯誤" msgid "RT @%1$s %2$s" msgstr "" -#: classes/Subscription.php:66 lib/oauthstore.php:465 +#: classes/Subscription.php:74 lib/oauthstore.php:465 msgid "You have been banned from subscribing." msgstr "" -#: classes/Subscription.php:70 +#: classes/Subscription.php:78 msgid "Already subscribed!" msgstr "" -#: classes/Subscription.php:74 +#: classes/Subscription.php:82 msgid "User has blocked you." msgstr "" -#: classes/Subscription.php:157 +#: classes/Subscription.php:167 #, fuzzy msgid "Not subscribed!" msgstr "此帳號已註冊" -#: classes/Subscription.php:163 +#: classes/Subscription.php:173 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "無法刪除帳號" -#: classes/Subscription.php:190 +#: classes/Subscription.php:200 #, fuzzy msgid "Couldn't delete subscription OMB token." msgstr "無法刪除帳號" -#: classes/Subscription.php:201 +#: classes/Subscription.php:211 msgid "Couldn't delete subscription." msgstr "無法刪除帳號" -#: classes/User.php:378 +#: classes/User.php:363 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4834,22 +4837,22 @@ msgstr "" msgid "Before" msgstr "之前的內容»" -#: lib/activity.php:453 +#: lib/activity.php:120 +msgid "Expecting a root feed element but got a whole XML document." +msgstr "" + +#: lib/activityutils.php:208 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:481 +#: lib/activityutils.php:236 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:485 +#: lib/activityutils.php:240 msgid "Can't handle embedded Base64 content yet." msgstr "" -#: lib/activity.php:1089 -msgid "Expecting a root feed element but got a whole XML document." -msgstr "" - #. TRANS: Client error message #: lib/adminpanelaction.php:98 msgid "You cannot make changes to this site." @@ -5329,20 +5332,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:136 +#: lib/common.php:135 #, fuzzy msgid "No configuration file found. " msgstr "無確認碼" -#: lib/common.php:137 +#: lib/common.php:136 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:139 +#: lib/common.php:138 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:140 +#: lib/common.php:139 msgid "Go to the installer." msgstr "" @@ -5522,41 +5525,41 @@ msgstr "" msgid "This page is not available in a media type you accept" msgstr "" -#: lib/imagefile.php:74 +#: lib/imagefile.php:72 msgid "Unsupported image file format." msgstr "" -#: lib/imagefile.php:90 +#: lib/imagefile.php:88 #, php-format msgid "That file is too big. The maximum file size is %s." msgstr "" -#: lib/imagefile.php:95 +#: lib/imagefile.php:93 msgid "Partial upload." msgstr "" -#: lib/imagefile.php:103 lib/mediafile.php:170 +#: lib/imagefile.php:101 lib/mediafile.php:170 msgid "System error uploading file." msgstr "" -#: lib/imagefile.php:111 +#: lib/imagefile.php:109 msgid "Not an image or corrupt file." msgstr "" -#: lib/imagefile.php:124 +#: lib/imagefile.php:122 #, fuzzy msgid "Lost our file." msgstr "無此通知" -#: lib/imagefile.php:168 lib/imagefile.php:233 +#: lib/imagefile.php:163 lib/imagefile.php:224 msgid "Unknown file type" msgstr "" -#: lib/imagefile.php:253 +#: lib/imagefile.php:244 msgid "MB" msgstr "" -#: lib/imagefile.php:255 +#: lib/imagefile.php:246 msgid "kB" msgstr "" @@ -6018,7 +6021,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82 +#: lib/profileaction.php:109 lib/profileaction.php:200 lib/subgroupnav.php:82 msgid "Subscriptions" msgstr "" @@ -6026,7 +6029,7 @@ msgstr "" msgid "All subscriptions" msgstr "所有訂閱" -#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90 +#: lib/profileaction.php:142 lib/profileaction.php:209 lib/subgroupnav.php:90 msgid "Subscribers" msgstr "" @@ -6035,15 +6038,20 @@ msgstr "" msgid "All subscribers" msgstr "所有訂閱" -#: lib/profileaction.php:180 +#: lib/profileaction.php:186 msgid "User ID" msgstr "" -#: lib/profileaction.php:185 +#: lib/profileaction.php:191 msgid "Member since" msgstr "何時加入會員的呢？" -#: lib/profileaction.php:247 +#. TRANS: Average count of posts made per day since account registration +#: lib/profileaction.php:230 +msgid "Daily average" +msgstr "" + +#: lib/profileaction.php:259 msgid "All groups" msgstr "" @@ -6222,6 +6230,11 @@ msgstr "" msgid "Unsubscribe" msgstr "" +#: lib/usernoprofileexception.php:58 +#, php-format +msgid "User %s (%d) has no profile record." +msgstr "" + #: lib/userprofile.php:117 #, fuzzy msgid "Edit Avatar" -- cgit v1.2.3-54-g00ecf From 5f32cf32cd7d4a5df7ba64d4f1e7d9edee8d418c Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 14:18:45 -0700 Subject: Don't spew XML parse warnings to output when checking a remote XRD page --- plugins/OStatus/lib/xrd.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/OStatus/lib/xrd.php b/plugins/OStatus/lib/xrd.php index aa13ef024..34b28790b 100644 --- a/plugins/OStatus/lib/xrd.php +++ b/plugins/OStatus/lib/xrd.php @@ -53,7 +53,14 @@ class XRD $xrd = new XRD(); $dom = new DOMDocument(); - if (!$dom->loadXML($xml)) { + + // Don't spew XML warnings to output + $old = error_reporting(); + error_reporting($old & ~E_WARNING); + $ok = $dom->loadXML($xml); + error_reporting($old); + + if (!$ok) { throw new Exception("Invalid XML"); } $xrd_element = $dom->getElementsByTagName('XRD')->item(0); -- cgit v1.2.3-54-g00ecf From df8c9090c0deabe20b804e0fd0766d6b86b7968f Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 14:19:12 -0700 Subject: Add basic subscribe/unsubscribe test to OStatus test cases --- plugins/OStatus/tests/remote-tests.php | 176 +++++++++++++++++++++++++++++---- 1 file changed, 157 insertions(+), 19 deletions(-) diff --git a/plugins/OStatus/tests/remote-tests.php b/plugins/OStatus/tests/remote-tests.php index 103ca066c..b06411491 100644 --- a/plugins/OStatus/tests/remote-tests.php +++ b/plugins/OStatus/tests/remote-tests.php @@ -40,6 +40,20 @@ class TestBase } return true; } + + function assertTrue($a) + { + if (!$a) { + throw new Exception("Failed to assert true: got false"); + } + } + + function assertFalse($a) + { + if ($a) { + throw new Exception("Failed to assert false: got true"); + } + } } class OStatusTester extends TestBase @@ -60,8 +74,12 @@ class OStatusTester extends TestBase function run() { $this->setup(); + $this->testLocalPost(); $this->testMentionUrl(); + $this->testSubscribe(); + $this->testUnsubscribe(); + $this->log("DONE!"); } @@ -98,6 +116,25 @@ class OStatusTester extends TestBase $post = $this->pub->post("@$base/$name should have this in home and replies"); $this->sub->assertReceived($post); } + + function testSubscribe() + { + $this->assertFalse($this->sub->hasSubscription($this->pub->getProfileUri())); + $this->assertFalse($this->pub->hasSubscriber($this->sub->getProfileUri())); + $this->sub->subscribe($this->pub->getProfileLink()); + $this->assertTrue($this->sub->hasSubscription($this->pub->getProfileUri())); + $this->assertTrue($this->pub->hasSubscriber($this->sub->getProfileUri())); + } + + function testUnsubscribe() + { + $this->assertTrue($this->sub->hasSubscription($this->pub->getProfileUri())); + $this->assertTrue($this->pub->hasSubscriber($this->sub->getProfileUri())); + $this->sub->unsubscribe($this->pub->getProfileLink()); + $this->assertFalse($this->sub->hasSubscription($this->pub->getProfileUri())); + $this->assertFalse($this->pub->hasSubscriber($this->sub->getProfileUri())); + } + } class SNTestClient extends TestBase @@ -202,6 +239,43 @@ class SNTestClient extends TestBase return $dom; } + protected function parseXml($path, $body) + { + $dom = new DOMDocument(); + if ($dom->loadXML($body)) { + return $dom; + } else { + throw new Exception("Bogus XML data from $path:\n$body"); + } + } + + /** + * Make a hit to a REST-y XML page on the site, without authentication. + * @param string $path URL fragment for something relative to base + * @param array $params POST parameters to send + * @return DOMDocument + * @throws Exception on low-level error conditions + */ + protected function xml($path, $params=array()) + { + $response = $this->hit($path, $params, true); + $body = $response->getBody(); + return $this->parseXml($path, $body); + } + + protected function parseJson($path, $body) + { + $data = json_decode($body, true); + if ($data !== null) { + if (!empty($data['error'])) { + throw new Exception("JSON API returned error: " . $data['error']); + } + return $data; + } else { + throw new Exception("Bogus JSON data from $path:\n$body"); + } + } + /** * Make an API hit to this site, with authentication. * @param string $path URL fragment for something under 'api' folder @@ -215,22 +289,9 @@ class SNTestClient extends TestBase $response = $this->hit("api/$path.$style", $params, true); $body = $response->getBody(); if ($style == 'json') { - $data = json_decode($body, true); - if ($data !== null) { - if (!empty($data['error'])) { - throw new Exception("JSON API returned error: " . $data['error']); - } - return $data; - } else { - throw new Exception("Bogus JSON data from $path:\n$body"); - } + return $this->parseJson($path, $body); } else if ($style == 'xml' || $style == 'atom') { - $dom = new DOMDocument(); - if ($dom->loadXML($body)) { - return $dom; - } else { - throw new Exception("Bogus XML data from $path:\n$body"); - } + return $this->parseXml($path, $body); } else { throw new Exception("API needs to be JSON, XML, or Atom"); } @@ -257,6 +318,24 @@ class SNTestClient extends TestBase 'submit' => 'Register')); } + /** + * @return string canonical URI/URL to profile page + */ + function getProfileUri() + { + $data = $this->api('account/verify_credentials', 'json'); + $id = $data['id']; + return $this->basepath . '/user/' . $id; + } + + /** + * @return string human-friendly URL to profile page + */ + function getProfileLink() + { + return $this->basepath . '/' . $this->username; + } + /** * Check that the account has been registered and can be used. * On failure, throws a test failure exception. @@ -349,22 +428,81 @@ class SNTestClient extends TestBase return false; } + /** + * @param string $profile user page link or webfinger + */ + function subscribe($profile) + { + // This uses the command interface, since there's not currently + // a friendly Twit-API way to do a fresh remote subscription and + // the web form's a pain to use. + $this->post('follow ' . $profile); + } + + /** + * @param string $profile user page link or webfinger + */ + function unsubscribe($profile) + { + // This uses the command interface, since there's not currently + // a friendly Twit-API way to do a fresh remote subscription and + // the web form's a pain to use. + $this->post('leave ' . $profile); + } + /** * Check that this account is subscribed to the given profile. * @param string $profile_uri URI for the profile to check for + * @return boolean */ - function assertHasSubscription($profile_uri) + function hasSubscription($profile_uri) { - throw new Exception('tbi'); + $this->log("Checking if $this->username has a subscription to $profile_uri"); + + $me = $this->getProfileUri(); + return $this->checkSubscription($me, $profile_uri); } /** * Check that this account is subscribed to by the given profile. * @param string $profile_uri URI for the profile to check for + * @return boolean */ - function assertHasSubscriber($profile_uri) + function hasSubscriber($profile_uri) + { + $this->log("Checking if $this->username is subscribed to by $profile_uri"); + + $me = $this->getProfileUri(); + return $this->checkSubscription($profile_uri, $me); + } + + protected function checkSubscription($subscriber, $subscribed) { - throw new Exception('tbi'); + // Using FOAF as the API methods for checking the social graph + // currently are unfriendly to remote profiles + $ns_foaf = 'http://xmlns.com/foaf/0.1/'; + $ns_sioc = 'http://rdfs.org/sioc/ns#'; + $ns_rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'; + + $dom = $this->xml($this->username . '/foaf'); + $agents = $dom->getElementsByTagNameNS($ns_foaf, 'Agent'); + foreach ($agents as $agent) { + $agent_uri = $agent->getAttributeNS($ns_rdf, 'about'); + if ($agent_uri == $subscriber) { + $follows = $agent->getElementsByTagNameNS($ns_sioc, 'follows'); + foreach ($follows as $follow) { + $target = $follow->getAttributeNS($ns_rdf, 'resource'); + if ($target == ($subscribed . '#acct')) { + $this->log("Confirmed $subscriber subscribed to $subscribed"); + return true; + } + } + $this->log("We found $subscriber but they don't follow $subscribed"); + return false; + } + } + $this->log("Can't find $subscriber in {$this->username}'s social graph."); + return false; } } -- cgit v1.2.3-54-g00ecf From 13d59e0c76b887a2bfd2e5cfcc2e0fedf728bc07 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 17:24:01 -0700 Subject: fixup_deletions.php script to look for notices posted by now-deleted profiles and remove them. --- classes/Notice.php | 4 +- scripts/fixup_deletions.php | 166 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+), 1 deletion(-) create mode 100755 scripts/fixup_deletions.php diff --git a/classes/Notice.php b/classes/Notice.php index f7194e339..be3e9ca2a 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -421,7 +421,9 @@ class Notice extends Memcached_DataObject } $profile = Profile::staticGet($this->profile_id); - $profile->blowNoticeCount(); + if (!empty($profile)) { + $profile->blowNoticeCount(); + } } /** diff --git a/scripts/fixup_deletions.php b/scripts/fixup_deletions.php new file mode 100755 index 000000000..07ada7f9d --- /dev/null +++ b/scripts/fixup_deletions.php @@ -0,0 +1,166 @@ +#!/usr/bin/env php +. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); + +$longoptions = array('dry-run', 'start=', 'end='); + +$helptext = <<query($query); + + if ($profile->fetch()) { + return intval($profile->id); + } else { + die("Something went awry; could not look up max used profile_id."); + } +} + +/** + * Check for profiles in the given id range that are missing, presumed deleted. + * + * @param int $start beginning profile.id, inclusive + * @param int $end final profile.id, inclusive + * @return array of integer profile.ids + * @access private + */ +function get_missing_profiles($start, $end) +{ + $query = sprintf("SELECT id FROM profile WHERE id BETWEEN %d AND %d", + $start, $end); + + $profile = new Profile(); + $profile->query($query); + + $all = range($start, $end); + $known = array(); + while ($row = $profile->fetch()) { + $known[] = intval($profile->id); + } + unset($profile); + + $missing = array_diff($all, $known); + return $missing; +} + +/** + * Look for stray notices from this profile and, if present, kill them. + * + * @param int $profile_id + * @param bool $dry if true, we won't delete anything + */ +function cleanup_missing_profile($profile_id, $dry) +{ + $notice = new Notice(); + $notice->profile_id = $profile_id; + $notice->find(); + if ($notice->N == 0) { + return; + } + + $s = ($notice->N == 1) ? '' : 's'; + print "Deleted profile $profile_id has $notice->N stray notice$s:\n"; + + while ($notice->fetch()) { + print " notice $notice->id"; + if ($dry) { + print " (skipped; dry run)\n"; + } else { + $victim = clone($notice); + try { + $victim->delete(); + print " (deleted)\n"; + } catch (Exception $e) { + print " FAILED: "; + print $e->getMessage(); + print "\n"; + } + } + } +} + +$dry = have_option('dry-run'); + +$max_profile_id = get_max_profile_id(); +$chunk = 1000; + +if (have_option('start')) { + $begin = intval(get_option_value('start')); +} else { + $begin = 1; +} +if (have_option('end')) { + $final = min($max_profile_id, intval(get_option_value('end'))); +} else { + $final = $max_profile_id; +} + +if ($begin < 1) { + die("Silly human, you can't begin before profile number 1!\n"); +} +if ($final < $begin) { + die("Silly human, you can't end at $final if it's before $begin!\n"); +} + +// Identify missing profiles... +for ($start = $begin; $start <= $final; $start += $chunk) { + $end = min($start + $chunk - 1, $final); + + print "Checking for missing profiles between id $start and $end"; + if ($dry) { + print " (dry run)"; + } + print "...\n"; + $missing = get_missing_profiles($start, $end); + + foreach ($missing as $profile_id) { + cleanup_missing_profile($profile_id, $dry); + } +} + +echo "done.\n"; + -- cgit v1.2.3-54-g00ecf From 5e76e0c8ac1dad9a110b005faad3c6a95d737b9b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 17:24:01 -0700 Subject: fixup_deletions.php script to look for notices posted by now-deleted profiles and remove them. --- classes/Notice.php | 4 +- scripts/fixup_deletions.php | 166 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+), 1 deletion(-) create mode 100755 scripts/fixup_deletions.php diff --git a/classes/Notice.php b/classes/Notice.php index 4c7e6ab4b..1b2406fdd 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -418,7 +418,9 @@ class Notice extends Memcached_DataObject } $profile = Profile::staticGet($this->profile_id); - $profile->blowNoticeCount(); + if (!empty($profile)) { + $profile->blowNoticeCount(); + } } /** save all urls in the notice to the db diff --git a/scripts/fixup_deletions.php b/scripts/fixup_deletions.php new file mode 100755 index 000000000..07ada7f9d --- /dev/null +++ b/scripts/fixup_deletions.php @@ -0,0 +1,166 @@ +#!/usr/bin/env php +. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); + +$longoptions = array('dry-run', 'start=', 'end='); + +$helptext = <<query($query); + + if ($profile->fetch()) { + return intval($profile->id); + } else { + die("Something went awry; could not look up max used profile_id."); + } +} + +/** + * Check for profiles in the given id range that are missing, presumed deleted. + * + * @param int $start beginning profile.id, inclusive + * @param int $end final profile.id, inclusive + * @return array of integer profile.ids + * @access private + */ +function get_missing_profiles($start, $end) +{ + $query = sprintf("SELECT id FROM profile WHERE id BETWEEN %d AND %d", + $start, $end); + + $profile = new Profile(); + $profile->query($query); + + $all = range($start, $end); + $known = array(); + while ($row = $profile->fetch()) { + $known[] = intval($profile->id); + } + unset($profile); + + $missing = array_diff($all, $known); + return $missing; +} + +/** + * Look for stray notices from this profile and, if present, kill them. + * + * @param int $profile_id + * @param bool $dry if true, we won't delete anything + */ +function cleanup_missing_profile($profile_id, $dry) +{ + $notice = new Notice(); + $notice->profile_id = $profile_id; + $notice->find(); + if ($notice->N == 0) { + return; + } + + $s = ($notice->N == 1) ? '' : 's'; + print "Deleted profile $profile_id has $notice->N stray notice$s:\n"; + + while ($notice->fetch()) { + print " notice $notice->id"; + if ($dry) { + print " (skipped; dry run)\n"; + } else { + $victim = clone($notice); + try { + $victim->delete(); + print " (deleted)\n"; + } catch (Exception $e) { + print " FAILED: "; + print $e->getMessage(); + print "\n"; + } + } + } +} + +$dry = have_option('dry-run'); + +$max_profile_id = get_max_profile_id(); +$chunk = 1000; + +if (have_option('start')) { + $begin = intval(get_option_value('start')); +} else { + $begin = 1; +} +if (have_option('end')) { + $final = min($max_profile_id, intval(get_option_value('end'))); +} else { + $final = $max_profile_id; +} + +if ($begin < 1) { + die("Silly human, you can't begin before profile number 1!\n"); +} +if ($final < $begin) { + die("Silly human, you can't end at $final if it's before $begin!\n"); +} + +// Identify missing profiles... +for ($start = $begin; $start <= $final; $start += $chunk) { + $end = min($start + $chunk - 1, $final); + + print "Checking for missing profiles between id $start and $end"; + if ($dry) { + print " (dry run)"; + } + print "...\n"; + $missing = get_missing_profiles($start, $end); + + foreach ($missing as $profile_id) { + cleanup_missing_profile($profile_id, $dry); + } +} + +echo "done.\n"; + -- cgit v1.2.3-54-g00ecf From d9dcdf5b4966fc244fa9b6fa8415c2aeae6cbb47 Mon Sep 17 00:00:00 2001 From: Nick Holliday Date: Tue, 23 Mar 2010 22:30:02 +0000 Subject: Converts Spotify URI/HTTP Links to pretty ones. --- plugins/SpotifyPlugin.php | 113 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 plugins/SpotifyPlugin.php diff --git a/plugins/SpotifyPlugin.php b/plugins/SpotifyPlugin.php new file mode 100644 index 000000000..e7a5a5382 --- /dev/null +++ b/plugins/SpotifyPlugin.php @@ -0,0 +1,113 @@ +. + * + * @category Plugin + * @package StatusNet + * @author Nick Holliday + * @copyright Nick Holliday + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + * @see Event + */ +if (!defined('STATUSNET')) { + exit(1); +} +define('SPOTIFYPLUGIN_VERSION', '0.1'); + +/** + * Plugin to create pretty Spotify URLs + * + * The Spotify API is called before the notice is saved to gather artist and track information. + * + * @category Plugin + * @package StatusNet + * @author Nick Holliday + * @copyright Nick Holliday + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + * + * @see Event + */ + +class SpotifyPlugin extends Plugin +{ + + function __construct() + { + parent::__construct(); + } + + function onStartNoticeSave($notice) + { + $notice->rendered = preg_replace_callback('/spotify:[a-z]{5,6}:[a-z0-9]{22}/i', + "renderSpotifyURILink", + $notice->rendered); + + $notice->rendered = preg_replace_callback('/http:\/\/open.spotify.com\/[a-z]{5,6}\/[a-z0-9]{22}<\/a>/i', + "renderSpotifyHTTPLink", + $notice->rendered); + + return true; + } + + function userAgent() + { + return 'SpotifyPlugin/'.SPOTIFYPLUGIN_VERSION . + ' StatusNet/' . STATUSNET_VERSION; + } +} + +function doSpotifyLookup($uri, $isArtist) +{ + $request = HTTPClient::start(); + $response = $request->get('http://ws.spotify.com/lookup/1/?uri=' . $uri); + if ($response->isOk()) { + $xml = simplexml_load_string($response->getBody()); + + if($isArtist) + return $xml->name; + else + return $xml->artist->name . ' - ' . $xml->name; + } +} + +function renderSpotifyURILink($match) +{ + $isArtist = false; + if(preg_match('/artist/', $match[0]) > 0) $isArtist = true; + + $name = doSpotifyLookup($match[0], $isArtist); + return "" . $name . ""; +} + +function renderSpotifyHTTPLink($match) +{ + $match[0] = preg_replace('/http:\/\/open.spotify.com\//i', 'spotify:', $match[0]); + $match[0] = preg_replace('/<\/a>/', '', $match[0]); + $match[0] = preg_replace('/\//', ':', $match[0]); + + $isArtist = false; + if(preg_match('/artist/', $match[0]) > 0) $isArtist = true; + + $name = doSpotifyLookup($match[0], $isArtist); + return "" . $name . ""; +} -- cgit v1.2.3-54-g00ecf From 9380eed794e1bd419a4af4dcbbcd176f164112fc Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 18:44:54 -0700 Subject: add a general PuSHed post and an @-reply back to a subscribee by name to OStatus remote test cases --- plugins/OStatus/tests/remote-tests.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/plugins/OStatus/tests/remote-tests.php b/plugins/OStatus/tests/remote-tests.php index b06411491..a27ecb854 100644 --- a/plugins/OStatus/tests/remote-tests.php +++ b/plugins/OStatus/tests/remote-tests.php @@ -78,6 +78,8 @@ class OStatusTester extends TestBase $this->testLocalPost(); $this->testMentionUrl(); $this->testSubscribe(); + $this->testPush(); + $this->testMentionSubscribee(); $this->testUnsubscribe(); $this->log("DONE!"); @@ -126,6 +128,26 @@ class OStatusTester extends TestBase $this->assertTrue($this->pub->hasSubscriber($this->sub->getProfileUri())); } + function testPush() + { + $this->assertTrue($this->sub->hasSubscription($this->pub->getProfileUri())); + $this->assertTrue($this->pub->hasSubscriber($this->sub->getProfileUri())); + + $name = $this->sub->username; + $post = $this->pub->post("Regular post, which $name should get via PuSH"); + $this->sub->assertReceived($post); + } + + function testMentionSubscribee() + { + $this->assertTrue($this->sub->hasSubscription($this->pub->getProfileUri())); + $this->assertFalse($this->pub->hasSubscription($this->sub->getProfileUri())); + + $name = $this->pub->username; + $post = $this->sub->post("Just a quick note back to my remote subscribee @$name"); + $this->pub->assertReceived($post); + } + function testUnsubscribe() { $this->assertTrue($this->sub->hasSubscription($this->pub->getProfileUri())); -- cgit v1.2.3-54-g00ecf From 6b538cd9b31ffa25d2046e16d47a0cde26d0398f Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Tue, 23 Mar 2010 21:50:31 -0400 Subject: Fix some regressions caused by refactor of LDAP plugin --- .../LdapAuthenticationPlugin.php | 2 +- plugins/LdapCommon/LdapCommon.php | 24 +++++++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php index a55c45ff5..2e01738ec 100644 --- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -118,7 +118,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin function suggestNicknameForUsername($username) { - $entry = $this->ldap_get_user($username, $this->attributes); + $entry = $this->ldapCommon->get_user($username, $this->attributes); if(!$entry){ //this really shouldn't happen $nickname = $username; diff --git a/plugins/LdapCommon/LdapCommon.php b/plugins/LdapCommon/LdapCommon.php index 39d872df5..e2ca569f3 100644 --- a/plugins/LdapCommon/LdapCommon.php +++ b/plugins/LdapCommon/LdapCommon.php @@ -47,7 +47,7 @@ class LdapCommon public $uniqueMember_attribute = null; public $attributes=array(); public $password_encoding=null; - + public function __construct($config) { Event::addHandler('Autoload',array($this,'onAutoload')); @@ -68,7 +68,7 @@ class LdapCommon } function onAutoload($cls) - { + { switch ($cls) { case 'MemcacheSchemaCache': @@ -77,6 +77,15 @@ class LdapCommon case 'Net_LDAP2': require_once 'Net/LDAP2.php'; return false; + case 'Net_LDAP2_Filter': + require_once 'Net/LDAP2/Filter.php'; + return false; + case 'Net_LDAP2_Filter': + require_once 'Net/LDAP2/Filter.php'; + return false; + case 'Net_LDAP2_Entry': + require_once 'Net/LDAP2/Entry.php'; + return false; } } @@ -97,8 +106,9 @@ class LdapCommon $config = $this->ldap_config; } $config_id = crc32(serialize($config)); - $ldap = self::$ldap_connections[$config_id]; - if(! isset($ldap)) { + if(array_key_exists($config_id,self::$ldap_connections)) { + $ldap = self::$ldap_connections[$config_id]; + } else { //cannot use Net_LDAP2::connect() as StatusNet uses //PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError'); //PEAR handling can be overridden on instance objects, so we do that. @@ -197,10 +207,10 @@ class LdapCommon return false; } } - + /** * get an LDAP entry for a user with a given username - * + * * @param string $username * $param array $attributes LDAP attributes to retrieve * @return string DN @@ -212,7 +222,7 @@ class LdapCommon 'attributes' => $attributes ); $search = $ldap->search(null,$filter,$options); - + if (PEAR::isError($search)) { common_log(LOG_WARNING, 'Error while getting DN for user: '.$search->getMessage()); return false; -- cgit v1.2.3-54-g00ecf From fcf86b4fdf200b1f2955f4f93c5b85054c7254b7 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 23 Mar 2010 18:56:40 -0700 Subject: Improve legibility of OStatus remote tests output --- plugins/OStatus/tests/remote-tests.php | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/plugins/OStatus/tests/remote-tests.php b/plugins/OStatus/tests/remote-tests.php index a27ecb854..24b4b1660 100644 --- a/plugins/OStatus/tests/remote-tests.php +++ b/plugins/OStatus/tests/remote-tests.php @@ -75,13 +75,16 @@ class OStatusTester extends TestBase { $this->setup(); - $this->testLocalPost(); - $this->testMentionUrl(); - $this->testSubscribe(); - $this->testPush(); - $this->testMentionSubscribee(); - $this->testUnsubscribe(); + $methods = get_class_methods($this); + foreach ($methods as $method) { + if (strtolower(substr($method, 0, 4)) == 'test') { + print "\n"; + print "== $method ==\n"; + call_user_func(array($this, $method)); + } + } + print "\n"; $this->log("DONE!"); } @@ -372,6 +375,7 @@ class SNTestClient extends TestBase $this->assertEqual($this->fullname, $data['name']); $this->assertEqual($this->homepage, $data['url']); $this->assertEqual($this->bio, $data['description']); + $this->log(" looks good!"); } /** @@ -408,11 +412,11 @@ class SNTestClient extends TestBase } $tries--; if ($tries) { - $this->log("Didn't see it yet, waiting $timeout seconds"); + $this->log(" didn't see it yet, waiting $timeout seconds"); sleep($timeout); } } - throw new Exception("Message $notice_uri not received by $this->username"); + throw new Exception(" message $notice_uri not received by $this->username"); } /** @@ -442,10 +446,9 @@ class SNTestClient extends TestBase } foreach ($entries as $entry) { if ($entry->id == $notice_uri) { - $this->log("found it $notice_uri"); + $this->log(" found it $notice_uri"); return true; } - //$this->log("nope... " . $entry->id); } return false; } @@ -515,15 +518,15 @@ class SNTestClient extends TestBase foreach ($follows as $follow) { $target = $follow->getAttributeNS($ns_rdf, 'resource'); if ($target == ($subscribed . '#acct')) { - $this->log("Confirmed $subscriber subscribed to $subscribed"); + $this->log(" confirmed $subscriber subscribed to $subscribed"); return true; } } - $this->log("We found $subscriber but they don't follow $subscribed"); + $this->log(" we found $subscriber but they don't follow $subscribed"); return false; } } - $this->log("Can't find $subscriber in {$this->username}'s social graph."); + $this->log(" can't find $subscriber in {$this->username}'s social graph."); return false; } -- cgit v1.2.3-54-g00ecf From 1f73156daeef47cf8a7214936383fbc496255fd7 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Tue, 23 Mar 2010 21:57:47 -0400 Subject: Move the bundled Net/LDAP2 library to the LdapCommon directory --- extlib/Net/LDAP2.php | 1791 -------------------- extlib/Net/LDAP2/Entry.php | 1055 ------------ extlib/Net/LDAP2/Filter.php | 514 ------ extlib/Net/LDAP2/LDIF.php | 922 ---------- extlib/Net/LDAP2/RootDSE.php | 240 --- extlib/Net/LDAP2/Schema.php | 516 ------ extlib/Net/LDAP2/SchemaCache.interface.php | 59 - extlib/Net/LDAP2/Search.php | 614 ------- extlib/Net/LDAP2/SimpleFileSchemaCache.php | 97 -- extlib/Net/LDAP2/Util.php | 572 ------- plugins/LdapCommon/LdapCommon.php | 3 + plugins/LdapCommon/extlib/Net/LDAP2.php | 1791 ++++++++++++++++++++ plugins/LdapCommon/extlib/Net/LDAP2/Entry.php | 1055 ++++++++++++ plugins/LdapCommon/extlib/Net/LDAP2/Filter.php | 514 ++++++ plugins/LdapCommon/extlib/Net/LDAP2/LDIF.php | 922 ++++++++++ plugins/LdapCommon/extlib/Net/LDAP2/RootDSE.php | 240 +++ plugins/LdapCommon/extlib/Net/LDAP2/Schema.php | 516 ++++++ .../extlib/Net/LDAP2/SchemaCache.interface.php | 59 + plugins/LdapCommon/extlib/Net/LDAP2/Search.php | 614 +++++++ .../extlib/Net/LDAP2/SimpleFileSchemaCache.php | 97 ++ plugins/LdapCommon/extlib/Net/LDAP2/Util.php | 572 +++++++ 21 files changed, 6383 insertions(+), 6380 deletions(-) delete mode 100644 extlib/Net/LDAP2.php delete mode 100644 extlib/Net/LDAP2/Entry.php delete mode 100644 extlib/Net/LDAP2/Filter.php delete mode 100644 extlib/Net/LDAP2/LDIF.php delete mode 100644 extlib/Net/LDAP2/RootDSE.php delete mode 100644 extlib/Net/LDAP2/Schema.php delete mode 100644 extlib/Net/LDAP2/SchemaCache.interface.php delete mode 100644 extlib/Net/LDAP2/Search.php delete mode 100644 extlib/Net/LDAP2/SimpleFileSchemaCache.php delete mode 100644 extlib/Net/LDAP2/Util.php create mode 100644 plugins/LdapCommon/extlib/Net/LDAP2.php create mode 100644 plugins/LdapCommon/extlib/Net/LDAP2/Entry.php create mode 100644 plugins/LdapCommon/extlib/Net/LDAP2/Filter.php create mode 100644 plugins/LdapCommon/extlib/Net/LDAP2/LDIF.php create mode 100644 plugins/LdapCommon/extlib/Net/LDAP2/RootDSE.php create mode 100644 plugins/LdapCommon/extlib/Net/LDAP2/Schema.php create mode 100644 plugins/LdapCommon/extlib/Net/LDAP2/SchemaCache.interface.php create mode 100644 plugins/LdapCommon/extlib/Net/LDAP2/Search.php create mode 100644 plugins/LdapCommon/extlib/Net/LDAP2/SimpleFileSchemaCache.php create mode 100644 plugins/LdapCommon/extlib/Net/LDAP2/Util.php diff --git a/extlib/Net/LDAP2.php b/extlib/Net/LDAP2.php deleted file mode 100644 index 26f5e7560..000000000 --- a/extlib/Net/LDAP2.php +++ /dev/null @@ -1,1791 +0,0 @@ - -* @author Jan Wagner -* @author Del -* @author Benedikt Hallinger -* @copyright 2003-2007 Tarjej Huse, Jan Wagner, Del Elson, Benedikt Hallinger -* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 -* @version SVN: $Id: LDAP2.php 286788 2009-08-04 06:05:49Z beni $ -* @link http://pear.php.net/package/Net_LDAP2/ -*/ - -/** -* Package includes. -*/ -require_once 'PEAR.php'; -require_once 'Net/LDAP2/RootDSE.php'; -require_once 'Net/LDAP2/Schema.php'; -require_once 'Net/LDAP2/Entry.php'; -require_once 'Net/LDAP2/Search.php'; -require_once 'Net/LDAP2/Util.php'; -require_once 'Net/LDAP2/Filter.php'; -require_once 'Net/LDAP2/LDIF.php'; -require_once 'Net/LDAP2/SchemaCache.interface.php'; -require_once 'Net/LDAP2/SimpleFileSchemaCache.php'; - -/** -* Error constants for errors that are not LDAP errors. -*/ -define('NET_LDAP2_ERROR', 1000); - -/** -* Net_LDAP2 Version -*/ -define('NET_LDAP2_VERSION', '2.0.7'); - -/** -* Net_LDAP2 - manipulate LDAP servers the right way! -* -* @category Net -* @package Net_LDAP2 -* @author Tarjej Huse -* @author Jan Wagner -* @author Del -* @author Benedikt Hallinger -* @copyright 2003-2007 Tarjej Huse, Jan Wagner, Del Elson, Benedikt Hallinger -* @license http://www.gnu.org/copyleft/lesser.html LGPL -* @link http://pear.php.net/package/Net_LDAP2/ -*/ -class Net_LDAP2 extends PEAR -{ - /** - * Class configuration array - * - * host = the ldap host to connect to - * (may be an array of several hosts to try) - * port = the server port - * version = ldap version (defaults to v 3) - * starttls = when set, ldap_start_tls() is run after connecting. - * bindpw = no explanation needed - * binddn = the DN to bind as. - * basedn = ldap base - * options = hash of ldap options to set (opt => val) - * filter = default search filter - * scope = default search scope - * - * Newly added in 2.0.0RC4, for auto-reconnect: - * auto_reconnect = if set to true then the class will automatically - * attempt to reconnect to the LDAP server in certain - * failure conditionswhen attempting a search, or other - * LDAP operation. Defaults to false. Note that if you - * set this to true, calls to search() may block - * indefinitely if there is a catastrophic server failure. - * min_backoff = minimum reconnection delay period (in seconds). - * current_backoff = initial reconnection delay period (in seconds). - * max_backoff = maximum reconnection delay period (in seconds). - * - * @access protected - * @var array - */ - protected $_config = array('host' => 'localhost', - 'port' => 389, - 'version' => 3, - 'starttls' => false, - 'binddn' => '', - 'bindpw' => '', - 'basedn' => '', - 'options' => array(), - 'filter' => '(objectClass=*)', - 'scope' => 'sub', - 'auto_reconnect' => false, - 'min_backoff' => 1, - 'current_backoff' => 1, - 'max_backoff' => 32); - - /** - * List of hosts we try to establish a connection to - * - * @access protected - * @var array - */ - protected $_host_list = array(); - - /** - * List of hosts that are known to be down. - * - * @access protected - * @var array - */ - protected $_down_host_list = array(); - - /** - * LDAP resource link. - * - * @access protected - * @var resource - */ - protected $_link = false; - - /** - * Net_LDAP2_Schema object - * - * This gets set and returned by {@link schema()} - * - * @access protected - * @var object Net_LDAP2_Schema - */ - protected $_schema = null; - - /** - * Schema cacher function callback - * - * @see registerSchemaCache() - * @var string - */ - protected $_schema_cache = null; - - /** - * Cache for attribute encoding checks - * - * @access protected - * @var array Hash with attribute names as key and boolean value - * to determine whether they should be utf8 encoded or not. - */ - protected $_schemaAttrs = array(); - - /** - * Cache for rootDSE objects - * - * Hash with requested rootDSE attr names as key and rootDSE object as value - * - * Since the RootDSE object itself may request a rootDSE object, - * {@link rootDse()} caches successful requests. - * Internally, Net_LDAP2 needs several lookups to this object, so - * caching increases performance significally. - * - * @access protected - * @var array - */ - protected $_rootDSE_cache = array(); - - /** - * Returns the Net_LDAP2 Release version, may be called statically - * - * @static - * @return string Net_LDAP2 version - */ - public static function getVersion() - { - return NET_LDAP2_VERSION; - } - - /** - * Configure Net_LDAP2, connect and bind - * - * Use this method as starting point of using Net_LDAP2 - * to establish a connection to your LDAP server. - * - * Static function that returns either an error object or the new Net_LDAP2 - * object. Something like a factory. Takes a config array with the needed - * parameters. - * - * @param array $config Configuration array - * - * @access public - * @return Net_LDAP2_Error|Net_LDAP2 Net_LDAP2_Error or Net_LDAP2 object - */ - public static function &connect($config = array()) - { - $ldap_check = self::checkLDAPExtension(); - if (self::iserror($ldap_check)) { - return $ldap_check; - } - - @$obj = new Net_LDAP2($config); - - // todo? better errorhandling for setConfig()? - - // connect and bind with credentials in config - $err = $obj->bind(); - if (self::isError($err)) { - return $err; - } - - return $obj; - } - - /** - * Net_LDAP2 constructor - * - * Sets the config array - * - * Please note that the usual way of getting Net_LDAP2 to work is - * to call something like: - * $ldap = Net_LDAP2::connect($ldap_config); - * - * @param array $config Configuration array - * - * @access protected - * @return void - * @see $_config - */ - public function __construct($config = array()) - { - $this->PEAR('Net_LDAP2_Error'); - $this->setConfig($config); - } - - /** - * Sets the internal configuration array - * - * @param array $config Configuration array - * - * @access protected - * @return void - */ - protected function setConfig($config) - { - // - // Parameter check -- probably should raise an error here if config - // is not an array. - // - if (! is_array($config)) { - return; - } - - foreach ($config as $k => $v) { - if (isset($this->_config[$k])) { - $this->_config[$k] = $v; - } else { - // map old (Net_LDAP2) parms to new ones - switch($k) { - case "dn": - $this->_config["binddn"] = $v; - break; - case "password": - $this->_config["bindpw"] = $v; - break; - case "tls": - $this->_config["starttls"] = $v; - break; - case "base": - $this->_config["basedn"] = $v; - break; - } - } - } - - // - // Ensure the host list is an array. - // - if (is_array($this->_config['host'])) { - $this->_host_list = $this->_config['host']; - } else { - if (strlen($this->_config['host']) > 0) { - $this->_host_list = array($this->_config['host']); - } else { - $this->_host_list = array(); - // ^ this will cause an error in performConnect(), - // so the user is notified about the failure - } - } - - // - // Reset the down host list, which seems like a sensible thing to do - // if the config is being reset for some reason. - // - $this->_down_host_list = array(); - } - - /** - * Bind or rebind to the ldap-server - * - * This function binds with the given dn and password to the server. In case - * no connection has been made yet, it will be started and startTLS issued - * if appropiate. - * - * The internal bind configuration is not being updated, so if you call - * bind() without parameters, you can rebind with the credentials - * provided at first connecting to the server. - * - * @param string $dn Distinguished name for binding - * @param string $password Password for binding - * - * @access public - * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true - */ - public function bind($dn = null, $password = null) - { - // fetch current bind credentials - if (is_null($dn)) { - $dn = $this->_config["binddn"]; - } - if (is_null($password)) { - $password = $this->_config["bindpw"]; - } - - // Connect first, if we haven't so far. - // This will also bind us to the server. - if ($this->_link === false) { - // store old credentials so we can revert them later - // then overwrite config with new bind credentials - $olddn = $this->_config["binddn"]; - $oldpw = $this->_config["bindpw"]; - - // overwrite bind credentials in config - // so performConnect() knows about them - $this->_config["binddn"] = $dn; - $this->_config["bindpw"] = $password; - - // try to connect with provided credentials - $msg = $this->performConnect(); - - // reset to previous config - $this->_config["binddn"] = $olddn; - $this->_config["bindpw"] = $oldpw; - - // see if bind worked - if (self::isError($msg)) { - return $msg; - } - } else { - // do the requested bind as we are - // asked to bind manually - if (is_null($dn)) { - // anonymous bind - $msg = @ldap_bind($this->_link); - } else { - // privileged bind - $msg = @ldap_bind($this->_link, $dn, $password); - } - if (false === $msg) { - return PEAR::raiseError("Bind failed: " . - @ldap_error($this->_link), - @ldap_errno($this->_link)); - } - } - return true; - } - - /** - * Connect to the ldap-server - * - * This function connects to the LDAP server specified in - * the configuration, binds and set up the LDAP protocol as needed. - * - * @access protected - * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true - */ - protected function performConnect() - { - // Note: Connecting is briefly described in RFC1777. - // Basicly it works like this: - // 1. set up TCP connection - // 2. secure that connection if neccessary - // 3a. setLDAPVersion to tell server which version we want to speak - // 3b. perform bind - // 3c. setLDAPVersion to tell server which version we want to speak - // together with a test for supported versions - // 4. set additional protocol options - - // Return true if we are already connected. - if ($this->_link !== false) { - return true; - } - - // Connnect to the LDAP server if we are not connected. Note that - // with some LDAP clients, ldapperformConnect returns a link value even - // if no connection is made. We need to do at least one anonymous - // bind to ensure that a connection is actually valid. - // - // Ref: http://www.php.net/manual/en/function.ldap-connect.php - - // Default error message in case all connection attempts - // fail but no message is set - $current_error = new PEAR_Error('Unknown connection error'); - - // Catch empty $_host_list arrays. - if (!is_array($this->_host_list) || count($this->_host_list) == 0) { - $current_error = PEAR::raiseError('No Servers configured! Please '. - 'pass in an array of servers to Net_LDAP2'); - return $current_error; - } - - // Cycle through the host list. - foreach ($this->_host_list as $host) { - - // Ensure we have a valid string for host name - if (is_array($host)) { - $current_error = PEAR::raiseError('No Servers configured! '. - 'Please pass in an one dimensional array of servers to '. - 'Net_LDAP2! (multidimensional array detected!)'); - continue; - } - - // Skip this host if it is known to be down. - if (in_array($host, $this->_down_host_list)) { - continue; - } - - // Record the host that we are actually connecting to in case - // we need it later. - $this->_config['host'] = $host; - - // Attempt a connection. - $this->_link = @ldap_connect($host, $this->_config['port']); - if (false === $this->_link) { - $current_error = PEAR::raiseError('Could not connect to ' . - $host . ':' . $this->_config['port']); - $this->_down_host_list[] = $host; - continue; - } - - // If we're supposed to use TLS, do so before we try to bind, - // as some strict servers only allow binding via secure connections - if ($this->_config["starttls"] === true) { - if (self::isError($msg = $this->startTLS())) { - $current_error = $msg; - $this->_link = false; - $this->_down_host_list[] = $host; - continue; - } - } - - // Try to set the configured LDAP version on the connection if LDAP - // server needs that before binding (eg OpenLDAP). - // This could be necessary since rfc-1777 states that the protocol version - // has to be set at the bind request. - // We use force here which means that the test in the rootDSE is skipped; - // this is neccessary, because some strict LDAP servers only allow to - // read the LDAP rootDSE (which tells us the supported protocol versions) - // with authenticated clients. - // This may fail in which case we try again after binding. - // In this case, most probably the bind() or setLDAPVersion()-call - // below will also fail, providing error messages. - $version_set = false; - $ignored_err = $this->setLDAPVersion(0, true); - if (!self::isError($ignored_err)) { - $version_set = true; - } - - // Attempt to bind to the server. If we have credentials configured, - // we try to use them, otherwise its an anonymous bind. - // As stated by RFC-1777, the bind request should be the first - // operation to be performed after the connection is established. - // This may give an protocol error if the server does not support - // V2 binds and the above call to setLDAPVersion() failed. - // In case the above call failed, we try an V2 bind here and set the - // version afterwards (with checking to the rootDSE). - $msg = $this->bind(); - if (self::isError($msg)) { - // The bind failed, discard link and save error msg. - // Then record the host as down and try next one - if ($msg->getCode() == 0x02 && !$version_set) { - // provide a finer grained error message - // if protocol error arieses because of invalid version - $msg = new Net_LDAP2_Error($msg->getMessage(). - " (could not set LDAP protocol version to ". - $this->_config['version'].")", - $msg->getCode()); - } - $this->_link = false; - $current_error = $msg; - $this->_down_host_list[] = $host; - continue; - } - - // Set desired LDAP version if not successfully set before. - // Here, a check against the rootDSE is performed, so we get a - // error message if the server does not support the version. - // The rootDSE entry should tell us which LDAP versions are - // supported. However, some strict LDAP servers only allow - // bound suers to read the rootDSE. - if (!$version_set) { - if (self::isError($msg = $this->setLDAPVersion())) { - $current_error = $msg; - $this->_link = false; - $this->_down_host_list[] = $host; - continue; - } - } - - // Set LDAP parameters, now we know we have a valid connection. - if (isset($this->_config['options']) && - is_array($this->_config['options']) && - count($this->_config['options'])) { - foreach ($this->_config['options'] as $opt => $val) { - $err = $this->setOption($opt, $val); - if (self::isError($err)) { - $current_error = $err; - $this->_link = false; - $this->_down_host_list[] = $host; - continue 2; - } - } - } - - // At this stage we have connected, bound, and set up options, - // so we have a known good LDAP server. Time to go home. - return true; - } - - - // All connection attempts have failed, return the last error. - return $current_error; - } - - /** - * Reconnect to the ldap-server. - * - * In case the connection to the LDAP - * service has dropped out for some reason, this function will reconnect, - * and re-bind if a bind has been attempted in the past. It is probably - * most useful when the server list provided to the new() or connect() - * function is an array rather than a single host name, because in that - * case it will be able to connect to a failover or secondary server in - * case the primary server goes down. - * - * This doesn't return anything, it just tries to re-establish - * the current connection. It will sleep for the current backoff - * period (seconds) before attempting the connect, and if the - * connection fails it will double the backoff period, but not - * try again. If you want to ensure a reconnection during a - * transient period of server downtime then you need to call this - * function in a loop. - * - * @access protected - * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true - */ - protected function performReconnect() - { - - // Return true if we are already connected. - if ($this->_link !== false) { - return true; - } - - // Default error message in case all connection attempts - // fail but no message is set - $current_error = new PEAR_Error('Unknown connection error'); - - // Sleep for a backoff period in seconds. - sleep($this->_config['current_backoff']); - - // Retry all available connections. - $this->_down_host_list = array(); - $msg = $this->performConnect(); - - // Bail out if that fails. - if (self::isError($msg)) { - $this->_config['current_backoff'] = - $this->_config['current_backoff'] * 2; - if ($this->_config['current_backoff'] > $this->_config['max_backoff']) { - $this->_config['current_backoff'] = $this->_config['max_backoff']; - } - return $msg; - } - - // Now we should be able to safely (re-)bind. - $msg = $this->bind(); - if (self::isError($msg)) { - $this->_config['current_backoff'] = $this->_config['current_backoff'] * 2; - if ($this->_config['current_backoff'] > $this->_config['max_backoff']) { - $this->_config['current_backoff'] = $this->_config['max_backoff']; - } - - // _config['host'] should have had the last connected host stored in it - // by performConnect(). Since we are unable to bind to that host we can safely - // assume that it is down or has some other problem. - $this->_down_host_list[] = $this->_config['host']; - return $msg; - } - - // At this stage we have connected, bound, and set up options, - // so we have a known good LDAP server. Time to go home. - $this->_config['current_backoff'] = $this->_config['min_backoff']; - return true; - } - - /** - * Starts an encrypted session - * - * @access public - * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true - */ - public function startTLS() - { - // Test to see if the server supports TLS first. - // This is done via testing the extensions offered by the server. - // The OID 1.3.6.1.4.1.1466.20037 tells us, if TLS is supported. - $rootDSE = $this->rootDse(); - if (self::isError($rootDSE)) { - return $this->raiseError("Unable to fetch rootDSE entry ". - "to see if TLS is supoported: ".$rootDSE->getMessage(), $rootDSE->getCode()); - } - - $supported_extensions = $rootDSE->getValue('supportedExtension'); - if (self::isError($supported_extensions)) { - return $this->raiseError("Unable to fetch rootDSE attribute 'supportedExtension' ". - "to see if TLS is supoported: ".$supported_extensions->getMessage(), $supported_extensions->getCode()); - } - - if (in_array('1.3.6.1.4.1.1466.20037', $supported_extensions)) { - if (false === @ldap_start_tls($this->_link)) { - return $this->raiseError("TLS not started: " . - @ldap_error($this->_link), - @ldap_errno($this->_link)); - } - return true; - } else { - return $this->raiseError("Server reports that it does not support TLS"); - } - } - - /** - * alias function of startTLS() for perl-ldap interface - * - * @return void - * @see startTLS() - */ - public function start_tls() - { - $args = func_get_args(); - return call_user_func_array(array( &$this, 'startTLS' ), $args); - } - - /** - * Close LDAP connection. - * - * Closes the connection. Use this when the session is over. - * - * @return void - */ - public function done() - { - $this->_Net_LDAP2(); - } - - /** - * Alias for {@link done()} - * - * @return void - * @see done() - */ - public function disconnect() - { - $this->done(); - } - - /** - * Destructor - * - * @access protected - */ - public function _Net_LDAP2() - { - @ldap_close($this->_link); - } - - /** - * Add a new entryobject to a directory. - * - * Use add to add a new Net_LDAP2_Entry object to the directory. - * This also links the entry to the connection used for the add, - * if it was a fresh entry ({@link Net_LDAP2_Entry::createFresh()}) - * - * @param Net_LDAP2_Entry &$entry Net_LDAP2_Entry - * - * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true - */ - public function add(&$entry) - { - if (!$entry instanceof Net_LDAP2_Entry) { - return PEAR::raiseError('Parameter to Net_LDAP2::add() must be a Net_LDAP2_Entry object.'); - } - - // Continue attempting the add operation in a loop until we - // get a success, a definitive failure, or the world ends. - $foo = 0; - while (true) { - $link = $this->getLink(); - - if ($link === false) { - // We do not have a successful connection yet. The call to - // getLink() would have kept trying if we wanted one. Go - // home now. - return PEAR::raiseError("Could not add entry " . $entry->dn() . - " no valid LDAP connection could be found."); - } - - if (@ldap_add($link, $entry->dn(), $entry->getValues())) { - // entry successfully added, we should update its $ldap reference - // in case it is not set so far (fresh entry) - if (!$entry->getLDAP() instanceof Net_LDAP2) { - $entry->setLDAP($this); - } - // store, that the entry is present inside the directory - $entry->markAsNew(false); - return true; - } else { - // We have a failure. What type? We may be able to reconnect - // and try again. - $error_code = @ldap_errno($link); - $error_name = $this->errorMessage($error_code); - - if (($error_name === 'LDAP_OPERATIONS_ERROR') && - ($this->_config['auto_reconnect'])) { - - // The server has become disconnected before trying the - // operation. We should try again, possibly with a different - // server. - $this->_link = false; - $this->performReconnect(); - } else { - // Errors other than the above catched are just passed - // back to the user so he may react upon them. - return PEAR::raiseError("Could not add entry " . $entry->dn() . " " . - $error_name, - $error_code); - } - } - } - } - - /** - * Delete an entry from the directory - * - * The object may either be a string representing the dn or a Net_LDAP2_Entry - * object. When the boolean paramter recursive is set, all subentries of the - * entry will be deleted as well. - * - * @param string|Net_LDAP2_Entry $dn DN-string or Net_LDAP2_Entry - * @param boolean $recursive Should we delete all children recursive as well? - * - * @access public - * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true - */ - public function delete($dn, $recursive = false) - { - if ($dn instanceof Net_LDAP2_Entry) { - $dn = $dn->dn(); - } - if (false === is_string($dn)) { - return PEAR::raiseError("Parameter is not a string nor an entry object!"); - } - // Recursive delete searches for children and calls delete for them - if ($recursive) { - $result = @ldap_list($this->_link, $dn, '(objectClass=*)', array(null), 0, 0); - if (@ldap_count_entries($this->_link, $result)) { - $subentry = @ldap_first_entry($this->_link, $result); - $this->delete(@ldap_get_dn($this->_link, $subentry), true); - while ($subentry = @ldap_next_entry($this->_link, $subentry)) { - $this->delete(@ldap_get_dn($this->_link, $subentry), true); - } - } - } - - // Continue attempting the delete operation in a loop until we - // get a success, a definitive failure, or the world ends. - while (true) { - $link = $this->getLink(); - - if ($link === false) { - // We do not have a successful connection yet. The call to - // getLink() would have kept trying if we wanted one. Go - // home now. - return PEAR::raiseError("Could not add entry " . $dn . - " no valid LDAP connection could be found."); - } - - if (@ldap_delete($link, $dn)) { - // entry successfully deleted. - return true; - } else { - // We have a failure. What type? - // We may be able to reconnect and try again. - $error_code = @ldap_errno($link); - $error_name = $this->errorMessage($error_code); - - if (($this->errorMessage($error_code) === 'LDAP_OPERATIONS_ERROR') && - ($this->_config['auto_reconnect'])) { - // The server has become disconnected before trying the - // operation. We should try again, possibly with a - // different server. - $this->_link = false; - $this->performReconnect(); - - } elseif ($error_code == 66) { - // Subentries present, server refused to delete. - // Deleting subentries is the clients responsibility, but - // since the user may not know of the subentries, we do not - // force that here but instead notify the developer so he - // may take actions himself. - return PEAR::raiseError("Could not delete entry $dn because of subentries. Use the recursive parameter to delete them."); - - } else { - // Errors other than the above catched are just passed - // back to the user so he may react upon them. - return PEAR::raiseError("Could not delete entry " . $dn . " " . - $error_name, - $error_code); - } - } - } - } - - /** - * Modify an ldapentry directly on the server - * - * This one takes the DN or a Net_LDAP2_Entry object and an array of actions. - * This array should be something like this: - * - * array('add' => array('attribute1' => array('val1', 'val2'), - * 'attribute2' => array('val1')), - * 'delete' => array('attribute1'), - * 'replace' => array('attribute1' => array('val1')), - * 'changes' => array('add' => ..., - * 'replace' => ..., - * 'delete' => array('attribute1', 'attribute2' => array('val1'))) - * - * The changes array is there so the order of operations can be influenced - * (the operations are done in order of appearance). - * The order of execution is as following: - * 1. adds from 'add' array - * 2. deletes from 'delete' array - * 3. replaces from 'replace' array - * 4. changes (add, replace, delete) in order of appearance - * All subarrays (add, replace, delete, changes) may be given at the same time. - * - * The function calls the corresponding functions of an Net_LDAP2_Entry - * object. A detailed description of array structures can be found there. - * - * Unlike the modification methods provided by the Net_LDAP2_Entry object, - * this method will instantly carry out an update() after each operation, - * thus modifying "directly" on the server. - * - * @param string|Net_LDAP2_Entry $entry DN-string or Net_LDAP2_Entry - * @param array $parms Array of changes - * - * @access public - * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true - */ - public function modify($entry, $parms = array()) - { - if (is_string($entry)) { - $entry = $this->getEntry($entry); - if (self::isError($entry)) { - return $entry; - } - } - if (!$entry instanceof Net_LDAP2_Entry) { - return PEAR::raiseError("Parameter is not a string nor an entry object!"); - } - - // Perform changes mentioned separately - foreach (array('add', 'delete', 'replace') as $action) { - if (isset($parms[$action])) { - $msg = $entry->$action($parms[$action]); - if (self::isError($msg)) { - return $msg; - } - $entry->setLDAP($this); - - // Because the @ldap functions are called inside Net_LDAP2_Entry::update(), - // we have to trap the error codes issued from that if we want to support - // reconnection. - while (true) { - $msg = $entry->update(); - - if (self::isError($msg)) { - // We have a failure. What type? We may be able to reconnect - // and try again. - $error_code = $msg->getCode(); - $error_name = $this->errorMessage($error_code); - - if (($this->errorMessage($error_code) === 'LDAP_OPERATIONS_ERROR') && - ($this->_config['auto_reconnect'])) { - - // The server has become disconnected before trying the - // operation. We should try again, possibly with a different - // server. - $this->_link = false; - $this->performReconnect(); - - } else { - - // Errors other than the above catched are just passed - // back to the user so he may react upon them. - return PEAR::raiseError("Could not modify entry: ".$msg->getMessage()); - } - } else { - // modification succeedet, evaluate next change - break; - } - } - } - } - - // perform combined changes in 'changes' array - if (isset($parms['changes']) && is_array($parms['changes'])) { - foreach ($parms['changes'] as $action => $value) { - - // Because the @ldap functions are called inside Net_LDAP2_Entry::update, - // we have to trap the error codes issued from that if we want to support - // reconnection. - while (true) { - $msg = $this->modify($entry, array($action => $value)); - - if (self::isError($msg)) { - // We have a failure. What type? We may be able to reconnect - // and try again. - $error_code = $msg->getCode(); - $error_name = $this->errorMessage($error_code); - - if (($this->errorMessage($error_code) === 'LDAP_OPERATIONS_ERROR') && - ($this->_config['auto_reconnect'])) { - - // The server has become disconnected before trying the - // operation. We should try again, possibly with a different - // server. - $this->_link = false; - $this->performReconnect(); - - } else { - // Errors other than the above catched are just passed - // back to the user so he may react upon them. - return $msg; - } - } else { - // modification succeedet, evaluate next change - break; - } - } - } - } - - return true; - } - - /** - * Run a ldap search query - * - * Search is used to query the ldap-database. - * $base and $filter may be ommitted. The one from config will - * then be used. $base is either a DN-string or an Net_LDAP2_Entry - * object in which case its DN willb e used. - * - * Params may contain: - * - * scope: The scope which will be used for searching - * base - Just one entry - * sub - The whole tree - * one - Immediately below $base - * sizelimit: Limit the number of entries returned (default: 0 = unlimited), - * timelimit: Limit the time spent for searching (default: 0 = unlimited), - * attrsonly: If true, the search will only return the attribute names, - * attributes: Array of attribute names, which the entry should contain. - * It is good practice to limit this to just the ones you need. - * [NOT IMPLEMENTED] - * deref: By default aliases are dereferenced to locate the base object for the search, but not when - * searching subordinates of the base object. This may be changed by specifying one of the - * following values: - * - * never - Do not dereference aliases in searching or in locating the base object of the search. - * search - Dereference aliases in subordinates of the base object in searching, but not in - * locating the base object of the search. - * find - * always - * - * Please note, that you cannot override server side limitations to sizelimit - * and timelimit: You can always only lower a given limit. - * - * @param string|Net_LDAP2_Entry $base LDAP searchbase - * @param string|Net_LDAP2_Filter $filter LDAP search filter or a Net_LDAP2_Filter object - * @param array $params Array of options - * - * @access public - * @return Net_LDAP2_Search|Net_LDAP2_Error Net_LDAP2_Search object or Net_LDAP2_Error object - * @todo implement search controls (sorting etc) - */ - public function search($base = null, $filter = null, $params = array()) - { - if (is_null($base)) { - $base = $this->_config['basedn']; - } - if ($base instanceof Net_LDAP2_Entry) { - $base = $base->dn(); // fetch DN of entry, making searchbase relative to the entry - } - if (is_null($filter)) { - $filter = $this->_config['filter']; - } - if ($filter instanceof Net_LDAP2_Filter) { - $filter = $filter->asString(); // convert Net_LDAP2_Filter to string representation - } - if (PEAR::isError($filter)) { - return $filter; - } - if (PEAR::isError($base)) { - return $base; - } - - /* setting searchparameters */ - (isset($params['sizelimit'])) ? $sizelimit = $params['sizelimit'] : $sizelimit = 0; - (isset($params['timelimit'])) ? $timelimit = $params['timelimit'] : $timelimit = 0; - (isset($params['attrsonly'])) ? $attrsonly = $params['attrsonly'] : $attrsonly = 0; - (isset($params['attributes'])) ? $attributes = $params['attributes'] : $attributes = array(); - - // Ensure $attributes to be an array in case only one - // attribute name was given as string - if (!is_array($attributes)) { - $attributes = array($attributes); - } - - // reorganize the $attributes array index keys - // sometimes there are problems with not consecutive indexes - $attributes = array_values($attributes); - - // scoping makes searches faster! - $scope = (isset($params['scope']) ? $params['scope'] : $this->_config['scope']); - - switch ($scope) { - case 'one': - $search_function = 'ldap_list'; - break; - case 'base': - $search_function = 'ldap_read'; - break; - default: - $search_function = 'ldap_search'; - } - - // Continue attempting the search operation until we get a success - // or a definitive failure. - while (true) { - $link = $this->getLink(); - $search = @call_user_func($search_function, - $link, - $base, - $filter, - $attributes, - $attrsonly, - $sizelimit, - $timelimit); - - if ($err = @ldap_errno($link)) { - if ($err == 32) { - // Errorcode 32 = no such object, i.e. a nullresult. - return $obj = new Net_LDAP2_Search ($search, $this, $attributes); - } elseif ($err == 4) { - // Errorcode 4 = sizelimit exeeded. - return $obj = new Net_LDAP2_Search ($search, $this, $attributes); - } elseif ($err == 87) { - // bad search filter - return $this->raiseError($this->errorMessage($err) . "($filter)", $err); - } elseif (($err == 1) && ($this->_config['auto_reconnect'])) { - // Errorcode 1 = LDAP_OPERATIONS_ERROR but we can try a reconnect. - $this->_link = false; - $this->performReconnect(); - } else { - $msg = "\nParameters:\nBase: $base\nFilter: $filter\nScope: $scope"; - return $this->raiseError($this->errorMessage($err) . $msg, $err); - } - } else { - return $obj = new Net_LDAP2_Search($search, $this, $attributes); - } - } - } - - /** - * Set an LDAP option - * - * @param string $option Option to set - * @param mixed $value Value to set Option to - * - * @access public - * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true - */ - public function setOption($option, $value) - { - if ($this->_link) { - if (defined($option)) { - if (@ldap_set_option($this->_link, constant($option), $value)) { - return true; - } else { - $err = @ldap_errno($this->_link); - if ($err) { - $msg = @ldap_err2str($err); - } else { - $err = NET_LDAP2_ERROR; - $msg = $this->errorMessage($err); - } - return $this->raiseError($msg, $err); - } - } else { - return $this->raiseError("Unkown Option requested"); - } - } else { - return $this->raiseError("Could not set LDAP option: No LDAP connection"); - } - } - - /** - * Get an LDAP option value - * - * @param string $option Option to get - * - * @access public - * @return Net_LDAP2_Error|string Net_LDAP2_Error or option value - */ - public function getOption($option) - { - if ($this->_link) { - if (defined($option)) { - if (@ldap_get_option($this->_link, constant($option), $value)) { - return $value; - } else { - $err = @ldap_errno($this->_link); - if ($err) { - $msg = @ldap_err2str($err); - } else { - $err = NET_LDAP2_ERROR; - $msg = $this->errorMessage($err); - } - return $this->raiseError($msg, $err); - } - } else { - $this->raiseError("Unkown Option requested"); - } - } else { - $this->raiseError("No LDAP connection"); - } - } - - /** - * Get the LDAP_PROTOCOL_VERSION that is used on the connection. - * - * A lot of ldap functionality is defined by what protocol version the ldap server speaks. - * This might be 2 or 3. - * - * @return int - */ - public function getLDAPVersion() - { - if ($this->_link) { - $version = $this->getOption("LDAP_OPT_PROTOCOL_VERSION"); - } else { - $version = $this->_config['version']; - } - return $version; - } - - /** - * Set the LDAP_PROTOCOL_VERSION that is used on the connection. - * - * @param int $version LDAP-version that should be used - * @param boolean $force If set to true, the check against the rootDSE will be skipped - * - * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true - * @todo Checking via the rootDSE takes much time - why? fetching and instanciation is quick! - */ - public function setLDAPVersion($version = 0, $force = false) - { - if (!$version) { - $version = $this->_config['version']; - } - - // - // Check to see if the server supports this version first. - // - // Todo: Why is this so horribly slow? - // $this->rootDse() is very fast, as well as Net_LDAP2_RootDSE::fetch() - // seems like a problem at copiyng the object inside PHP?? - // Additionally, this is not always reproducable... - // - if (!$force) { - $rootDSE = $this->rootDse(); - if ($rootDSE instanceof Net_LDAP2_Error) { - return $rootDSE; - } else { - $supported_versions = $rootDSE->getValue('supportedLDAPVersion'); - if (is_string($supported_versions)) { - $supported_versions = array($supported_versions); - } - $check_ok = in_array($version, $supported_versions); - } - } - - if ($force || $check_ok) { - return $this->setOption("LDAP_OPT_PROTOCOL_VERSION", $version); - } else { - return $this->raiseError("LDAP Server does not support protocol version " . $version); - } - } - - - /** - * Tells if a DN does exist in the directory - * - * @param string|Net_LDAP2_Entry $dn The DN of the object to test - * - * @return boolean|Net_LDAP2_Error - */ - public function dnExists($dn) - { - if (PEAR::isError($dn)) { - return $dn; - } - if ($dn instanceof Net_LDAP2_Entry) { - $dn = $dn->dn(); - } - if (false === is_string($dn)) { - return PEAR::raiseError('Parameter $dn is not a string nor an entry object!'); - } - - // make dn relative to parent - $base = Net_LDAP2_Util::ldap_explode_dn($dn, array('casefold' => 'none', 'reverse' => false, 'onlyvalues' => false)); - if (self::isError($base)) { - return $base; - } - $entry_rdn = array_shift($base); - if (is_array($entry_rdn)) { - // maybe the dn consist of a multivalued RDN, we must build the dn in this case - // because the $entry_rdn is an array! - $filter_dn = Net_LDAP2_Util::canonical_dn($entry_rdn); - } - $base = Net_LDAP2_Util::canonical_dn($base); - - $result = @ldap_list($this->_link, $base, $entry_rdn, array(), 1, 1); - if (@ldap_count_entries($this->_link, $result)) { - return true; - } - if (ldap_errno($this->_link) == 32) { - return false; - } - if (ldap_errno($this->_link) != 0) { - return PEAR::raiseError(ldap_error($this->_link), ldap_errno($this->_link)); - } - return false; - } - - - /** - * Get a specific entry based on the DN - * - * @param string $dn DN of the entry that should be fetched - * @param array $attr Array of Attributes to select. If ommitted, all attributes are fetched. - * - * @return Net_LDAP2_Entry|Net_LDAP2_Error Reference to a Net_LDAP2_Entry object or Net_LDAP2_Error object - * @todo Maybe check against the shema should be done to be sure the attribute type exists - */ - public function &getEntry($dn, $attr = array()) - { - if (!is_array($attr)) { - $attr = array($attr); - } - $result = $this->search($dn, '(objectClass=*)', - array('scope' => 'base', 'attributes' => $attr)); - if (self::isError($result)) { - return $result; - } elseif ($result->count() == 0) { - return PEAR::raiseError('Could not fetch entry '.$dn.': no entry found'); - } - $entry = $result->shiftEntry(); - if (false == $entry) { - return PEAR::raiseError('Could not fetch entry (error retrieving entry from search result)'); - } - return $entry; - } - - /** - * Rename or move an entry - * - * This method will instantly carry out an update() after the move, - * so the entry is moved instantly. - * You can pass an optional Net_LDAP2 object. In this case, a cross directory - * move will be performed which deletes the entry in the source (THIS) directory - * and adds it in the directory $target_ldap. - * A cross directory move will switch the Entrys internal LDAP reference so - * updates to the entry will go to the new directory. - * - * Note that if you want to do a cross directory move, you need to - * pass an Net_LDAP2_Entry object, otherwise the attributes will be empty. - * - * @param string|Net_LDAP2_Entry $entry Entry DN or Entry object - * @param string $newdn New location - * @param Net_LDAP2 $target_ldap (optional) Target directory for cross server move; should be passed via reference - * - * @return Net_LDAP2_Error|true - */ - public function move($entry, $newdn, $target_ldap = null) - { - if (is_string($entry)) { - $entry_o = $this->getEntry($entry); - } else { - $entry_o =& $entry; - } - if (!$entry_o instanceof Net_LDAP2_Entry) { - return PEAR::raiseError('Parameter $entry is expected to be a Net_LDAP2_Entry object! (If DN was passed, conversion failed)'); - } - if (null !== $target_ldap && !$target_ldap instanceof Net_LDAP2) { - return PEAR::raiseError('Parameter $target_ldap is expected to be a Net_LDAP2 object!'); - } - - if ($target_ldap && $target_ldap !== $this) { - // cross directory move - if (is_string($entry)) { - return PEAR::raiseError('Unable to perform cross directory move: operation requires a Net_LDAP2_Entry object'); - } - if ($target_ldap->dnExists($newdn)) { - return PEAR::raiseError('Unable to perform cross directory move: entry does exist in target directory'); - } - $entry_o->dn($newdn); - $res = $target_ldap->add($entry_o); - if (self::isError($res)) { - return PEAR::raiseError('Unable to perform cross directory move: '.$res->getMessage().' in target directory'); - } - $res = $this->delete($entry_o->currentDN()); - if (self::isError($res)) { - $res2 = $target_ldap->delete($entry_o); // undo add - if (self::isError($res2)) { - $add_error_string = 'Additionally, the deletion (undo add) of $entry in target directory failed.'; - } - return PEAR::raiseError('Unable to perform cross directory move: '.$res->getMessage().' in source directory. '.$add_error_string); - } - $entry_o->setLDAP($target_ldap); - return true; - } else { - // local move - $entry_o->dn($newdn); - $entry_o->setLDAP($this); - return $entry_o->update(); - } - } - - /** - * Copy an entry to a new location - * - * The entry will be immediately copied. - * Please note that only attributes you have - * selected will be copied. - * - * @param Net_LDAP2_Entry &$entry Entry object - * @param string $newdn New FQF-DN of the entry - * - * @return Net_LDAP2_Error|Net_LDAP2_Entry Error Message or reference to the copied entry - */ - public function ©(&$entry, $newdn) - { - if (!$entry instanceof Net_LDAP2_Entry) { - return PEAR::raiseError('Parameter $entry is expected to be a Net_LDAP2_Entry object!'); - } - - $newentry = Net_LDAP2_Entry::createFresh($newdn, $entry->getValues()); - $result = $this->add($newentry); - - if ($result instanceof Net_LDAP2_Error) { - return $result; - } else { - return $newentry; - } - } - - - /** - * Returns the string for an ldap errorcode. - * - * Made to be able to make better errorhandling - * Function based on DB::errorMessage() - * Tip: The best description of the errorcodes is found here: - * http://www.directory-info.com/LDAP2/LDAPErrorCodes.html - * - * @param int $errorcode Error code - * - * @return string The errorstring for the error. - */ - public function errorMessage($errorcode) - { - $errorMessages = array( - 0x00 => "LDAP_SUCCESS", - 0x01 => "LDAP_OPERATIONS_ERROR", - 0x02 => "LDAP_PROTOCOL_ERROR", - 0x03 => "LDAP_TIMELIMIT_EXCEEDED", - 0x04 => "LDAP_SIZELIMIT_EXCEEDED", - 0x05 => "LDAP_COMPARE_FALSE", - 0x06 => "LDAP_COMPARE_TRUE", - 0x07 => "LDAP_AUTH_METHOD_NOT_SUPPORTED", - 0x08 => "LDAP_STRONG_AUTH_REQUIRED", - 0x09 => "LDAP_PARTIAL_RESULTS", - 0x0a => "LDAP_REFERRAL", - 0x0b => "LDAP_ADMINLIMIT_EXCEEDED", - 0x0c => "LDAP_UNAVAILABLE_CRITICAL_EXTENSION", - 0x0d => "LDAP_CONFIDENTIALITY_REQUIRED", - 0x0e => "LDAP_SASL_BIND_INPROGRESS", - 0x10 => "LDAP_NO_SUCH_ATTRIBUTE", - 0x11 => "LDAP_UNDEFINED_TYPE", - 0x12 => "LDAP_INAPPROPRIATE_MATCHING", - 0x13 => "LDAP_CONSTRAINT_VIOLATION", - 0x14 => "LDAP_TYPE_OR_VALUE_EXISTS", - 0x15 => "LDAP_INVALID_SYNTAX", - 0x20 => "LDAP_NO_SUCH_OBJECT", - 0x21 => "LDAP_ALIAS_PROBLEM", - 0x22 => "LDAP_INVALID_DN_SYNTAX", - 0x23 => "LDAP_IS_LEAF", - 0x24 => "LDAP_ALIAS_DEREF_PROBLEM", - 0x30 => "LDAP_INAPPROPRIATE_AUTH", - 0x31 => "LDAP_INVALID_CREDENTIALS", - 0x32 => "LDAP_INSUFFICIENT_ACCESS", - 0x33 => "LDAP_BUSY", - 0x34 => "LDAP_UNAVAILABLE", - 0x35 => "LDAP_UNWILLING_TO_PERFORM", - 0x36 => "LDAP_LOOP_DETECT", - 0x3C => "LDAP_SORT_CONTROL_MISSING", - 0x3D => "LDAP_INDEX_RANGE_ERROR", - 0x40 => "LDAP_NAMING_VIOLATION", - 0x41 => "LDAP_OBJECT_CLASS_VIOLATION", - 0x42 => "LDAP_NOT_ALLOWED_ON_NONLEAF", - 0x43 => "LDAP_NOT_ALLOWED_ON_RDN", - 0x44 => "LDAP_ALREADY_EXISTS", - 0x45 => "LDAP_NO_OBJECT_CLASS_MODS", - 0x46 => "LDAP_RESULTS_TOO_LARGE", - 0x47 => "LDAP_AFFECTS_MULTIPLE_DSAS", - 0x50 => "LDAP_OTHER", - 0x51 => "LDAP_SERVER_DOWN", - 0x52 => "LDAP_LOCAL_ERROR", - 0x53 => "LDAP_ENCODING_ERROR", - 0x54 => "LDAP_DECODING_ERROR", - 0x55 => "LDAP_TIMEOUT", - 0x56 => "LDAP_AUTH_UNKNOWN", - 0x57 => "LDAP_FILTER_ERROR", - 0x58 => "LDAP_USER_CANCELLED", - 0x59 => "LDAP_PARAM_ERROR", - 0x5a => "LDAP_NO_MEMORY", - 0x5b => "LDAP_CONNECT_ERROR", - 0x5c => "LDAP_NOT_SUPPORTED", - 0x5d => "LDAP_CONTROL_NOT_FOUND", - 0x5e => "LDAP_NO_RESULTS_RETURNED", - 0x5f => "LDAP_MORE_RESULTS_TO_RETURN", - 0x60 => "LDAP_CLIENT_LOOP", - 0x61 => "LDAP_REFERRAL_LIMIT_EXCEEDED", - 1000 => "Unknown Net_LDAP2 Error" - ); - - return isset($errorMessages[$errorcode]) ? - $errorMessages[$errorcode] : - $errorMessages[NET_LDAP2_ERROR] . ' (' . $errorcode . ')'; - } - - /** - * Gets a rootDSE object - * - * This either fetches a fresh rootDSE object or returns it from - * the internal cache for performance reasons, if possible. - * - * @param array $attrs Array of attributes to search for - * - * @access public - * @return Net_LDAP2_Error|Net_LDAP2_RootDSE Net_LDAP2_Error or Net_LDAP2_RootDSE object - */ - public function &rootDse($attrs = null) - { - if ($attrs !== null && !is_array($attrs)) { - return PEAR::raiseError('Parameter $attr is expected to be an array!'); - } - - $attrs_signature = serialize($attrs); - - // see if we need to fetch a fresh object, or if we already - // requested this object with the same attributes - if (true || !array_key_exists($attrs_signature, $this->_rootDSE_cache)) { - $rootdse =& Net_LDAP2_RootDSE::fetch($this, $attrs); - if ($rootdse instanceof Net_LDAP2_Error) { - return $rootdse; - } - - // search was ok, store rootDSE in cache - $this->_rootDSE_cache[$attrs_signature] = $rootdse; - } - return $this->_rootDSE_cache[$attrs_signature]; - } - - /** - * Alias function of rootDse() for perl-ldap interface - * - * @access public - * @see rootDse() - * @return Net_LDAP2_Error|Net_LDAP2_RootDSE - */ - public function &root_dse() - { - $args = func_get_args(); - return call_user_func_array(array(&$this, 'rootDse'), $args); - } - - /** - * Get a schema object - * - * @param string $dn (optional) Subschema entry dn - * - * @access public - * @return Net_LDAP2_Schema|Net_LDAP2_Error Net_LDAP2_Schema or Net_LDAP2_Error object - */ - public function &schema($dn = null) - { - // Schema caching by Knut-Olav Hoven - // If a schema caching object is registered, we use that to fetch - // a schema object. - // See registerSchemaCache() for more info on this. - if ($this->_schema === null) { - if ($this->_schema_cache) { - $cached_schema = $this->_schema_cache->loadSchema(); - if ($cached_schema instanceof Net_LDAP2_Error) { - return $cached_schema; // route error to client - } else { - if ($cached_schema instanceof Net_LDAP2_Schema) { - $this->_schema = $cached_schema; - } - } - } - } - - // Fetch schema, if not tried before and no cached version available. - // If we are already fetching the schema, we will skip fetching. - if ($this->_schema === null) { - // store a temporary error message so subsequent calls to schema() can - // detect, that we are fetching the schema already. - // Otherwise we will get an infinite loop at Net_LDAP2_Schema::fetch() - $this->_schema = new Net_LDAP2_Error('Schema not initialized'); - $this->_schema = Net_LDAP2_Schema::fetch($this, $dn); - - // If schema caching is active, advise the cache to store the schema - if ($this->_schema_cache) { - $caching_result = $this->_schema_cache->storeSchema($this->_schema); - if ($caching_result instanceof Net_LDAP2_Error) { - return $caching_result; // route error to client - } - } - } - return $this->_schema; - } - - /** - * Enable/disable persistent schema caching - * - * Sometimes it might be useful to allow your scripts to cache - * the schema information on disk, so the schema is not fetched - * every time the script runs which could make your scripts run - * faster. - * - * This method allows you to register a custom object that - * implements your schema cache. Please see the SchemaCache interface - * (SchemaCache.interface.php) for informations on how to implement this. - * To unregister the cache, pass null as $cache parameter. - * - * For ease of use, Net_LDAP2 provides a simple file based cache - * which is used in the example below. You may use this, for example, - * to store the schema in a linux tmpfs which results in the schema - * beeing cached inside the RAM which allows nearly instant access. - * - * // Create the simple file cache object that comes along with Net_LDAP2 - * $mySchemaCache_cfg = array( - * 'path' => '/tmp/Net_LDAP2_Schema.cache', - * 'max_age' => 86400 // max age is 24 hours (in seconds) - * ); - * $mySchemaCache = new Net_LDAP2_SimpleFileSchemaCache($mySchemaCache_cfg); - * $ldap = new Net_LDAP2::connect(...); - * $ldap->registerSchemaCache($mySchemaCache); // enable caching - * // now each call to $ldap->schema() will get the schema from disk! - * - * - * @param Net_LDAP2_SchemaCache|null $cache Object implementing the Net_LDAP2_SchemaCache interface - * - * @return true|Net_LDAP2_Error - */ - public function registerSchemaCache($cache) { - if (is_null($cache) - || (is_object($cache) && in_array('Net_LDAP2_SchemaCache', class_implements($cache))) ) { - $this->_schema_cache = $cache; - return true; - } else { - return new Net_LDAP2_Error('Custom schema caching object is either no '. - 'valid object or does not implement the Net_LDAP2_SchemaCache interface!'); - } - } - - - /** - * Checks if phps ldap-extension is loaded - * - * If it is not loaded, it tries to load it manually using PHPs dl(). - * It knows both windows-dll and *nix-so. - * - * @static - * @return Net_LDAP2_Error|true - */ - public static function checkLDAPExtension() - { - if (!extension_loaded('ldap') && !@dl('ldap.' . PHP_SHLIB_SUFFIX)) { - return new Net_LDAP2_Error("It seems that you do not have the ldap-extension installed. Please install it before using the Net_LDAP2 package."); - } else { - return true; - } - } - - /** - * Encodes given attributes to UTF8 if needed by schema - * - * This function takes attributes in an array and then checks against the schema if they need - * UTF8 encoding. If that is so, they will be encoded. An encoded array will be returned and - * can be used for adding or modifying. - * - * $attributes is expected to be an array with keys describing - * the attribute names and the values as the value of this attribute: - * $attributes = array('cn' => 'foo', 'attr2' => array('mv1', 'mv2')); - * - * @param array $attributes Array of attributes - * - * @access public - * @return array|Net_LDAP2_Error Array of UTF8 encoded attributes or Error - */ - public function utf8Encode($attributes) - { - return $this->utf8($attributes, 'utf8_encode'); - } - - /** - * Decodes the given attribute values if needed by schema - * - * $attributes is expected to be an array with keys describing - * the attribute names and the values as the value of this attribute: - * $attributes = array('cn' => 'foo', 'attr2' => array('mv1', 'mv2')); - * - * @param array $attributes Array of attributes - * - * @access public - * @see utf8Encode() - * @return array|Net_LDAP2_Error Array with decoded attribute values or Error - */ - public function utf8Decode($attributes) - { - return $this->utf8($attributes, 'utf8_decode'); - } - - /** - * Encodes or decodes attribute values if needed - * - * @param array $attributes Array of attributes - * @param array $function Function to apply to attribute values - * - * @access protected - * @return array|Net_LDAP2_Error Array of attributes with function applied to values or Error - */ - protected function utf8($attributes, $function) - { - if (!is_array($attributes) || array_key_exists(0, $attributes)) { - return PEAR::raiseError('Parameter $attributes is expected to be an associative array'); - } - - if (!$this->_schema) { - $this->_schema = $this->schema(); - } - - if (!$this->_link || self::isError($this->_schema) || !function_exists($function)) { - return $attributes; - } - - if (is_array($attributes) && count($attributes) > 0) { - - foreach ($attributes as $k => $v) { - - if (!isset($this->_schemaAttrs[$k])) { - - $attr = $this->_schema->get('attribute', $k); - if (self::isError($attr)) { - continue; - } - - if (false !== strpos($attr['syntax'], '1.3.6.1.4.1.1466.115.121.1.15')) { - $encode = true; - } else { - $encode = false; - } - $this->_schemaAttrs[$k] = $encode; - - } else { - $encode = $this->_schemaAttrs[$k]; - } - - if ($encode) { - if (is_array($v)) { - foreach ($v as $ak => $av) { - $v[$ak] = call_user_func($function, $av); - } - } else { - $v = call_user_func($function, $v); - } - } - $attributes[$k] = $v; - } - } - return $attributes; - } - - /** - * Get the LDAP link resource. It will loop attempting to - * re-establish the connection if the connection attempt fails and - * auto_reconnect has been turned on (see the _config array documentation). - * - * @access public - * @return resource LDAP link - */ - public function &getLink() - { - if ($this->_config['auto_reconnect']) { - while (true) { - // - // Return the link handle if we are already connected. Otherwise - // try to reconnect. - // - if ($this->_link !== false) { - return $this->_link; - } else { - $this->performReconnect(); - } - } - } - return $this->_link; - } -} - -/** -* Net_LDAP2_Error implements a class for reporting portable LDAP error messages. -* -* @category Net -* @package Net_LDAP2 -* @author Tarjej Huse -* @license http://www.gnu.org/copyleft/lesser.html LGPL -* @link http://pear.php.net/package/Net_LDAP22/ -*/ -class Net_LDAP2_Error extends PEAR_Error -{ - /** - * Net_LDAP2_Error constructor. - * - * @param string $message String with error message. - * @param integer $code Net_LDAP2 error code - * @param integer $mode what "error mode" to operate in - * @param mixed $level what error level to use for $mode & PEAR_ERROR_TRIGGER - * @param mixed $debuginfo additional debug info, such as the last query - * - * @access public - * @see PEAR_Error - */ - public function __construct($message = 'Net_LDAP2_Error', $code = NET_LDAP2_ERROR, $mode = PEAR_ERROR_RETURN, - $level = E_USER_NOTICE, $debuginfo = null) - { - if (is_int($code)) { - $this->PEAR_Error($message . ': ' . Net_LDAP2::errorMessage($code), $code, $mode, $level, $debuginfo); - } else { - $this->PEAR_Error("$message: $code", NET_LDAP2_ERROR, $mode, $level, $debuginfo); - } - } -} - -?> diff --git a/extlib/Net/LDAP2/Entry.php b/extlib/Net/LDAP2/Entry.php deleted file mode 100644 index 66de96678..000000000 --- a/extlib/Net/LDAP2/Entry.php +++ /dev/null @@ -1,1055 +0,0 @@ - -* @author Tarjej Huse -* @author Benedikt Hallinger -* @copyright 2009 Tarjej Huse, Jan Wagner, Benedikt Hallinger -* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 -* @version SVN: $Id: Entry.php 286787 2009-08-04 06:03:12Z beni $ -* @link http://pear.php.net/package/Net_LDAP2/ -*/ - -/** -* Includes -*/ -require_once 'PEAR.php'; -require_once 'Util.php'; - -/** -* Object representation of a directory entry -* -* This class represents a directory entry. You can add, delete, replace -* attributes and their values, rename the entry, delete the entry. -* -* @category Net -* @package Net_LDAP2 -* @author Jan Wagner -* @author Tarjej Huse -* @author Benedikt Hallinger -* @license http://www.gnu.org/copyleft/lesser.html LGPL -* @link http://pear.php.net/package/Net_LDAP2/ -*/ -class Net_LDAP2_Entry extends PEAR -{ - /** - * Entry ressource identifier - * - * @access protected - * @var ressource - */ - protected $_entry = null; - - /** - * LDAP ressource identifier - * - * @access protected - * @var ressource - */ - protected $_link = null; - - /** - * Net_LDAP2 object - * - * This object will be used for updating and schema checking - * - * @access protected - * @var object Net_LDAP2 - */ - protected $_ldap = null; - - /** - * Distinguished name of the entry - * - * @access protected - * @var string - */ - protected $_dn = null; - - /** - * Attributes - * - * @access protected - * @var array - */ - protected $_attributes = array(); - - /** - * Original attributes before any modification - * - * @access protected - * @var array - */ - protected $_original = array(); - - - /** - * Map of attribute names - * - * @access protected - * @var array - */ - protected $_map = array(); - - - /** - * Is this a new entry? - * - * @access protected - * @var boolean - */ - protected $_new = true; - - /** - * New distinguished name - * - * @access protected - * @var string - */ - protected $_newdn = null; - - /** - * Shall the entry be deleted? - * - * @access protected - * @var boolean - */ - protected $_delete = false; - - /** - * Map with changes to the entry - * - * @access protected - * @var array - */ - protected $_changes = array("add" => array(), - "delete" => array(), - "replace" => array() - ); - /** - * Internal Constructor - * - * Constructor of the entry. Sets up the distinguished name and the entries - * attributes. - * You should not call this method manually! Use {@link Net_LDAP2_Entry::createFresh()} - * or {@link Net_LDAP2_Entry::createConnected()} instead! - * - * @param Net_LDAP2|ressource|array &$ldap Net_LDAP2 object, ldap-link ressource or array of attributes - * @param string|ressource $entry Either a DN or a LDAP-Entry ressource - * - * @access protected - * @return none - */ - protected function __construct(&$ldap, $entry = null) - { - $this->PEAR('Net_LDAP2_Error'); - - // set up entry resource or DN - if (is_resource($entry)) { - $this->_entry = &$entry; - } else { - $this->_dn = $entry; - } - - // set up LDAP link - if ($ldap instanceof Net_LDAP2) { - $this->_ldap = &$ldap; - $this->_link = $ldap->getLink(); - } elseif (is_resource($ldap)) { - $this->_link = $ldap; - } elseif (is_array($ldap)) { - // Special case: here $ldap is an array of attributes, - // this means, we have no link. This is a "virtual" entry. - // We just set up the attributes so one can work with the object - // as expected, but an update() fails unless setLDAP() is called. - $this->setAttributes($ldap); - } - - // if this is an entry existing in the directory, - // then set up as old and fetch attrs - if (is_resource($this->_entry) && is_resource($this->_link)) { - $this->_new = false; - $this->_dn = @ldap_get_dn($this->_link, $this->_entry); - $this->setAttributes(); // fetch attributes from server - } - } - - /** - * Creates a fresh entry that may be added to the directory later on - * - * Use this method, if you want to initialize a fresh entry. - * - * The method should be called statically: $entry = Net_LDAP2_Entry::createFresh(); - * You should put a 'objectClass' attribute into the $attrs so the directory server - * knows which object you want to create. However, you may omit this in case you - * don't want to add this entry to a directory server. - * - * The attributes parameter is as following: - * - * $attrs = array( 'attribute1' => array('value1', 'value2'), - * 'attribute2' => 'single value' - * ); - * - * - * @param string $dn DN of the Entry - * @param array $attrs Attributes of the entry - * - * @static - * @return Net_LDAP2_Entry|Net_LDAP2_Error - */ - public static function createFresh($dn, $attrs = array()) - { - if (!is_array($attrs)) { - return PEAR::raiseError("Unable to create fresh entry: Parameter \$attrs needs to be an array!"); - } - - $entry = new Net_LDAP2_Entry($attrs, $dn); - return $entry; - } - - /** - * Creates a Net_LDAP2_Entry object out of an ldap entry resource - * - * Use this method, if you want to initialize an entry object that is - * already present in some directory and that you have read manually. - * - * Please note, that if you want to create an entry object that represents - * some already existing entry, you should use {@link createExisting()}. - * - * The method should be called statically: $entry = Net_LDAP2_Entry::createConnected(); - * - * @param Net_LDAP2 $ldap Net_LDA2 object - * @param resource $entry PHP LDAP entry resource - * - * @static - * @return Net_LDAP2_Entry|Net_LDAP2_Error - */ - public static function createConnected($ldap, $entry) - { - if (!$ldap instanceof Net_LDAP2) { - return PEAR::raiseError("Unable to create connected entry: Parameter \$ldap needs to be a Net_LDAP2 object!"); - } - if (!is_resource($entry)) { - return PEAR::raiseError("Unable to create connected entry: Parameter \$entry needs to be a ldap entry resource!"); - } - - $entry = new Net_LDAP2_Entry($ldap, $entry); - return $entry; - } - - /** - * Creates an Net_LDAP2_Entry object that is considered already existing - * - * Use this method, if you want to modify an already existing entry - * without fetching it first. - * In most cases however, it is better to fetch the entry via Net_LDAP2->getEntry()! - * - * Please note that you should take care if you construct entries manually with this - * because you may get weird synchronisation problems. - * The attributes and values as well as the entry itself are considered existent - * which may produce errors if you try to modify an entry which doesn't really exist - * or if you try to overwrite some attribute with an value already present. - * - * This method is equal to calling createFresh() and after that markAsNew(FALSE). - * - * The method should be called statically: $entry = Net_LDAP2_Entry::createExisting(); - * - * The attributes parameter is as following: - * - * $attrs = array( 'attribute1' => array('value1', 'value2'), - * 'attribute2' => 'single value' - * ); - * - * - * @param string $dn DN of the Entry - * @param array $attrs Attributes of the entry - * - * @static - * @return Net_LDAP2_Entry|Net_LDAP2_Error - */ - public static function createExisting($dn, $attrs = array()) - { - if (!is_array($attrs)) { - return PEAR::raiseError("Unable to create entry object: Parameter \$attrs needs to be an array!"); - } - - $entry = Net_LDAP2_Entry::createFresh($dn, $attrs); - if ($entry instanceof Net_LDAP2_Error) { - return $entry; - } else { - $entry->markAsNew(false); - return $entry; - } - } - - /** - * Get or set the distinguished name of the entry - * - * If called without an argument the current (or the new DN if set) DN gets returned. - * If you provide an DN, this entry is moved to the new location specified if a DN existed. - * If the DN was not set, the DN gets initialized. Call {@link update()} to actually create - * the new Entry in the directory. - * To fetch the current active DN after setting a new DN but before an update(), you can use - * {@link currentDN()} to retrieve the DN that is currently active. - * - * Please note that special characters (eg german umlauts) should be encoded using utf8_encode(). - * You may use {@link Net_LDAP2_Util::canonical_dn()} for properly encoding of the DN. - * - * @param string $dn New distinguished name - * - * @access public - * @return string|true Distinguished name (or true if a new DN was provided) - */ - public function dn($dn = null) - { - if (false == is_null($dn)) { - if (is_null($this->_dn)) { - $this->_dn = $dn; - } else { - $this->_newdn = $dn; - } - return true; - } - return (isset($this->_newdn) ? $this->_newdn : $this->currentDN()); - } - - /** - * Renames or moves the entry - * - * This is just a convinience alias to {@link dn()} - * to make your code more meaningful. - * - * @param string $newdn The new DN - * - * @return true - */ - public function move($newdn) - { - return $this->dn($newdn); - } - - /** - * Sets the internal attributes array - * - * This fetches the values for the attributes from the server. - * The attribute Syntax will be checked so binary attributes will be returned - * as binary values. - * - * Attributes may be passed directly via the $attributes parameter to setup this - * entry manually. This overrides attribute fetching from the server. - * - * @param array $attributes Attributes to set for this entry - * - * @access protected - * @return void - */ - protected function setAttributes($attributes = null) - { - /* - * fetch attributes from the server - */ - if (is_null($attributes) && is_resource($this->_entry) && is_resource($this->_link)) { - // fetch schema - if ($this->_ldap instanceof Net_LDAP2) { - $schema =& $this->_ldap->schema(); - } - // fetch attributes - $attributes = array(); - do { - if (empty($attr)) { - $ber = null; - $attr = @ldap_first_attribute($this->_link, $this->_entry, $ber); - } else { - $attr = @ldap_next_attribute($this->_link, $this->_entry, $ber); - } - if ($attr) { - $func = 'ldap_get_values'; // standard function to fetch value - - // Try to get binary values as binary data - if ($schema instanceof Net_LDAP2_Schema) { - if ($schema->isBinary($attr)) { - $func = 'ldap_get_values_len'; - } - } - // fetch attribute value (needs error checking?) - $attributes[$attr] = $func($this->_link, $this->_entry, $attr); - } - } while ($attr); - } - - /* - * set attribute data directly, if passed - */ - if (is_array($attributes) && count($attributes) > 0) { - if (isset($attributes["count"]) && is_numeric($attributes["count"])) { - unset($attributes["count"]); - } - foreach ($attributes as $k => $v) { - // attribute names should not be numeric - if (is_numeric($k)) { - continue; - } - // map generic attribute name to real one - $this->_map[strtolower($k)] = $k; - // attribute values should be in an array - if (false == is_array($v)) { - $v = array($v); - } - // remove the value count (comes from ldap server) - if (isset($v["count"])) { - unset($v["count"]); - } - $this->_attributes[$k] = $v; - } - } - - // save a copy for later use - $this->_original = $this->_attributes; - } - - /** - * Get the values of all attributes in a hash - * - * The returned hash has the form - * array('attributename' => 'single value', - * 'attributename' => array('value1', value2', value3')) - * - * @access public - * @return array Hash of all attributes with their values - */ - public function getValues() - { - $attrs = array(); - foreach ($this->_attributes as $attr => $value) { - $attrs[$attr] = $this->getValue($attr); - } - return $attrs; - } - - /** - * Get the value of a specific attribute - * - * The first parameter is the name of the attribute - * The second parameter influences the way the value is returned: - * 'single': only the first value is returned as string - * 'all': all values including the value count are returned in an - * array - * 'default': in all other cases an attribute value with a single value is - * returned as string, if it has multiple values it is returned - * as an array (without value count) - * - * @param string $attr Attribute name - * @param string $option Option - * - * @access public - * @return string|array|PEAR_Error string, array or PEAR_Error - */ - public function getValue($attr, $option = null) - { - $attr = $this->getAttrName($attr); - - if (false == array_key_exists($attr, $this->_attributes)) { - return PEAR::raiseError("Unknown attribute ($attr) requested"); - } - - $value = $this->_attributes[$attr]; - - if ($option == "single" || (count($value) == 1 && $option != 'all')) { - $value = array_shift($value); - } - - return $value; - } - - /** - * Alias function of getValue for perl-ldap interface - * - * @see getValue() - * @return string|array|PEAR_Error - */ - public function get_value() - { - $args = func_get_args(); - return call_user_func_array(array( &$this, 'getValue' ), $args); - } - - /** - * Returns an array of attributes names - * - * @access public - * @return array Array of attribute names - */ - public function attributes() - { - return array_keys($this->_attributes); - } - - /** - * Returns whether an attribute exists or not - * - * @param string $attr Attribute name - * - * @access public - * @return boolean - */ - public function exists($attr) - { - $attr = $this->getAttrName($attr); - return array_key_exists($attr, $this->_attributes); - } - - /** - * Adds a new attribute or a new value to an existing attribute - * - * The paramter has to be an array of the form: - * array('attributename' => 'single value', - * 'attributename' => array('value1', 'value2)) - * When the attribute already exists the values will be added, else the - * attribute will be created. These changes are local to the entry and do - * not affect the entry on the server until update() is called. - * - * Note, that you can add values of attributes that you haven't selected, but if - * you do so, {@link getValue()} and {@link getValues()} will only return the - * values you added, _NOT_ all values present on the server. To avoid this, just refetch - * the entry after calling {@link update()} or select the attribute. - * - * @param array $attr Attributes to add - * - * @access public - * @return true|Net_LDAP2_Error - */ - public function add($attr = array()) - { - if (false == is_array($attr)) { - return PEAR::raiseError("Parameter must be an array"); - } - foreach ($attr as $k => $v) { - $k = $this->getAttrName($k); - if (false == is_array($v)) { - // Do not add empty values - if ($v == null) { - continue; - } else { - $v = array($v); - } - } - // add new values to existing attribute or add new attribute - if ($this->exists($k)) { - $this->_attributes[$k] = array_unique(array_merge($this->_attributes[$k], $v)); - } else { - $this->_map[strtolower($k)] = $k; - $this->_attributes[$k] = $v; - } - // save changes for update() - if (empty($this->_changes["add"][$k])) { - $this->_changes["add"][$k] = array(); - } - $this->_changes["add"][$k] = array_unique(array_merge($this->_changes["add"][$k], $v)); - } - $return = true; - return $return; - } - - /** - * Deletes an whole attribute or a value or the whole entry - * - * The parameter can be one of the following: - * - * "attributename" - The attribute as a whole will be deleted - * array("attributename1", "attributename2) - All given attributes will be - * deleted - * array("attributename" => "value") - The value will be deleted - * array("attributename" => array("value1", "value2") - The given values - * will be deleted - * If $attr is null or omitted , then the whole Entry will be deleted! - * - * These changes are local to the entry and do - * not affect the entry on the server until {@link update()} is called. - * - * Please note that you must select the attribute (at $ldap->search() for example) - * to be able to delete values of it, Otherwise {@link update()} will silently fail - * and remove nothing. - * - * @param string|array $attr Attributes to delete (NULL or missing to delete whole entry) - * - * @access public - * @return true - */ - public function delete($attr = null) - { - if (is_null($attr)) { - $this->_delete = true; - return true; - } - if (is_string($attr)) { - $attr = array($attr); - } - // Make the assumption that attribute names cannot be numeric, - // therefore this has to be a simple list of attribute names to delete - if (is_numeric(key($attr))) { - foreach ($attr as $name) { - if (is_array($name)) { - // someone mixed modes (list mode but specific values given!) - $del_attr_name = array_search($name, $attr); - $this->delete(array($del_attr_name => $name)); - } else { - // mark for update() if this attr was not marked before - $name = $this->getAttrName($name); - if ($this->exists($name)) { - $this->_changes["delete"][$name] = null; - unset($this->_attributes[$name]); - } - } - } - } else { - // Here we have a hash with "attributename" => "value to delete" - foreach ($attr as $name => $values) { - if (is_int($name)) { - // someone mixed modes and gave us just an attribute name - $this->delete($values); - } else { - // mark for update() if this attr was not marked before; - // this time it must consider the selected values also - $name = $this->getAttrName($name); - if ($this->exists($name)) { - if (false == is_array($values)) { - $values = array($values); - } - // save values to be deleted - if (empty($this->_changes["delete"][$name])) { - $this->_changes["delete"][$name] = array(); - } - $this->_changes["delete"][$name] = - array_unique(array_merge($this->_changes["delete"][$name], $values)); - foreach ($values as $value) { - // find the key for the value that should be deleted - $key = array_search($value, $this->_attributes[$name]); - if (false !== $key) { - // delete the value - unset($this->_attributes[$name][$key]); - } - } - } - } - } - } - $return = true; - return $return; - } - - /** - * Replaces attributes or its values - * - * The parameter has to an array of the following form: - * array("attributename" => "single value", - * "attribute2name" => array("value1", "value2"), - * "deleteme1" => null, - * "deleteme2" => "") - * If the attribute does not yet exist it will be added instead (see also $force). - * If the attribue value is null, the attribute will de deleted. - * - * These changes are local to the entry and do - * not affect the entry on the server until {@link update()} is called. - * - * In some cases you are not allowed to read the attributes value (for - * example the ActiveDirectory attribute unicodePwd) but are allowed to - * replace the value. In this case replace() would assume that the attribute - * is not in the directory yet and tries to add it which will result in an - * LDAP_TYPE_OR_VALUE_EXISTS error. - * To force replace mode instead of add, you can set $force to true. - * - * @param array $attr Attributes to replace - * @param bool $force Force replacing mode in case we can't read the attr value but are allowed to replace it - * - * @access public - * @return true|Net_LDAP2_Error - */ - public function replace($attr = array(), $force = false) - { - if (false == is_array($attr)) { - return PEAR::raiseError("Parameter must be an array"); - } - foreach ($attr as $k => $v) { - $k = $this->getAttrName($k); - if (false == is_array($v)) { - // delete attributes with empty values; treat ints as string - if (is_int($v)) { - $v = "$v"; - } - if ($v == null) { - $this->delete($k); - continue; - } else { - $v = array($v); - } - } - // existing attributes will get replaced - if ($this->exists($k) || $force) { - $this->_changes["replace"][$k] = $v; - $this->_attributes[$k] = $v; - } else { - // new ones just get added - $this->add(array($k => $v)); - } - } - $return = true; - return $return; - } - - /** - * Update the entry on the directory server - * - * This will evaluate all changes made so far and send them - * to the directory server. - * Please note, that if you make changes to objectclasses wich - * have mandatory attributes set, update() will currently fail. - * Remove the entry from the server and readd it as new in such cases. - * This also will deal with problems with setting structural object classes. - * - * @param Net_LDAP2 $ldap If passed, a call to setLDAP() is issued prior update, thus switching the LDAP-server. This is for perl-ldap interface compliance - * - * @access public - * @return true|Net_LDAP2_Error - * @todo Entry rename with a DN containing special characters needs testing! - */ - public function update($ldap = null) - { - if ($ldap) { - $msg = $this->setLDAP($ldap); - if (Net_LDAP2::isError($msg)) { - return PEAR::raiseError('You passed an invalid $ldap variable to update()'); - } - } - - // ensure we have a valid LDAP object - $ldap =& $this->getLDAP(); - if (!$ldap instanceof Net_LDAP2) { - return PEAR::raiseError("The entries LDAP object is not valid"); - } - - // Get and check link - $link = $ldap->getLink(); - if (!is_resource($link)) { - return PEAR::raiseError("Could not update entry: internal LDAP link is invalid"); - } - - /* - * Delete the entry - */ - if (true === $this->_delete) { - return $ldap->delete($this); - } - - /* - * New entry - */ - if (true === $this->_new) { - $msg = $ldap->add($this); - if (Net_LDAP2::isError($msg)) { - return $msg; - } - $this->_new = false; - $this->_changes['add'] = array(); - $this->_changes['delete'] = array(); - $this->_changes['replace'] = array(); - $this->_original = $this->_attributes; - - $return = true; - return $return; - } - - /* - * Rename/move entry - */ - if (false == is_null($this->_newdn)) { - if ($ldap->getLDAPVersion() !== 3) { - return PEAR::raiseError("Renaming/Moving an entry is only supported in LDAPv3"); - } - // make dn relative to parent (needed for ldap rename) - $parent = Net_LDAP2_Util::ldap_explode_dn($this->_newdn, array('casefolding' => 'none', 'reverse' => false, 'onlyvalues' => false)); - if (Net_LDAP2::isError($parent)) { - return $parent; - } - $child = array_shift($parent); - // maybe the dn consist of a multivalued RDN, we must build the dn in this case - // because the $child-RDN is an array! - if (is_array($child)) { - $child = Net_LDAP2_Util::canonical_dn($child); - } - $parent = Net_LDAP2_Util::canonical_dn($parent); - - // rename/move - if (false == @ldap_rename($link, $this->_dn, $child, $parent, true)) { - return PEAR::raiseError("Entry not renamed: " . - @ldap_error($link), @ldap_errno($link)); - } - // reflect changes to local copy - $this->_dn = $this->_newdn; - $this->_newdn = null; - } - - /* - * Carry out modifications to the entry - */ - // ADD - foreach ($this->_changes["add"] as $attr => $value) { - // if attribute exists, add new values - if ($this->exists($attr)) { - if (false === @ldap_mod_add($link, $this->dn(), array($attr => $value))) { - return PEAR::raiseError("Could not add new values to attribute $attr: " . - @ldap_error($link), @ldap_errno($link)); - } - } else { - // new attribute - if (false === @ldap_modify($link, $this->dn(), array($attr => $value))) { - return PEAR::raiseError("Could not add new attribute $attr: " . - @ldap_error($link), @ldap_errno($link)); - } - } - // all went well here, I guess - unset($this->_changes["add"][$attr]); - } - - // DELETE - foreach ($this->_changes["delete"] as $attr => $value) { - // In LDAPv3 you need to specify the old values for deleting - if (is_null($value) && $ldap->getLDAPVersion() === 3) { - $value = $this->_original[$attr]; - } - if (false === @ldap_mod_del($link, $this->dn(), array($attr => $value))) { - return PEAR::raiseError("Could not delete attribute $attr: " . - @ldap_error($link), @ldap_errno($link)); - } - unset($this->_changes["delete"][$attr]); - } - - // REPLACE - foreach ($this->_changes["replace"] as $attr => $value) { - if (false === @ldap_modify($link, $this->dn(), array($attr => $value))) { - return PEAR::raiseError("Could not replace attribute $attr values: " . - @ldap_error($link), @ldap_errno($link)); - } - unset($this->_changes["replace"][$attr]); - } - - // all went well, so _original (server) becomes _attributes (local copy) - $this->_original = $this->_attributes; - - $return = true; - return $return; - } - - /** - * Returns the right attribute name - * - * @param string $attr Name of attribute - * - * @access protected - * @return string The right name of the attribute - */ - protected function getAttrName($attr) - { - $name = strtolower($attr); - if (array_key_exists($name, $this->_map)) { - $attr = $this->_map[$name]; - } - return $attr; - } - - /** - * Returns a reference to the LDAP-Object of this entry - * - * @access public - * @return Net_LDAP2|Net_LDAP2_Error Reference to the Net_LDAP2 Object (the connection) or Net_LDAP2_Error - */ - public function &getLDAP() - { - if (!$this->_ldap instanceof Net_LDAP2) { - $err = new PEAR_Error('LDAP is not a valid Net_LDAP2 object'); - return $err; - } else { - return $this->_ldap; - } - } - - /** - * Sets a reference to the LDAP-Object of this entry - * - * After setting a Net_LDAP2 object, calling update() will use that object for - * updating directory contents. Use this to dynamicly switch directorys. - * - * @param Net_LDAP2 &$ldap Net_LDAP2 object that this entry should be connected to - * - * @access public - * @return true|Net_LDAP2_Error - */ - public function setLDAP(&$ldap) - { - if (!$ldap instanceof Net_LDAP2) { - return PEAR::raiseError("LDAP is not a valid Net_LDAP2 object"); - } else { - $this->_ldap =& $ldap; - return true; - } - } - - /** - * Marks the entry as new/existing. - * - * If an Entry is marked as new, it will be added to the directory - * when calling {@link update()}. - * If the entry is marked as old ($mark = false), then the entry is - * assumed to be present in the directory server wich results in - * modification when calling {@link update()}. - * - * @param boolean $mark Value to set, defaults to "true" - * - * @return void - */ - public function markAsNew($mark = true) - { - $this->_new = ($mark)? true : false; - } - - /** - * Applies a regular expression onto a single- or multivalued attribute (like preg_match()) - * - * This method behaves like PHPs preg_match() but with some exceptions. - * If you want to retrieve match information, then you MUST pass the - * $matches parameter via reference! otherwise you will get no matches. - * Since it is possible to have multi valued attributes the $matches - * array will have a additionally numerical dimension (one for each value): - * - * $matches = array( - * 0 => array (usual preg_match() returnarray), - * 1 => array (usual preg_match() returnarray) - * ) - * - * Please note, that $matches will be initialized to an empty array inside. - * - * Usage example: - * - * $result = $entry->preg_match('/089(\d+)/', 'telephoneNumber', &$matches); - * if ( $result === true ){ - * echo "First match: ".$matches[0][1]; // Match of value 1, content of first bracket - * } else { - * if ( Net_LDAP2::isError($result) ) { - * echo "Error: ".$result->getMessage(); - * } else { - * echo "No match found."; - * } - * } - * - * - * Please note that it is important to test for an Net_LDAP2_Error, because objects are - * evaluating to true by default, thus if an error occured, and you only check using "==" then - * you get misleading results. Use the "identical" (===) operator to test for matches to - * avoid this as shown above. - * - * @param string $regex The regular expression - * @param string $attr_name The attribute to search in - * @param array $matches (optional, PASS BY REFERENCE!) Array to store matches in - * - * @return boolean|Net_LDAP2_Error TRUE, if we had a match in one of the values, otherwise false. Net_LDAP2_Error in case something went wrong - */ - public function pregMatch($regex, $attr_name, $matches = array()) - { - $matches = array(); - - // fetch attribute values - $attr = $this->getValue($attr_name, 'all'); - if (Net_LDAP2::isError($attr)) { - return $attr; - } else { - unset($attr['count']); - } - - // perform preg_match() on all values - $match = false; - foreach ($attr as $thisvalue) { - $matches_int = array(); - if (preg_match($regex, $thisvalue, $matches_int)) { - $match = true; - array_push($matches, $matches_int); // store matches in reference - } - } - return $match; - } - - /** - * Alias of {@link pregMatch()} for compatibility to Net_LDAP 1 - * - * @see pregMatch() - * @return boolean|Net_LDAP2_Error - */ - public function preg_match() - { - $args = func_get_args(); - return call_user_func_array(array( &$this, 'pregMatch' ), $args); - } - - /** - * Tells if the entry is consiedered as new (not present in the server) - * - * Please note, that this doesn't tell you if the entry is present on the server. - * Use {@link Net_LDAP2::dnExists()} to see if an entry is already there. - * - * @return boolean - */ - public function isNew() - { - return $this->_new; - } - - - /** - * Is this entry going to be deleted once update() is called? - * - * @return boolean - */ - public function willBeDeleted() - { - return $this->_delete; - } - - /** - * Is this entry going to be moved once update() is called? - * - * @return boolean - */ - public function willBeMoved() - { - return ($this->dn() !== $this->currentDN()); - } - - /** - * Returns always the original DN - * - * If an entry will be moved but {@link update()} was not called, - * {@link dn()} will return the new DN. This method however, returns - * always the current active DN. - * - * @return string - */ - public function currentDN() - { - return $this->_dn; - } - - /** - * Returns the attribute changes to be carried out once update() is called - * - * @return array - */ - public function getChanges() - { - return $this->_changes; - } -} -?> diff --git a/extlib/Net/LDAP2/Filter.php b/extlib/Net/LDAP2/Filter.php deleted file mode 100644 index 0723edab2..000000000 --- a/extlib/Net/LDAP2/Filter.php +++ /dev/null @@ -1,514 +0,0 @@ - -* @copyright 2009 Benedikt Hallinger -* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 -* @version SVN: $Id: Filter.php 289978 2009-10-27 09:56:41Z beni $ -* @link http://pear.php.net/package/Net_LDAP2/ -*/ - -/** -* Includes -*/ -require_once 'PEAR.php'; -require_once 'Util.php'; - -/** -* Object representation of a part of a LDAP filter. -* -* This Class is not completely compatible to the PERL interface! -* -* The purpose of this class is, that users can easily build LDAP filters -* without having to worry about right escaping etc. -* A Filter is built using several independent filter objects -* which are combined afterwards. This object works in two -* modes, depending how the object is created. -* If the object is created using the {@link create()} method, then this is a leaf-object. -* If the object is created using the {@link combine()} method, then this is a container object. -* -* LDAP filters are defined in RFC-2254 and can be found under -* {@link http://www.ietf.org/rfc/rfc2254.txt} -* -* Here a quick copy&paste example: -* -* $filter0 = Net_LDAP2_Filter::create('stars', 'equals', '***'); -* $filter_not0 = Net_LDAP2_Filter::combine('not', $filter0); -* -* $filter1 = Net_LDAP2_Filter::create('gn', 'begins', 'bar'); -* $filter2 = Net_LDAP2_Filter::create('gn', 'ends', 'baz'); -* $filter_comp = Net_LDAP2_Filter::combine('or',array($filter_not0, $filter1, $filter2)); -* -* echo $filter_comp->asString(); -* // This will output: (|(!(stars=\0x5c0x2a\0x5c0x2a\0x5c0x2a))(gn=bar*)(gn=*baz)) -* // The stars in $filter0 are treaten as real stars unless you disable escaping. -* -* -* @category Net -* @package Net_LDAP2 -* @author Benedikt Hallinger -* @license http://www.gnu.org/copyleft/lesser.html LGPL -* @link http://pear.php.net/package/Net_LDAP2/ -*/ -class Net_LDAP2_Filter extends PEAR -{ - /** - * Storage for combination of filters - * - * This variable holds a array of filter objects - * that should be combined by this filter object. - * - * @access protected - * @var array - */ - protected $_subfilters = array(); - - /** - * Match of this filter - * - * If this is a leaf filter, then a matching rule is stored, - * if it is a container, then it is a logical operator - * - * @access protected - * @var string - */ - protected $_match; - - /** - * Single filter - * - * If we operate in leaf filter mode, - * then the constructing method stores - * the filter representation here - * - * @acces private - * @var string - */ - protected $_filter; - - /** - * Create a new Net_LDAP2_Filter object and parse $filter. - * - * This is for PERL Net::LDAP interface. - * Construction of Net_LDAP2_Filter objects should happen through either - * {@link create()} or {@link combine()} which give you more control. - * However, you may use the perl iterface if you already have generated filters. - * - * @param string $filter LDAP filter string - * - * @see parse() - */ - public function __construct($filter = false) - { - // The optional parameter must remain here, because otherwise create() crashes - if (false !== $filter) { - $filter_o = self::parse($filter); - if (PEAR::isError($filter_o)) { - $this->_filter = $filter_o; // assign error, so asString() can report it - } else { - $this->_filter = $filter_o->asString(); - } - } - } - - /** - * Constructor of a new part of a LDAP filter. - * - * The following matching rules exists: - * - equals: One of the attributes values is exactly $value - * Please note that case sensitiviness is depends on the - * attributes syntax configured in the server. - * - begins: One of the attributes values must begin with $value - * - ends: One of the attributes values must end with $value - * - contains: One of the attributes values must contain $value - * - present | any: The attribute can contain any value but must be existent - * - greater: The attributes value is greater than $value - * - less: The attributes value is less than $value - * - greaterOrEqual: The attributes value is greater or equal than $value - * - lessOrEqual: The attributes value is less or equal than $value - * - approx: One of the attributes values is similar to $value - * - * If $escape is set to true (default) then $value will be escaped - * properly. If it is set to false then $value will be treaten as raw filter value string. - * You should escape yourself using {@link Net_LDAP2_Util::escape_filter_value()}! - * - * Examples: - * - * // This will find entries that contain an attribute "sn" that ends with "foobar": - * $filter = new Net_LDAP2_Filter('sn', 'ends', 'foobar'); - * - * // This will find entries that contain an attribute "sn" that has any value set: - * $filter = new Net_LDAP2_Filter('sn', 'any'); - * - * - * @param string $attr_name Name of the attribute the filter should apply to - * @param string $match Matching rule (equals, begins, ends, contains, greater, less, greaterOrEqual, lessOrEqual, approx, any) - * @param string $value (optional) if given, then this is used as a filter - * @param boolean $escape Should $value be escaped? (default: yes, see {@link Net_LDAP2_Util::escape_filter_value()} for detailed information) - * - * @return Net_LDAP2_Filter|Net_LDAP2_Error - */ - public static function &create($attr_name, $match, $value = '', $escape = true) - { - $leaf_filter = new Net_LDAP2_Filter(); - if ($escape) { - $array = Net_LDAP2_Util::escape_filter_value(array($value)); - $value = $array[0]; - } - switch (strtolower($match)) { - case 'equals': - $leaf_filter->_filter = '(' . $attr_name . '=' . $value . ')'; - break; - case 'begins': - $leaf_filter->_filter = '(' . $attr_name . '=' . $value . '*)'; - break; - case 'ends': - $leaf_filter->_filter = '(' . $attr_name . '=*' . $value . ')'; - break; - case 'contains': - $leaf_filter->_filter = '(' . $attr_name . '=*' . $value . '*)'; - break; - case 'greater': - $leaf_filter->_filter = '(' . $attr_name . '>' . $value . ')'; - break; - case 'less': - $leaf_filter->_filter = '(' . $attr_name . '<' . $value . ')'; - break; - case 'greaterorequal': - case '>=': - $leaf_filter->_filter = '(' . $attr_name . '>=' . $value . ')'; - break; - case 'lessorequal': - case '<=': - $leaf_filter->_filter = '(' . $attr_name . '<=' . $value . ')'; - break; - case 'approx': - case '~=': - $leaf_filter->_filter = '(' . $attr_name . '~=' . $value . ')'; - break; - case 'any': - case 'present': // alias that may improve user code readability - $leaf_filter->_filter = '(' . $attr_name . '=*)'; - break; - default: - return PEAR::raiseError('Net_LDAP2_Filter create error: matching rule "' . $match . '" not known!'); - } - return $leaf_filter; - } - - /** - * Combine two or more filter objects using a logical operator - * - * This static method combines two or more filter objects and returns one single - * filter object that contains all the others. - * Call this method statically: $filter = Net_LDAP2_Filter('or', array($filter1, $filter2)) - * If the array contains filter strings instead of filter objects, we will try to parse them. - * - * @param string $log_op The locicall operator. May be "and", "or", "not" or the subsequent logical equivalents "&", "|", "!" - * @param array|Net_LDAP2_Filter $filters array with Net_LDAP2_Filter objects - * - * @return Net_LDAP2_Filter|Net_LDAP2_Error - * @static - */ - public static function &combine($log_op, $filters) - { - if (PEAR::isError($filters)) { - return $filters; - } - - // substitude named operators to logical operators - if ($log_op == 'and') $log_op = '&'; - if ($log_op == 'or') $log_op = '|'; - if ($log_op == 'not') $log_op = '!'; - - // tests for sane operation - if ($log_op == '!') { - // Not-combination, here we only accept one filter object or filter string - if ($filters instanceof Net_LDAP2_Filter) { - $filters = array($filters); // force array - } elseif (is_string($filters)) { - $filter_o = self::parse($filters); - if (PEAR::isError($filter_o)) { - $err = PEAR::raiseError('Net_LDAP2_Filter combine error: '.$filter_o->getMessage()); - return $err; - } else { - $filters = array($filter_o); - } - } elseif (is_array($filters)) { - $err = PEAR::raiseError('Net_LDAP2_Filter combine error: operator is "not" but $filter is an array!'); - return $err; - } else { - $err = PEAR::raiseError('Net_LDAP2_Filter combine error: operator is "not" but $filter is not a valid Net_LDAP2_Filter nor a filter string!'); - return $err; - } - } elseif ($log_op == '&' || $log_op == '|') { - if (!is_array($filters) || count($filters) < 2) { - $err = PEAR::raiseError('Net_LDAP2_Filter combine error: parameter $filters is not an array or contains less than two Net_LDAP2_Filter objects!'); - return $err; - } - } else { - $err = PEAR::raiseError('Net_LDAP2_Filter combine error: logical operator is not known!'); - return $err; - } - - $combined_filter = new Net_LDAP2_Filter(); - foreach ($filters as $key => $testfilter) { // check for errors - if (PEAR::isError($testfilter)) { - return $testfilter; - } elseif (is_string($testfilter)) { - // string found, try to parse into an filter object - $filter_o = self::parse($testfilter); - if (PEAR::isError($filter_o)) { - return $filter_o; - } else { - $filters[$key] = $filter_o; - } - } elseif (!$testfilter instanceof Net_LDAP2_Filter) { - $err = PEAR::raiseError('Net_LDAP2_Filter combine error: invalid object passed in array $filters!'); - return $err; - } - } - - $combined_filter->_subfilters = $filters; - $combined_filter->_match = $log_op; - return $combined_filter; - } - - /** - * Parse FILTER into a Net_LDAP2_Filter object - * - * This parses an filter string into Net_LDAP2_Filter objects. - * - * @param string $FILTER The filter string - * - * @access static - * @return Net_LDAP2_Filter|Net_LDAP2_Error - * @todo Leaf-mode: Do we need to escape at all? what about *-chars?check for the need of encoding values, tackle problems (see code comments) - */ - public static function parse($FILTER) - { - if (preg_match('/^\((.+?)\)$/', $FILTER, $matches)) { - if (in_array(substr($matches[1], 0, 1), array('!', '|', '&'))) { - // Subfilter processing: pass subfilters to parse() and combine - // the objects using the logical operator detected - // we have now something like "&(...)(...)(...)" but at least one part ("!(...)"). - // Each subfilter could be an arbitary complex subfilter. - - // extract logical operator and filter arguments - $log_op = substr($matches[1], 0, 1); - $remaining_component = substr($matches[1], 1); - - // split $remaining_component into individual subfilters - // we cannot use split() for this, because we do not know the - // complexiness of the subfilter. Thus, we look trough the filter - // string and just recognize ending filters at the first level. - // We record the index number of the char and use that information - // later to split the string. - $sub_index_pos = array(); - $prev_char = ''; // previous character looked at - $level = 0; // denotes the current bracket level we are, - // >1 is too deep, 1 is ok, 0 is outside any - // subcomponent - for ($curpos = 0; $curpos < strlen($remaining_component); $curpos++) { - $cur_char = substr($remaining_component, $curpos, 1); - - // rise/lower bracket level - if ($cur_char == '(' && $prev_char != '\\') { - $level++; - } elseif ($cur_char == ')' && $prev_char != '\\') { - $level--; - } - - if ($cur_char == '(' && $prev_char == ')' && $level == 1) { - array_push($sub_index_pos, $curpos); // mark the position for splitting - } - $prev_char = $cur_char; - } - - // now perform the splits. To get also the last part, we - // need to add the "END" index to the split array - array_push($sub_index_pos, strlen($remaining_component)); - $subfilters = array(); - $oldpos = 0; - foreach ($sub_index_pos as $s_pos) { - $str_part = substr($remaining_component, $oldpos, $s_pos - $oldpos); - array_push($subfilters, $str_part); - $oldpos = $s_pos; - } - - // some error checking... - if (count($subfilters) == 1) { - // only one subfilter found - } elseif (count($subfilters) > 1) { - // several subfilters found - if ($log_op == "!") { - return PEAR::raiseError("Filter parsing error: invalid filter syntax - NOT operator detected but several arguments given!"); - } - } else { - // this should not happen unless the user specified a wrong filter - return PEAR::raiseError("Filter parsing error: invalid filter syntax - got operator '$log_op' but no argument!"); - } - - // Now parse the subfilters into objects and combine them using the operator - $subfilters_o = array(); - foreach ($subfilters as $s_s) { - $o = self::parse($s_s); - if (PEAR::isError($o)) { - return $o; - } else { - array_push($subfilters_o, self::parse($s_s)); - } - } - - $filter_o = self::combine($log_op, $subfilters_o); - return $filter_o; - - } else { - // This is one leaf filter component, do some syntax checks, then escape and build filter_o - // $matches[1] should be now something like "foo=bar" - - // detect multiple leaf components - // [TODO] Maybe this will make problems with filters containing brackets inside the value - if (stristr($matches[1], ')(')) { - return PEAR::raiseError("Filter parsing error: invalid filter syntax - multiple leaf components detected!"); - } else { - $filter_parts = preg_split('/(?|<|>=|<=)/', $matches[1], 2, PREG_SPLIT_DELIM_CAPTURE); - if (count($filter_parts) != 3) { - return PEAR::raiseError("Filter parsing error: invalid filter syntax - unknown matching rule used"); - } else { - $filter_o = new Net_LDAP2_Filter(); - // [TODO]: Do we need to escape at all? what about *-chars user provide and that should remain special? - // I think, those prevent escaping! We need to check against PERL Net::LDAP! - // $value_arr = Net_LDAP2_Util::escape_filter_value(array($filter_parts[2])); - // $value = $value_arr[0]; - $value = $filter_parts[2]; - $filter_o->_filter = '('.$filter_parts[0].$filter_parts[1].$value.')'; - return $filter_o; - } - } - } - } else { - // ERROR: Filter components must be enclosed in round brackets - return PEAR::raiseError("Filter parsing error: invalid filter syntax - filter components must be enclosed in round brackets"); - } - } - - /** - * Get the string representation of this filter - * - * This method runs through all filter objects and creates - * the string representation of the filter. If this - * filter object is a leaf filter, then it will return - * the string representation of this filter. - * - * @return string|Net_LDAP2_Error - */ - public function asString() - { - if ($this->isLeaf()) { - $return = $this->_filter; - } else { - $return = ''; - foreach ($this->_subfilters as $filter) { - $return = $return.$filter->asString(); - } - $return = '(' . $this->_match . $return . ')'; - } - return $return; - } - - /** - * Alias for perl interface as_string() - * - * @see asString() - * @return string|Net_LDAP2_Error - */ - public function as_string() - { - return $this->asString(); - } - - /** - * Print the text representation of the filter to FH, or the currently selected output handle if FH is not given - * - * This method is only for compatibility to the perl interface. - * However, the original method was called "print" but due to PHP language restrictions, - * we can't have a print() method. - * - * @param resource $FH (optional) A filehandle resource - * - * @return true|Net_LDAP2_Error - */ - public function printMe($FH = false) - { - if (!is_resource($FH)) { - if (PEAR::isError($FH)) { - return $FH; - } - $filter_str = $this->asString(); - if (PEAR::isError($filter_str)) { - return $filter_str; - } else { - print($filter_str); - } - } else { - $filter_str = $this->asString(); - if (PEAR::isError($filter_str)) { - return $filter_str; - } else { - $res = @fwrite($FH, $this->asString()); - if ($res == false) { - return PEAR::raiseError("Unable to write filter string to filehandle \$FH!"); - } - } - } - return true; - } - - /** - * This can be used to escape a string to provide a valid LDAP-Filter. - * - * LDAP will only recognise certain characters as the - * character istself if they are properly escaped. This is - * what this method does. - * The method can be called statically, so you can use it outside - * for your own purposes (eg for escaping only parts of strings) - * - * In fact, this is just a shorthand to {@link Net_LDAP2_Util::escape_filter_value()}. - * For upward compatibiliy reasons you are strongly encouraged to use the escape - * methods provided by the Net_LDAP2_Util class. - * - * @param string $value Any string who should be escaped - * - * @static - * @return string The string $string, but escaped - * @deprecated Do not use this method anymore, instead use Net_LDAP2_Util::escape_filter_value() directly - */ - public static function escape($value) - { - $return = Net_LDAP2_Util::escape_filter_value(array($value)); - return $return[0]; - } - - /** - * Is this a container or a leaf filter object? - * - * @access protected - * @return boolean - */ - protected function isLeaf() - { - if (count($this->_subfilters) > 0) { - return false; // Container! - } else { - return true; // Leaf! - } - } -} -?> diff --git a/extlib/Net/LDAP2/LDIF.php b/extlib/Net/LDAP2/LDIF.php deleted file mode 100644 index 34f3e75dd..000000000 --- a/extlib/Net/LDAP2/LDIF.php +++ /dev/null @@ -1,922 +0,0 @@ - -* @copyright 2009 Benedikt Hallinger -* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 -* @version SVN: $Id: LDIF.php 286718 2009-08-03 07:30:49Z beni $ -* @link http://pear.php.net/package/Net_LDAP2/ -*/ - -/** -* Includes -*/ -require_once 'PEAR.php'; -require_once 'Net/LDAP2.php'; -require_once 'Net/LDAP2/Entry.php'; -require_once 'Net/LDAP2/Util.php'; - -/** -* LDIF capabilitys for Net_LDAP2, closely taken from PERLs Net::LDAP -* -* It provides a means to convert between Net_LDAP2_Entry objects and LDAP entries -* represented in LDIF format files. Reading and writing are supported and may -* manipulate single entries or lists of entries. -* -* Usage example: -* -* // Read and parse an ldif-file into Net_LDAP2_Entry objects -* // and print out the DNs. Store the entries for later use. -* require 'Net/LDAP2/LDIF.php'; -* $options = array( -* 'onerror' => 'die' -* ); -* $entries = array(); -* $ldif = new Net_LDAP2_LDIF('test.ldif', 'r', $options); -* do { -* $entry = $ldif->read_entry(); -* $dn = $entry->dn(); -* echo " done building entry: $dn\n"; -* array_push($entries, $entry); -* } while (!$ldif->eof()); -* $ldif->done(); -* -* -* // write those entries to another file -* $ldif = new Net_LDAP2_LDIF('test.out.ldif', 'w', $options); -* $ldif->write_entry($entries); -* $ldif->done(); -* -* -* @category Net -* @package Net_LDAP2 -* @author Benedikt Hallinger -* @license http://www.gnu.org/copyleft/lesser.html LGPL -* @link http://pear.php.net/package/Net_LDAP22/ -* @see http://www.ietf.org/rfc/rfc2849.txt -* @todo Error handling should be PEARified -* @todo LDAPv3 controls are not implemented yet -*/ -class Net_LDAP2_LDIF extends PEAR -{ - /** - * Options - * - * @access protected - * @var array - */ - protected $_options = array('encode' => 'base64', - 'onerror' => null, - 'change' => 0, - 'lowercase' => 0, - 'sort' => 0, - 'version' => null, - 'wrap' => 78, - 'raw' => '' - ); - - /** - * Errorcache - * - * @access protected - * @var array - */ - protected $_error = array('error' => null, - 'line' => 0 - ); - - /** - * Filehandle for read/write - * - * @access protected - * @var array - */ - protected $_FH = null; - - /** - * Says, if we opened the filehandle ourselves - * - * @access protected - * @var array - */ - protected $_FH_opened = false; - - /** - * Linecounter for input file handle - * - * @access protected - * @var array - */ - protected $_input_line = 0; - - /** - * counter for processed entries - * - * @access protected - * @var int - */ - protected $_entrynum = 0; - - /** - * Mode we are working in - * - * Either 'r', 'a' or 'w' - * - * @access protected - * @var string - */ - protected $_mode = false; - - /** - * Tells, if the LDIF version string was already written - * - * @access protected - * @var boolean - */ - protected $_version_written = false; - - /** - * Cache for lines that have build the current entry - * - * @access protected - * @var boolean - */ - protected $_lines_cur = array(); - - /** - * Cache for lines that will build the next entry - * - * @access protected - * @var boolean - */ - protected $_lines_next = array(); - - /** - * Open LDIF file for reading or for writing - * - * new (FILE): - * Open the file read-only. FILE may be the name of a file - * or an already open filehandle. - * If the file doesn't exist, it will be created if in write mode. - * - * new (FILE, MODE, OPTIONS): - * Open the file with the given MODE (see PHPs fopen()), eg "w" or "a". - * FILE may be the name of a file or an already open filehandle. - * PERLs Net_LDAP2 "FILE|" mode does not work curently. - * - * OPTIONS is an associative array and may contain: - * encode => 'none' | 'canonical' | 'base64' - * Some DN values in LDIF cannot be written verbatim and have to be encoded in some way: - * 'none' No encoding. - * 'canonical' See "canonical_dn()" in Net::LDAP::Util. - * 'base64' Use base64. (default, this differs from the Perl interface. - * The perl default is "none"!) - * - * onerror => 'die' | 'warn' | NULL - * Specify what happens when an error is detected. - * 'die' Net_LDAP2_LDIF will croak with an appropriate message. - * 'warn' Net_LDAP2_LDIF will warn (echo) with an appropriate message. - * NULL Net_LDAP2_LDIF will not warn (default), use error(). - * - * change => 1 - * Write entry changes to the LDIF file instead of the entries itself. I.e. write LDAP - * operations acting on the entries to the file instead of the entries contents. - * This writes the changes usually carried out by an update() to the LDIF file. - * - * lowercase => 1 - * Convert attribute names to lowercase when writing. - * - * sort => 1 - * Sort attribute names when writing entries according to the rule: - * objectclass first then all other attributes alphabetically sorted by attribute name - * - * version => '1' - * Set the LDIF version to write to the resulting LDIF file. - * According to RFC 2849 currently the only legal value for this option is 1. - * When this option is set Net_LDAP2_LDIF tries to adhere more strictly to - * the LDIF specification in RFC2489 in a few places. - * The default is NULL meaning no version information is written to the LDIF file. - * - * wrap => 78 - * Number of columns where output line wrapping shall occur. - * Default is 78. Setting it to 40 or lower inhibits wrapping. - * - * raw => REGEX - * Use REGEX to denote the names of attributes that are to be - * considered binary in search results if writing entries. - * Example: raw => "/(?i:^jpegPhoto|;binary)/i" - * - * @param string|ressource $file Filename or filehandle - * @param string $mode Mode to open filename - * @param array $options Options like described above - */ - public function __construct($file, $mode = 'r', $options = array()) - { - $this->PEAR('Net_LDAP2_Error'); // default error class - - // First, parse options - // todo: maybe implement further checks on possible values - foreach ($options as $option => $value) { - if (!array_key_exists($option, $this->_options)) { - $this->dropError('Net_LDAP2_LDIF error: option '.$option.' not known!'); - return; - } else { - $this->_options[$option] = strtolower($value); - } - } - - // setup LDIF class - $this->version($this->_options['version']); - - // setup file mode - if (!preg_match('/^[rwa]\+?$/', $mode)) { - $this->dropError('Net_LDAP2_LDIF error: file mode '.$mode.' not supported!'); - } else { - $this->_mode = $mode; - - // setup filehandle - if (is_resource($file)) { - // TODO: checks on mode possible? - $this->_FH =& $file; - } else { - $imode = substr($this->_mode, 0, 1); - if ($imode == 'r') { - if (!file_exists($file)) { - $this->dropError('Unable to open '.$file.' for read: file not found'); - $this->_mode = false; - } - if (!is_readable($file)) { - $this->dropError('Unable to open '.$file.' for read: permission denied'); - $this->_mode = false; - } - } - - if (($imode == 'w' || $imode == 'a')) { - if (file_exists($file)) { - if (!is_writable($file)) { - $this->dropError('Unable to open '.$file.' for write: permission denied'); - $this->_mode = false; - } - } else { - if (!@touch($file)) { - $this->dropError('Unable to create '.$file.' for write: permission denied'); - $this->_mode = false; - } - } - } - - if ($this->_mode) { - $this->_FH = @fopen($file, $this->_mode); - if (false === $this->_FH) { - // Fallback; should never be reached if tests above are good enough! - $this->dropError('Net_LDAP2_LDIF error: Could not open file '.$file); - } else { - $this->_FH_opened = true; - } - } - } - } - } - - /** - * Read one entry from the file and return it as a Net::LDAP::Entry object. - * - * @return Net_LDAP2_Entry - */ - public function read_entry() - { - // read fresh lines, set them as current lines and create the entry - $attrs = $this->next_lines(true); - if (count($attrs) > 0) { - $this->_lines_cur = $attrs; - } - return $this->current_entry(); - } - - /** - * Returns true when the end of the file is reached. - * - * @return boolean - */ - public function eof() - { - return feof($this->_FH); - } - - /** - * Write the entry or entries to the LDIF file. - * - * If you want to build an LDIF file containing several entries AND - * you want to call write_entry() several times, you must open the filehandle - * in append mode ("a"), otherwise you will always get the last entry only. - * - * @param Net_LDAP2_Entry|array $entries Entry or array of entries - * - * @return void - * @todo implement operations on whole entries (adding a whole entry) - */ - public function write_entry($entries) - { - if (!is_array($entries)) { - $entries = array($entries); - } - - foreach ($entries as $entry) { - $this->_entrynum++; - if (!$entry instanceof Net_LDAP2_Entry) { - $this->dropError('Net_LDAP2_LDIF error: entry '.$this->_entrynum.' is not an Net_LDAP2_Entry object'); - } else { - if ($this->_options['change']) { - // LDIF change mode - // fetch change information from entry - $entry_attrs_changes = $entry->getChanges(); - $num_of_changes = count($entry_attrs_changes['add']) - + count($entry_attrs_changes['replace']) - + count($entry_attrs_changes['delete']); - - $is_changed = ($num_of_changes > 0 || $entry->willBeDeleted() || $entry->willBeMoved()); - - // write version if not done yet - // also write DN of entry - if ($is_changed) { - if (!$this->_version_written) { - $this->write_version(); - } - $this->writeDN($entry->currentDN()); - } - - // process changes - // TODO: consider DN add! - if ($entry->willBeDeleted()) { - $this->writeLine("changetype: delete".PHP_EOL); - } elseif ($entry->willBeMoved()) { - $this->writeLine("changetype: modrdn".PHP_EOL); - $olddn = Net_LDAP2_Util::ldap_explode_dn($entry->currentDN(), array('casefold' => 'none')); // maybe gives a bug if using multivalued RDNs - $oldrdn = array_shift($olddn); - $oldparent = implode(',', $olddn); - $newdn = Net_LDAP2_Util::ldap_explode_dn($entry->dn(), array('casefold' => 'none')); // maybe gives a bug if using multivalued RDNs - $rdn = array_shift($newdn); - $parent = implode(',', $newdn); - $this->writeLine("newrdn: ".$rdn.PHP_EOL); - $this->writeLine("deleteoldrdn: 1".PHP_EOL); - if ($parent !== $oldparent) { - $this->writeLine("newsuperior: ".$parent.PHP_EOL); - } - // TODO: What if the entry has attribute changes as well? - // I think we should check for that and make a dummy - // entry with the changes that is written to the LDIF file - } elseif ($num_of_changes > 0) { - // write attribute change data - $this->writeLine("changetype: modify".PHP_EOL); - foreach ($entry_attrs_changes as $changetype => $entry_attrs) { - foreach ($entry_attrs as $attr_name => $attr_values) { - $this->writeLine("$changetype: $attr_name".PHP_EOL); - if ($attr_values !== null) $this->writeAttribute($attr_name, $attr_values, $changetype); - $this->writeLine("-".PHP_EOL); - } - } - } - - // finish this entrys data if we had changes - if ($is_changed) { - $this->finishEntry(); - } - } else { - // LDIF-content mode - // fetch attributes for further processing - $entry_attrs = $entry->getValues(); - - // sort and put objectclass-attrs to first position - if ($this->_options['sort']) { - ksort($entry_attrs); - if (array_key_exists('objectclass', $entry_attrs)) { - $oc = $entry_attrs['objectclass']; - unset($entry_attrs['objectclass']); - $entry_attrs = array_merge(array('objectclass' => $oc), $entry_attrs); - } - } - - // write data - if (!$this->_version_written) { - $this->write_version(); - } - $this->writeDN($entry->dn()); - foreach ($entry_attrs as $attr_name => $attr_values) { - $this->writeAttribute($attr_name, $attr_values); - } - $this->finishEntry(); - } - } - } - } - - /** - * Write version to LDIF - * - * If the object's version is defined, this method allows to explicitely write the version before an entry is written. - * If not called explicitely, it gets called automatically when writing the first entry. - * - * @return void - */ - public function write_version() - { - $this->_version_written = true; - if (!is_null($this->version())) { - return $this->writeLine('version: '.$this->version().PHP_EOL, 'Net_LDAP2_LDIF error: unable to write version'); - } - } - - /** - * Get or set LDIF version - * - * If called without arguments it returns the version of the LDIF file or NULL if no version has been set. - * If called with an argument it sets the LDIF version to VERSION. - * According to RFC 2849 currently the only legal value for VERSION is 1. - * - * @param int $version (optional) LDIF version to set - * - * @return int - */ - public function version($version = null) - { - if ($version !== null) { - if ($version != 1) { - $this->dropError('Net_LDAP2_LDIF error: illegal LDIF version set'); - } else { - $this->_options['version'] = $version; - } - } - return $this->_options['version']; - } - - /** - * Returns the file handle the Net_LDAP2_LDIF object reads from or writes to. - * - * You can, for example, use this to fetch the content of the LDIF file yourself - * - * @return null|resource - */ - public function &handle() - { - if (!is_resource($this->_FH)) { - $this->dropError('Net_LDAP2_LDIF error: invalid file resource'); - $null = null; - return $null; - } else { - return $this->_FH; - } - } - - /** - * Clean up - * - * This method signals that the LDIF object is no longer needed. - * You can use this to free up some memory and close the file handle. - * The file handle is only closed, if it was opened from Net_LDAP2_LDIF. - * - * @return void - */ - public function done() - { - // close FH if we opened it - if ($this->_FH_opened) { - fclose($this->handle()); - } - - // free variables - foreach (get_object_vars($this) as $name => $value) { - unset($this->$name); - } - } - - /** - * Returns last error message if error was found. - * - * Example: - * - * $ldif->someAction(); - * if ($ldif->error()) { - * echo "Error: ".$ldif->error()." at input line: ".$ldif->error_lines(); - * } - * - * - * @param boolean $as_string If set to true, only the message is returned - * - * @return false|Net_LDAP2_Error - */ - public function error($as_string = false) - { - if (Net_LDAP2::isError($this->_error['error'])) { - return ($as_string)? $this->_error['error']->getMessage() : $this->_error['error']; - } else { - return false; - } - } - - /** - * Returns lines that resulted in error. - * - * Perl returns an array of faulty lines in list context, - * but we always just return an int because of PHPs language. - * - * @return int - */ - public function error_lines() - { - return $this->_error['line']; - } - - /** - * Returns the current Net::LDAP::Entry object. - * - * @return Net_LDAP2_Entry|false - */ - public function current_entry() - { - return $this->parseLines($this->current_lines()); - } - - /** - * Parse LDIF lines of one entry into an Net_LDAP2_Entry object - * - * @param array $lines LDIF lines for one entry - * - * @return Net_LDAP2_Entry|false Net_LDAP2_Entry object for those lines - * @todo what about file inclusions and urls? "jpegphoto:< file:///usr/local/directory/photos/fiona.jpg" - */ - public function parseLines($lines) - { - // parse lines into an array of attributes and build the entry - $attributes = array(); - $dn = false; - foreach ($lines as $line) { - if (preg_match('/^(\w+)(:|::|:<)\s(.+)$/', $line, $matches)) { - $attr =& $matches[1]; - $delim =& $matches[2]; - $data =& $matches[3]; - - if ($delim == ':') { - // normal data - $attributes[$attr][] = $data; - } elseif ($delim == '::') { - // base64 data - $attributes[$attr][] = base64_decode($data); - } elseif ($delim == ':<') { - // file inclusion - // TODO: Is this the job of the LDAP-client or the server? - $this->dropError('File inclusions are currently not supported'); - //$attributes[$attr][] = ...; - } else { - // since the pattern above, the delimeter cannot be something else. - $this->dropError('Net_LDAP2_LDIF parsing error: invalid syntax at parsing entry line: '.$line); - continue; - } - - if (strtolower($attr) == 'dn') { - // DN line detected - $dn = $attributes[$attr][0]; // save possibly decoded DN - unset($attributes[$attr]); // remove wrongly added "dn: " attribute - } - } else { - // line not in "attr: value" format -> ignore - // maybe we should rise an error here, but this should be covered by - // next_lines() already. A problem arises, if users try to feed data of - // several entries to this method - the resulting entry will - // get wrong attributes. However, this is already mentioned in the - // methods documentation above. - } - } - - if (false === $dn) { - $this->dropError('Net_LDAP2_LDIF parsing error: unable to detect DN for entry'); - return false; - } else { - $newentry = Net_LDAP2_Entry::createFresh($dn, $attributes); - return $newentry; - } - } - - /** - * Returns the lines that generated the current Net::LDAP::Entry object. - * - * Note that this returns an empty array if no lines have been read so far. - * - * @return array Array of lines - */ - public function current_lines() - { - return $this->_lines_cur; - } - - /** - * Returns the lines that will generate the next Net::LDAP::Entry object. - * - * If you set $force to TRUE then you can iterate over the lines that build - * up entries manually. Otherwise, iterating is done using {@link read_entry()}. - * Force will move the file pointer forward, thus returning the next entries lines. - * - * Wrapped lines will be unwrapped. Comments are stripped. - * - * @param boolean $force Set this to true if you want to iterate over the lines manually - * - * @return array - */ - public function next_lines($force = false) - { - // if we already have those lines, just return them, otherwise read - if (count($this->_lines_next) == 0 || $force) { - $this->_lines_next = array(); // empty in case something was left (if used $force) - $entry_done = false; - $fh = &$this->handle(); - $commentmode = false; // if we are in an comment, for wrapping purposes - $datalines_read = 0; // how many lines with data we have read - - while (!$entry_done && !$this->eof()) { - $this->_input_line++; - // Read line. Remove line endings, we want only data; - // this is okay since ending spaces should be encoded - $data = rtrim(fgets($fh)); - if ($data === false) { - // error only, if EOF not reached after fgets() call - if (!$this->eof()) { - $this->dropError('Net_LDAP2_LDIF error: error reading from file at input line '.$this->_input_line, $this->_input_line); - } - break; - } else { - if (count($this->_lines_next) > 0 && preg_match('/^$/', $data)) { - // Entry is finished if we have an empty line after we had data - $entry_done = true; - - // Look ahead if the next EOF is nearby. Comments and empty - // lines at the file end may cause problems otherwise - $current_pos = ftell($fh); - $data = fgets($fh); - while (!feof($fh)) { - if (preg_match('/^\s*$/', $data) || preg_match('/^#/', $data)) { - // only empty lines or comments, continue to seek - // TODO: Known bug: Wrappings for comments are okay but are treaten as - // error, since we do not honor comment mode here. - // This should be a very theoretically case, however - // i am willing to fix this if really necessary. - $this->_input_line++; - $current_pos = ftell($fh); - $data = fgets($fh); - } else { - // Data found if non emtpy line and not a comment!! - // Rewind to position prior last read and stop lookahead - fseek($fh, $current_pos); - break; - } - } - // now we have either the file pointer at the beginning of - // a new data position or at the end of file causing feof() to return true - - } else { - // build lines - if (preg_match('/^version:\s(.+)$/', $data, $match)) { - // version statement, set version - $this->version($match[1]); - } elseif (preg_match('/^\w+::?\s.+$/', $data)) { - // normal attribute: add line - $commentmode = false; - $this->_lines_next[] = trim($data); - $datalines_read++; - } elseif (preg_match('/^\s(.+)$/', $data, $matches)) { - // wrapped data: unwrap if not in comment mode - if (!$commentmode) { - if ($datalines_read == 0) { - // first line of entry: wrapped data is illegal - $this->dropError('Net_LDAP2_LDIF error: illegal wrapping at input line '.$this->_input_line, $this->_input_line); - } else { - $last = array_pop($this->_lines_next); - $last = $last.trim($matches[1]); - $this->_lines_next[] = $last; - $datalines_read++; - } - } - } elseif (preg_match('/^#/', $data)) { - // LDIF comments - $commentmode = true; - } elseif (preg_match('/^\s*$/', $data)) { - // empty line but we had no data for this - // entry, so just ignore this line - $commentmode = false; - } else { - $this->dropError('Net_LDAP2_LDIF error: invalid syntax at input line '.$this->_input_line, $this->_input_line); - continue; - } - - } - } - } - } - return $this->_lines_next; - } - - /** - * Convert an attribute and value to LDIF string representation - * - * It honors correct encoding of values according to RFC 2849. - * Line wrapping will occur at the configured maximum but only if - * the value is greater than 40 chars. - * - * @param string $attr_name Name of the attribute - * @param string $attr_value Value of the attribute - * - * @access protected - * @return string LDIF string for that attribute and value - */ - protected function convertAttribute($attr_name, $attr_value) - { - // Handle empty attribute or process - if (strlen($attr_value) == 0) { - $attr_value = " "; - } else { - $base64 = false; - // ASCII-chars that are NOT safe for the - // start and for being inside the value. - // These are the int values of those chars. - $unsafe_init = array(0, 10, 13, 32, 58, 60); - $unsafe = array(0, 10, 13); - - // Test for illegal init char - $init_ord = ord(substr($attr_value, 0, 1)); - if ($init_ord > 127 || in_array($init_ord, $unsafe_init)) { - $base64 = true; - } - - // Test for illegal content char - for ($i = 0; $i < strlen($attr_value); $i++) { - $char_ord = ord(substr($attr_value, $i, 1)); - if ($char_ord > 127 || in_array($char_ord, $unsafe)) { - $base64 = true; - } - } - - // Test for ending space - if (substr($attr_value, -1) == ' ') { - $base64 = true; - } - - // If converting is needed, do it - // Either we have some special chars or a matching "raw" regex - if ($base64 || ($this->_options['raw'] && preg_match($this->_options['raw'], $attr_name))) { - $attr_name .= ':'; - $attr_value = base64_encode($attr_value); - } - - // Lowercase attr names if requested - if ($this->_options['lowercase']) $attr_name = strtolower($attr_name); - - // Handle line wrapping - if ($this->_options['wrap'] > 40 && strlen($attr_value) > $this->_options['wrap']) { - $attr_value = wordwrap($attr_value, $this->_options['wrap'], PHP_EOL." ", true); - } - } - - return $attr_name.': '.$attr_value; - } - - /** - * Convert an entries DN to LDIF string representation - * - * It honors correct encoding of values according to RFC 2849. - * - * @param string $dn UTF8-Encoded DN - * - * @access protected - * @return string LDIF string for that DN - * @todo I am not sure, if the UTF8 stuff is correctly handled right now - */ - protected function convertDN($dn) - { - $base64 = false; - // ASCII-chars that are NOT safe for the - // start and for being inside the dn. - // These are the int values of those chars. - $unsafe_init = array(0, 10, 13, 32, 58, 60); - $unsafe = array(0, 10, 13); - - // Test for illegal init char - $init_ord = ord(substr($dn, 0, 1)); - if ($init_ord >= 127 || in_array($init_ord, $unsafe_init)) { - $base64 = true; - } - - // Test for illegal content char - for ($i = 0; $i < strlen($dn); $i++) { - $char = substr($dn, $i, 1); - if (ord($char) >= 127 || in_array($init_ord, $unsafe)) { - $base64 = true; - } - } - - // Test for ending space - if (substr($dn, -1) == ' ') { - $base64 = true; - } - - // if converting is needed, do it - return ($base64)? 'dn:: '.base64_encode($dn) : 'dn: '.$dn; - } - - /** - * Writes an attribute to the filehandle - * - * @param string $attr_name Name of the attribute - * @param string|array $attr_values Single attribute value or array with attribute values - * - * @access protected - * @return void - */ - protected function writeAttribute($attr_name, $attr_values) - { - // write out attribute content - if (!is_array($attr_values)) { - $attr_values = array($attr_values); - } - foreach ($attr_values as $attr_val) { - $line = $this->convertAttribute($attr_name, $attr_val).PHP_EOL; - $this->writeLine($line, 'Net_LDAP2_LDIF error: unable to write attribute '.$attr_name.' of entry '.$this->_entrynum); - } - } - - /** - * Writes a DN to the filehandle - * - * @param string $dn DN to write - * - * @access protected - * @return void - */ - protected function writeDN($dn) - { - // prepare DN - if ($this->_options['encode'] == 'base64') { - $dn = $this->convertDN($dn).PHP_EOL; - } elseif ($this->_options['encode'] == 'canonical') { - $dn = Net_LDAP2_Util::canonical_dn($dn, array('casefold' => 'none')).PHP_EOL; - } else { - $dn = $dn.PHP_EOL; - } - $this->writeLine($dn, 'Net_LDAP2_LDIF error: unable to write DN of entry '.$this->_entrynum); - } - - /** - * Finishes an LDIF entry - * - * @access protected - * @return void - */ - protected function finishEntry() - { - $this->writeLine(PHP_EOL, 'Net_LDAP2_LDIF error: unable to close entry '.$this->_entrynum); - } - - /** - * Just write an arbitary line to the filehandle - * - * @param string $line Content to write - * @param string $error If error occurs, drop this message - * - * @access protected - * @return true|false - */ - protected function writeLine($line, $error = 'Net_LDAP2_LDIF error: unable to write to filehandle') - { - if (is_resource($this->handle()) && fwrite($this->handle(), $line, strlen($line)) === false) { - $this->dropError($error); - return false; - } else { - return true; - } - } - - /** - * Optionally raises an error and pushes the error on the error cache - * - * @param string $msg Errortext - * @param int $line Line in the LDIF that caused the error - * - * @access protected - * @return void - */ - protected function dropError($msg, $line = null) - { - $this->_error['error'] = new Net_LDAP2_Error($msg); - if ($line !== null) $this->_error['line'] = $line; - - if ($this->_options['onerror'] == 'die') { - die($msg.PHP_EOL); - } elseif ($this->_options['onerror'] == 'warn') { - echo $msg.PHP_EOL; - } - } -} -?> diff --git a/extlib/Net/LDAP2/RootDSE.php b/extlib/Net/LDAP2/RootDSE.php deleted file mode 100644 index 8dc81fd4f..000000000 --- a/extlib/Net/LDAP2/RootDSE.php +++ /dev/null @@ -1,240 +0,0 @@ - -* @copyright 2009 Jan Wagner -* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 -* @version SVN: $Id: RootDSE.php 286718 2009-08-03 07:30:49Z beni $ -* @link http://pear.php.net/package/Net_LDAP2/ -*/ - -/** -* Includes -*/ -require_once 'PEAR.php'; - -/** -* Getting the rootDSE entry of a LDAP server -* -* @category Net -* @package Net_LDAP2 -* @author Jan Wagner -* @license http://www.gnu.org/copyleft/lesser.html LGPL -* @link http://pear.php.net/package/Net_LDAP22/ -*/ -class Net_LDAP2_RootDSE extends PEAR -{ - /** - * @access protected - * @var object Net_LDAP2_Entry - **/ - protected $_entry; - - /** - * Class constructor - * - * @param Net_LDAP2_Entry &$entry Net_LDAP2_Entry object of the RootDSE - */ - protected function __construct(&$entry) - { - $this->_entry = $entry; - } - - /** - * Fetches a RootDSE object from an LDAP connection - * - * @param Net_LDAP2 $ldap Directory from which the RootDSE should be fetched - * @param array $attrs Array of attributes to search for - * - * @access static - * @return Net_LDAP2_RootDSE|Net_LDAP2_Error - */ - public static function fetch($ldap, $attrs = null) - { - if (!$ldap instanceof Net_LDAP2) { - return PEAR::raiseError("Unable to fetch Schema: Parameter \$ldap must be a Net_LDAP2 object!"); - } - - if (is_array($attrs) && count($attrs) > 0 ) { - $attributes = $attrs; - } else { - $attributes = array('vendorName', - 'vendorVersion', - 'namingContexts', - 'altServer', - 'supportedExtension', - 'supportedControl', - 'supportedSASLMechanisms', - 'supportedLDAPVersion', - 'subschemaSubentry' ); - } - $result = $ldap->search('', '(objectClass=*)', array('attributes' => $attributes, 'scope' => 'base')); - if (self::isError($result)) { - return $result; - } - $entry = $result->shiftEntry(); - if (false === $entry) { - return PEAR::raiseError('Could not fetch RootDSE entry'); - } - $ret = new Net_LDAP2_RootDSE($entry); - return $ret; - } - - /** - * Gets the requested attribute value - * - * Same usuage as {@link Net_LDAP2_Entry::getValue()} - * - * @param string $attr Attribute name - * @param array $options Array of options - * - * @access public - * @return mixed Net_LDAP2_Error object or attribute values - * @see Net_LDAP2_Entry::get_value() - */ - public function getValue($attr = '', $options = '') - { - return $this->_entry->get_value($attr, $options); - } - - /** - * Alias function of getValue() for perl-ldap interface - * - * @see getValue() - * @return mixed - */ - public function get_value() - { - $args = func_get_args(); - return call_user_func_array(array( &$this, 'getValue' ), $args); - } - - /** - * Determines if the extension is supported - * - * @param array $oids Array of oids to check - * - * @access public - * @return boolean - */ - public function supportedExtension($oids) - { - return $this->checkAttr($oids, 'supportedExtension'); - } - - /** - * Alias function of supportedExtension() for perl-ldap interface - * - * @see supportedExtension() - * @return boolean - */ - public function supported_extension() - { - $args = func_get_args(); - return call_user_func_array(array( &$this, 'supportedExtension'), $args); - } - - /** - * Determines if the version is supported - * - * @param array $versions Versions to check - * - * @access public - * @return boolean - */ - public function supportedVersion($versions) - { - return $this->checkAttr($versions, 'supportedLDAPVersion'); - } - - /** - * Alias function of supportedVersion() for perl-ldap interface - * - * @see supportedVersion() - * @return boolean - */ - public function supported_version() - { - $args = func_get_args(); - return call_user_func_array(array(&$this, 'supportedVersion'), $args); - } - - /** - * Determines if the control is supported - * - * @param array $oids Control oids to check - * - * @access public - * @return boolean - */ - public function supportedControl($oids) - { - return $this->checkAttr($oids, 'supportedControl'); - } - - /** - * Alias function of supportedControl() for perl-ldap interface - * - * @see supportedControl() - * @return boolean - */ - public function supported_control() - { - $args = func_get_args(); - return call_user_func_array(array(&$this, 'supportedControl' ), $args); - } - - /** - * Determines if the sasl mechanism is supported - * - * @param array $mechlist SASL mechanisms to check - * - * @access public - * @return boolean - */ - public function supportedSASLMechanism($mechlist) - { - return $this->checkAttr($mechlist, 'supportedSASLMechanisms'); - } - - /** - * Alias function of supportedSASLMechanism() for perl-ldap interface - * - * @see supportedSASLMechanism() - * @return boolean - */ - public function supported_sasl_mechanism() - { - $args = func_get_args(); - return call_user_func_array(array(&$this, 'supportedSASLMechanism'), $args); - } - - /** - * Checks for existance of value in attribute - * - * @param array $values values to check - * @param string $attr attribute name - * - * @access protected - * @return boolean - */ - protected function checkAttr($values, $attr) - { - if (!is_array($values)) $values = array($values); - - foreach ($values as $value) { - if (!@in_array($value, $this->get_value($attr, 'all'))) { - return false; - } - } - return true; - } -} - -?> diff --git a/extlib/Net/LDAP2/Schema.php b/extlib/Net/LDAP2/Schema.php deleted file mode 100644 index b590eabc5..000000000 --- a/extlib/Net/LDAP2/Schema.php +++ /dev/null @@ -1,516 +0,0 @@ - -* @author Benedikt Hallinger -* @copyright 2009 Jan Wagner, Benedikt Hallinger -* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 -* @version SVN: $Id: Schema.php 286718 2009-08-03 07:30:49Z beni $ -* @link http://pear.php.net/package/Net_LDAP2/ -* @todo see the comment at the end of the file -*/ - -/** -* Includes -*/ -require_once 'PEAR.php'; - -/** -* Syntax definitions -* -* Please don't forget to add binary attributes to isBinary() below -* to support proper value fetching from Net_LDAP2_Entry -*/ -define('NET_LDAP2_SYNTAX_BOOLEAN', '1.3.6.1.4.1.1466.115.121.1.7'); -define('NET_LDAP2_SYNTAX_DIRECTORY_STRING', '1.3.6.1.4.1.1466.115.121.1.15'); -define('NET_LDAP2_SYNTAX_DISTINGUISHED_NAME', '1.3.6.1.4.1.1466.115.121.1.12'); -define('NET_LDAP2_SYNTAX_INTEGER', '1.3.6.1.4.1.1466.115.121.1.27'); -define('NET_LDAP2_SYNTAX_JPEG', '1.3.6.1.4.1.1466.115.121.1.28'); -define('NET_LDAP2_SYNTAX_NUMERIC_STRING', '1.3.6.1.4.1.1466.115.121.1.36'); -define('NET_LDAP2_SYNTAX_OID', '1.3.6.1.4.1.1466.115.121.1.38'); -define('NET_LDAP2_SYNTAX_OCTET_STRING', '1.3.6.1.4.1.1466.115.121.1.40'); - -/** -* Load an LDAP Schema and provide information -* -* This class takes a Subschema entry, parses this information -* and makes it available in an array. Most of the code has been -* inspired by perl-ldap( http://perl-ldap.sourceforge.net). -* You will find portions of their implementation in here. -* -* @category Net -* @package Net_LDAP2 -* @author Jan Wagner -* @author Benedikt Hallinger -* @license http://www.gnu.org/copyleft/lesser.html LGPL -* @link http://pear.php.net/package/Net_LDAP22/ -*/ -class Net_LDAP2_Schema extends PEAR -{ - /** - * Map of entry types to ldap attributes of subschema entry - * - * @access public - * @var array - */ - public $types = array( - 'attribute' => 'attributeTypes', - 'ditcontentrule' => 'dITContentRules', - 'ditstructurerule' => 'dITStructureRules', - 'matchingrule' => 'matchingRules', - 'matchingruleuse' => 'matchingRuleUse', - 'nameform' => 'nameForms', - 'objectclass' => 'objectClasses', - 'syntax' => 'ldapSyntaxes' - ); - - /** - * Array of entries belonging to this type - * - * @access protected - * @var array - */ - protected $_attributeTypes = array(); - protected $_matchingRules = array(); - protected $_matchingRuleUse = array(); - protected $_ldapSyntaxes = array(); - protected $_objectClasses = array(); - protected $_dITContentRules = array(); - protected $_dITStructureRules = array(); - protected $_nameForms = array(); - - - /** - * hash of all fetched oids - * - * @access protected - * @var array - */ - protected $_oids = array(); - - /** - * Tells if the schema is initialized - * - * @access protected - * @var boolean - * @see parse(), get() - */ - protected $_initialized = false; - - - /** - * Constructor of the class - * - * @access protected - */ - protected function __construct() - { - $this->PEAR('Net_LDAP2_Error'); // default error class - } - - /** - * Fetch the Schema from an LDAP connection - * - * @param Net_LDAP2 $ldap LDAP connection - * @param string $dn (optional) Subschema entry dn - * - * @access public - * @return Net_LDAP2_Schema|NET_LDAP2_Error - */ - public function fetch($ldap, $dn = null) - { - if (!$ldap instanceof Net_LDAP2) { - return PEAR::raiseError("Unable to fetch Schema: Parameter \$ldap must be a Net_LDAP2 object!"); - } - - $schema_o = new Net_LDAP2_Schema(); - - if (is_null($dn)) { - // get the subschema entry via root dse - $dse = $ldap->rootDSE(array('subschemaSubentry')); - if (false == Net_LDAP2::isError($dse)) { - $base = $dse->getValue('subschemaSubentry', 'single'); - if (!Net_LDAP2::isError($base)) { - $dn = $base; - } - } - } - - // Support for buggy LDAP servers (e.g. Siemens DirX 6.x) that incorrectly - // call this entry subSchemaSubentry instead of subschemaSubentry. - // Note the correct case/spelling as per RFC 2251. - if (is_null($dn)) { - // get the subschema entry via root dse - $dse = $ldap->rootDSE(array('subSchemaSubentry')); - if (false == Net_LDAP2::isError($dse)) { - $base = $dse->getValue('subSchemaSubentry', 'single'); - if (!Net_LDAP2::isError($base)) { - $dn = $base; - } - } - } - - // Final fallback case where there is no subschemaSubentry attribute - // in the root DSE (this is a bug for an LDAP v3 server so report this - // to your LDAP vendor if you get this far). - if (is_null($dn)) { - $dn = 'cn=Subschema'; - } - - // fetch the subschema entry - $result = $ldap->search($dn, '(objectClass=*)', - array('attributes' => array_values($schema_o->types), - 'scope' => 'base')); - if (Net_LDAP2::isError($result)) { - return $result; - } - - $entry = $result->shiftEntry(); - if (!$entry instanceof Net_LDAP2_Entry) { - return PEAR::raiseError('Could not fetch Subschema entry'); - } - - $schema_o->parse($entry); - return $schema_o; - } - - /** - * Return a hash of entries for the given type - * - * Returns a hash of entry for th givene type. Types may be: - * objectclasses, attributes, ditcontentrules, ditstructurerules, matchingrules, - * matchingruleuses, nameforms, syntaxes - * - * @param string $type Type to fetch - * - * @access public - * @return array|Net_LDAP2_Error Array or Net_LDAP2_Error - */ - public function &getAll($type) - { - $map = array('objectclasses' => &$this->_objectClasses, - 'attributes' => &$this->_attributeTypes, - 'ditcontentrules' => &$this->_dITContentRules, - 'ditstructurerules' => &$this->_dITStructureRules, - 'matchingrules' => &$this->_matchingRules, - 'matchingruleuses' => &$this->_matchingRuleUse, - 'nameforms' => &$this->_nameForms, - 'syntaxes' => &$this->_ldapSyntaxes ); - - $key = strtolower($type); - $ret = ((key_exists($key, $map)) ? $map[$key] : PEAR::raiseError("Unknown type $type")); - return $ret; - } - - /** - * Return a specific entry - * - * @param string $type Type of name - * @param string $name Name or OID to fetch - * - * @access public - * @return mixed Entry or Net_LDAP2_Error - */ - public function &get($type, $name) - { - if ($this->_initialized) { - $type = strtolower($type); - if (false == key_exists($type, $this->types)) { - return PEAR::raiseError("No such type $type"); - } - - $name = strtolower($name); - $type_var = &$this->{'_' . $this->types[$type]}; - - if (key_exists($name, $type_var)) { - return $type_var[$name]; - } elseif (key_exists($name, $this->_oids) && $this->_oids[$name]['type'] == $type) { - return $this->_oids[$name]; - } else { - return PEAR::raiseError("Could not find $type $name"); - } - } else { - $return = null; - return $return; - } - } - - - /** - * Fetches attributes that MAY be present in the given objectclass - * - * @param string $oc Name or OID of objectclass - * - * @access public - * @return array|Net_LDAP2_Error Array with attributes or Net_LDAP2_Error - */ - public function may($oc) - { - return $this->_getAttr($oc, 'may'); - } - - /** - * Fetches attributes that MUST be present in the given objectclass - * - * @param string $oc Name or OID of objectclass - * - * @access public - * @return array|Net_LDAP2_Error Array with attributes or Net_LDAP2_Error - */ - public function must($oc) - { - return $this->_getAttr($oc, 'must'); - } - - /** - * Fetches the given attribute from the given objectclass - * - * @param string $oc Name or OID of objectclass - * @param string $attr Name of attribute to fetch - * - * @access protected - * @return array|Net_LDAP2_Error The attribute or Net_LDAP2_Error - */ - protected function _getAttr($oc, $attr) - { - $oc = strtolower($oc); - if (key_exists($oc, $this->_objectClasses) && key_exists($attr, $this->_objectClasses[$oc])) { - return $this->_objectClasses[$oc][$attr]; - } elseif (key_exists($oc, $this->_oids) && - $this->_oids[$oc]['type'] == 'objectclass' && - key_exists($attr, $this->_oids[$oc])) { - return $this->_oids[$oc][$attr]; - } else { - return PEAR::raiseError("Could not find $attr attributes for $oc "); - } - } - - /** - * Returns the name(s) of the immediate superclass(es) - * - * @param string $oc Name or OID of objectclass - * - * @access public - * @return array|Net_LDAP2_Error Array of names or Net_LDAP2_Error - */ - public function superclass($oc) - { - $o = $this->get('objectclass', $oc); - if (Net_LDAP2::isError($o)) { - return $o; - } - return (key_exists('sup', $o) ? $o['sup'] : array()); - } - - /** - * Parses the schema of the given Subschema entry - * - * @param Net_LDAP2_Entry &$entry Subschema entry - * - * @access public - * @return void - */ - public function parse(&$entry) - { - foreach ($this->types as $type => $attr) { - // initialize map type to entry - $type_var = '_' . $attr; - $this->{$type_var} = array(); - - // get values for this type - if ($entry->exists($attr)) { - $values = $entry->getValue($attr); - if (is_array($values)) { - foreach ($values as $value) { - - unset($schema_entry); // this was a real mess without it - - // get the schema entry - $schema_entry = $this->_parse_entry($value); - - // set the type - $schema_entry['type'] = $type; - - // save a ref in $_oids - $this->_oids[$schema_entry['oid']] = &$schema_entry; - - // save refs for all names in type map - $names = $schema_entry['aliases']; - array_push($names, $schema_entry['name']); - foreach ($names as $name) { - $this->{$type_var}[strtolower($name)] = &$schema_entry; - } - } - } - } - } - $this->_initialized = true; - } - - /** - * Parses an attribute value into a schema entry - * - * @param string $value Attribute value - * - * @access protected - * @return array|false Schema entry array or false - */ - protected function &_parse_entry($value) - { - // tokens that have no value associated - $noValue = array('single-value', - 'obsolete', - 'collective', - 'no-user-modification', - 'abstract', - 'structural', - 'auxiliary'); - - // tokens that can have multiple values - $multiValue = array('must', 'may', 'sup'); - - $schema_entry = array('aliases' => array()); // initilization - - $tokens = $this->_tokenize($value); // get an array of tokens - - // remove surrounding brackets - if ($tokens[0] == '(') array_shift($tokens); - if ($tokens[count($tokens) - 1] == ')') array_pop($tokens); // -1 doesnt work on arrays :-( - - $schema_entry['oid'] = array_shift($tokens); // first token is the oid - - // cycle over the tokens until none are left - while (count($tokens) > 0) { - $token = strtolower(array_shift($tokens)); - if (in_array($token, $noValue)) { - $schema_entry[$token] = 1; // single value token - } else { - // this one follows a string or a list if it is multivalued - if (($schema_entry[$token] = array_shift($tokens)) == '(') { - // this creates the list of values and cycles through the tokens - // until the end of the list is reached ')' - $schema_entry[$token] = array(); - while ($tmp = array_shift($tokens)) { - if ($tmp == ')') break; - if ($tmp != '$') array_push($schema_entry[$token], $tmp); - } - } - // create a array if the value should be multivalued but was not - if (in_array($token, $multiValue) && !is_array($schema_entry[$token])) { - $schema_entry[$token] = array($schema_entry[$token]); - } - } - } - // get max length from syntax - if (key_exists('syntax', $schema_entry)) { - if (preg_match('/{(\d+)}/', $schema_entry['syntax'], $matches)) { - $schema_entry['max_length'] = $matches[1]; - } - } - // force a name - if (empty($schema_entry['name'])) { - $schema_entry['name'] = $schema_entry['oid']; - } - // make one name the default and put the other ones into aliases - if (is_array($schema_entry['name'])) { - $aliases = $schema_entry['name']; - $schema_entry['name'] = array_shift($aliases); - $schema_entry['aliases'] = $aliases; - } - return $schema_entry; - } - - /** - * Tokenizes the given value into an array of tokens - * - * @param string $value String to parse - * - * @access protected - * @return array Array of tokens - */ - protected function _tokenize($value) - { - $tokens = array(); // array of tokens - $matches = array(); // matches[0] full pattern match, [1,2,3] subpatterns - - // this one is taken from perl-ldap, modified for php - $pattern = "/\s* (?:([()]) | ([^'\s()]+) | '((?:[^']+|'[^\s)])*)') \s*/x"; - - /** - * This one matches one big pattern wherin only one of the three subpatterns matched - * We are interested in the subpatterns that matched. If it matched its value will be - * non-empty and so it is a token. Tokens may be round brackets, a string, or a string - * enclosed by ' - */ - preg_match_all($pattern, $value, $matches); - - for ($i = 0; $i < count($matches[0]); $i++) { // number of tokens (full pattern match) - for ($j = 1; $j < 4; $j++) { // each subpattern - if (null != trim($matches[$j][$i])) { // pattern match in this subpattern - $tokens[$i] = trim($matches[$j][$i]); // this is the token - } - } - } - return $tokens; - } - - /** - * Returns wether a attribute syntax is binary or not - * - * This method gets used by Net_LDAP2_Entry to decide which - * PHP function needs to be used to fetch the value in the - * proper format (e.g. binary or string) - * - * @param string $attribute The name of the attribute (eg.: 'sn') - * - * @access public - * @return boolean - */ - public function isBinary($attribute) - { - $return = false; // default to false - - // This list contains all syntax that should be treaten as - // containing binary values - // The Syntax Definitons go into constants at the top of this page - $syntax_binary = array( - NET_LDAP2_SYNTAX_OCTET_STRING, - NET_LDAP2_SYNTAX_JPEG - ); - - // Check Syntax - $attr_s = $this->get('attribute', $attribute); - if (Net_LDAP2::isError($attr_s)) { - // Attribute not found in schema - $return = false; // consider attr not binary - } elseif (isset($attr_s['syntax']) && in_array($attr_s['syntax'], $syntax_binary)) { - // Syntax is defined as binary in schema - $return = true; - } else { - // Syntax not defined as binary, or not found - // if attribute is a subtype, check superior attribute syntaxes - if (isset($attr_s['sup'])) { - foreach ($attr_s['sup'] as $superattr) { - $return = $this->isBinary($superattr); - if ($return) { - break; // stop checking parents since we are binary - } - } - } - } - - return $return; - } - - // [TODO] add method that allows us to see to which objectclasses a certain attribute belongs to - // it should return the result structured, e.g. sorted in "may" and "must". Optionally it should - // be able to return it just "flat", e.g. array_merge()d. - // We could use get_all() to achieve this easily, i think -} -?> diff --git a/extlib/Net/LDAP2/SchemaCache.interface.php b/extlib/Net/LDAP2/SchemaCache.interface.php deleted file mode 100644 index e0c3094c4..000000000 --- a/extlib/Net/LDAP2/SchemaCache.interface.php +++ /dev/null @@ -1,59 +0,0 @@ - -* @copyright 2009 Benedikt Hallinger -* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 -* @version SVN: $Id: SchemaCache.interface.php 286718 2009-08-03 07:30:49Z beni $ -* @link http://pear.php.net/package/Net_LDAP2/ -*/ - -/** -* Interface describing a custom schema cache object -* -* To implement a custom schema cache, one must implement this interface and -* pass the instanciated object to Net_LDAP2s registerSchemaCache() method. -*/ -interface Net_LDAP2_SchemaCache -{ - /** - * Return the schema object from the cache - * - * Net_LDAP2 will consider anything returned invalid, except - * a valid Net_LDAP2_Schema object. - * In case you return a Net_LDAP2_Error, this error will be routed - * to the return of the $ldap->schema() call. - * If you return something else, Net_LDAP2 will - * fetch a fresh Schema object from the LDAP server. - * - * You may want to implement a cache aging mechanism here too. - * - * @return Net_LDAP2_Schema|Net_LDAP2_Error|false - */ - public function loadSchema(); - - /** - * Store a schema object in the cache - * - * This method will be called, if Net_LDAP2 has fetched a fresh - * schema object from LDAP and wants to init or refresh the cache. - * - * In case of errors you may return a Net_LDAP2_Error which will - * be routet to the client. - * Note that doing this prevents, that the schema object fetched from LDAP - * will be given back to the client, so only return errors if storing - * of the cache is something crucial (e.g. for doing something else with it). - * Normaly you dont want to give back errors in which case Net_LDAP2 needs to - * fetch the schema once per script run and instead use the error - * returned from loadSchema(). - * - * @return true|Net_LDAP2_Error - */ - public function storeSchema($schema); -} diff --git a/extlib/Net/LDAP2/Search.php b/extlib/Net/LDAP2/Search.php deleted file mode 100644 index de4fde122..000000000 --- a/extlib/Net/LDAP2/Search.php +++ /dev/null @@ -1,614 +0,0 @@ - -* @author Benedikt Hallinger -* @copyright 2009 Tarjej Huse, Benedikt Hallinger -* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 -* @version SVN: $Id: Search.php 286718 2009-08-03 07:30:49Z beni $ -* @link http://pear.php.net/package/Net_LDAP2/ -*/ - -/** -* Includes -*/ -require_once 'PEAR.php'; - -/** -* Result set of an LDAP search -* -* @category Net -* @package Net_LDAP2 -* @author Tarjej Huse -* @author Benedikt Hallinger -* @license http://www.gnu.org/copyleft/lesser.html LGPL -* @link http://pear.php.net/package/Net_LDAP22/ -*/ -class Net_LDAP2_Search extends PEAR implements Iterator -{ - /** - * Search result identifier - * - * @access protected - * @var resource - */ - protected $_search; - - /** - * LDAP resource link - * - * @access protected - * @var resource - */ - protected $_link; - - /** - * Net_LDAP2 object - * - * A reference of the Net_LDAP2 object for passing to Net_LDAP2_Entry - * - * @access protected - * @var object Net_LDAP2 - */ - protected $_ldap; - - /** - * Result entry identifier - * - * @access protected - * @var resource - */ - protected $_entry = null; - - /** - * The errorcode the search got - * - * Some errorcodes might be of interest, but might not be best handled as errors. - * examples: 4 - LDAP_SIZELIMIT_EXCEEDED - indicates a huge search. - * Incomplete results are returned. If you just want to check if there's anything in the search. - * than this is a point to handle. - * 32 - no such object - search here returns a count of 0. - * - * @access protected - * @var int - */ - protected $_errorCode = 0; // if not set - sucess! - - /** - * Cache for all entries already fetched from iterator interface - * - * @access protected - * @var array - */ - protected $_iteratorCache = array(); - - /** - * What attributes we searched for - * - * The $attributes array contains the names of the searched attributes and gets - * passed from $Net_LDAP2->search() so the Net_LDAP2_Search object can tell - * what attributes was searched for ({@link searchedAttrs()) - * - * This variable gets set from the constructor and returned - * from {@link searchedAttrs()} - * - * @access protected - * @var array - */ - protected $_searchedAttrs = array(); - - /** - * Cache variable for storing entries fetched internally - * - * This currently is only used by {@link pop_entry()} - * - * @access protected - * @var array - */ - protected $_entry_cache = false; - - /** - * Constructor - * - * @param resource &$search Search result identifier - * @param Net_LDAP2|resource &$ldap Net_LDAP2 object or just a LDAP-Link resource - * @param array $attributes (optional) Array with searched attribute names. (see {@link $_searchedAttrs}) - * - * @access public - */ - public function __construct(&$search, &$ldap, $attributes = array()) - { - $this->PEAR('Net_LDAP2_Error'); - - $this->setSearch($search); - - if ($ldap instanceof Net_LDAP2) { - $this->_ldap =& $ldap; - $this->setLink($this->_ldap->getLink()); - } else { - $this->setLink($ldap); - } - - $this->_errorCode = @ldap_errno($this->_link); - - if (is_array($attributes) && !empty($attributes)) { - $this->_searchedAttrs = $attributes; - } - } - - /** - * Returns an array of entry objects - * - * @return array Array of entry objects. - */ - public function entries() - { - $entries = array(); - - while ($entry = $this->shiftEntry()) { - $entries[] = $entry; - } - - return $entries; - } - - /** - * Get the next entry in the searchresult. - * - * This will return a valid Net_LDAP2_Entry object or false, so - * you can use this method to easily iterate over the entries inside - * a while loop. - * - * @return Net_LDAP2_Entry|false Reference to Net_LDAP2_Entry object or false - */ - public function &shiftEntry() - { - if ($this->count() == 0 ) { - $false = false; - return $false; - } - - if (is_null($this->_entry)) { - $this->_entry = @ldap_first_entry($this->_link, $this->_search); - $entry = Net_LDAP2_Entry::createConnected($this->_ldap, $this->_entry); - if ($entry instanceof Net_LDAP2_Error) $entry = false; - } else { - if (!$this->_entry = @ldap_next_entry($this->_link, $this->_entry)) { - $false = false; - return $false; - } - $entry = Net_LDAP2_Entry::createConnected($this->_ldap, $this->_entry); - if ($entry instanceof Net_LDAP2_Error) $entry = false; - } - return $entry; - } - - /** - * Alias function of shiftEntry() for perl-ldap interface - * - * @see shiftEntry() - * @return Net_LDAP2_Entry|false - */ - public function shift_entry() - { - $args = func_get_args(); - return call_user_func_array(array( &$this, 'shiftEntry' ), $args); - } - - /** - * Retrieve the next entry in the searchresult, but starting from last entry - * - * This is the opposite to {@link shiftEntry()} and is also very useful - * to be used inside a while loop. - * - * @return Net_LDAP2_Entry|false - */ - public function popEntry() - { - if (false === $this->_entry_cache) { - // fetch entries into cache if not done so far - $this->_entry_cache = $this->entries(); - } - - $return = array_pop($this->_entry_cache); - return (null === $return)? false : $return; - } - - /** - * Alias function of popEntry() for perl-ldap interface - * - * @see popEntry() - * @return Net_LDAP2_Entry|false - */ - public function pop_entry() - { - $args = func_get_args(); - return call_user_func_array(array( &$this, 'popEntry' ), $args); - } - - /** - * Return entries sorted as array - * - * This returns a array with sorted entries and the values. - * Sorting is done with PHPs {@link array_multisort()}. - * This method relies on {@link as_struct()} to fetch the raw data of the entries. - * - * Please note that attribute names are case sensitive! - * - * Usage example: - * - * // to sort entries first by location, then by surename, but descending: - * $entries = $search->sorted_as_struct(array('locality','sn'), SORT_DESC); - * - * - * @param array $attrs Array of attribute names to sort; order from left to right. - * @param int $order Ordering direction, either constant SORT_ASC or SORT_DESC - * - * @return array|Net_LDAP2_Error Array with sorted entries or error - * @todo what about server side sorting as specified in http://www.ietf.org/rfc/rfc2891.txt? - */ - public function sorted_as_struct($attrs = array('cn'), $order = SORT_ASC) - { - /* - * Old Code, suitable and fast for single valued sorting - * This code should be used if we know that single valued sorting is desired, - * but we need some method to get that knowledge... - */ - /* - $attrs = array_reverse($attrs); - foreach ($attrs as $attribute) { - if (!ldap_sort($this->_link, $this->_search, $attribute)){ - $this->raiseError("Sorting failed for Attribute " . $attribute); - } - } - - $results = ldap_get_entries($this->_link, $this->_search); - - unset($results['count']); //for tidier output - if ($order) { - return array_reverse($results); - } else { - return $results; - }*/ - - /* - * New code: complete "client side" sorting - */ - // first some parameterchecks - if (!is_array($attrs)) { - return PEAR::raiseError("Sorting failed: Parameterlist must be an array!"); - } - if ($order != SORT_ASC && $order != SORT_DESC) { - return PEAR::raiseError("Sorting failed: sorting direction not understood! (neither constant SORT_ASC nor SORT_DESC)"); - } - - // fetch the entries data - $entries = $this->as_struct(); - - // now sort each entries attribute values - // this is neccessary because later we can only sort by one value, - // so we need the highest or lowest attribute now, depending on the - // selected ordering for that specific attribute - foreach ($entries as $dn => $entry) { - foreach ($entry as $attr_name => $attr_values) { - sort($entries[$dn][$attr_name]); - if ($order == SORT_DESC) { - array_reverse($entries[$dn][$attr_name]); - } - } - } - - // reformat entrys array for later use with array_multisort() - $to_sort = array(); // <- will be a numeric array similar to ldap_get_entries - foreach ($entries as $dn => $entry_attr) { - $row = array(); - $row['dn'] = $dn; - foreach ($entry_attr as $attr_name => $attr_values) { - $row[$attr_name] = $attr_values; - } - $to_sort[] = $row; - } - - // Build columns for array_multisort() - // each requested attribute is one row - $columns = array(); - foreach ($attrs as $attr_name) { - foreach ($to_sort as $key => $row) { - $columns[$attr_name][$key] =& $to_sort[$key][$attr_name][0]; - } - } - - // sort the colums with array_multisort, if there is something - // to sort and if we have requested sort columns - if (!empty($to_sort) && !empty($columns)) { - $sort_params = ''; - foreach ($attrs as $attr_name) { - $sort_params .= '$columns[\''.$attr_name.'\'], '.$order.', '; - } - eval("array_multisort($sort_params \$to_sort);"); // perform sorting - } - - return $to_sort; - } - - /** - * Return entries sorted as objects - * - * This returns a array with sorted Net_LDAP2_Entry objects. - * The sorting is actually done with {@link sorted_as_struct()}. - * - * Please note that attribute names are case sensitive! - * Also note, that it is (depending on server capabilitys) possible to let - * the server sort your results. This happens through search controls - * and is described in detail at {@link http://www.ietf.org/rfc/rfc2891.txt} - * - * Usage example: - * - * // to sort entries first by location, then by surename, but descending: - * $entries = $search->sorted(array('locality','sn'), SORT_DESC); - * - * - * @param array $attrs Array of sort attributes to sort; order from left to right. - * @param int $order Ordering direction, either constant SORT_ASC or SORT_DESC - * - * @return array|Net_LDAP2_Error Array with sorted Net_LDAP2_Entries or error - * @todo Entry object construction could be faster. Maybe we could use one of the factorys instead of fetching the entry again - */ - public function sorted($attrs = array('cn'), $order = SORT_ASC) - { - $return = array(); - $sorted = $this->sorted_as_struct($attrs, $order); - if (PEAR::isError($sorted)) { - return $sorted; - } - foreach ($sorted as $key => $row) { - $entry = $this->_ldap->getEntry($row['dn'], $this->searchedAttrs()); - if (!PEAR::isError($entry)) { - array_push($return, $entry); - } else { - return $entry; - } - } - return $return; - } - - /** - * Return entries as array - * - * This method returns the entries and the selected attributes values as - * array. - * The first array level contains all found entries where the keys are the - * DNs of the entries. The second level arrays contian the entries attributes - * such that the keys is the lowercased name of the attribute and the values - * are stored in another indexed array. Note that the attribute values are stored - * in an array even if there is no or just one value. - * - * The array has the following structure: - * - * $return = array( - * 'cn=foo,dc=example,dc=com' => array( - * 'sn' => array('foo'), - * 'multival' => array('val1', 'val2', 'valN') - * ) - * 'cn=bar,dc=example,dc=com' => array( - * 'sn' => array('bar'), - * 'multival' => array('val1', 'valN') - * ) - * ) - * - * - * @return array associative result array as described above - */ - public function as_struct() - { - $return = array(); - $entries = $this->entries(); - foreach ($entries as $entry) { - $attrs = array(); - $entry_attributes = $entry->attributes(); - foreach ($entry_attributes as $attr_name) { - $attr_values = $entry->getValue($attr_name, 'all'); - if (!is_array($attr_values)) { - $attr_values = array($attr_values); - } - $attrs[$attr_name] = $attr_values; - } - $return[$entry->dn()] = $attrs; - } - return $return; - } - - /** - * Set the search objects resource link - * - * @param resource &$search Search result identifier - * - * @access public - * @return void - */ - public function setSearch(&$search) - { - $this->_search = $search; - } - - /** - * Set the ldap ressource link - * - * @param resource &$link Link identifier - * - * @access public - * @return void - */ - public function setLink(&$link) - { - $this->_link = $link; - } - - /** - * Returns the number of entries in the searchresult - * - * @return int Number of entries in search. - */ - public function count() - { - // this catches the situation where OL returned errno 32 = no such object! - if (!$this->_search) { - return 0; - } - return @ldap_count_entries($this->_link, $this->_search); - } - - /** - * Get the errorcode the object got in its search. - * - * @return int The ldap error number. - */ - public function getErrorCode() - { - return $this->_errorCode; - } - - /** - * Destructor - * - * @access protected - */ - public function _Net_LDAP2_Search() - { - @ldap_free_result($this->_search); - } - - /** - * Closes search result - * - * @return void - */ - public function done() - { - $this->_Net_LDAP2_Search(); - } - - /** - * Return the attribute names this search selected - * - * @return array - * @see $_searchedAttrs - * @access protected - */ - protected function searchedAttrs() - { - return $this->_searchedAttrs; - } - - /** - * Tells if this search exceeds a sizelimit - * - * @return boolean - */ - public function sizeLimitExceeded() - { - return ($this->getErrorCode() == 4); - } - - - /* - * SPL Iterator interface methods. - * This interface allows to use Net_LDAP2_Search - * objects directly inside a foreach loop! - */ - /** - * SPL Iterator interface: Return the current element. - * - * The SPL Iterator interface allows you to fetch entries inside - * a foreach() loop: foreach ($search as $dn => $entry) { ... - * - * Of course, you may call {@link current()}, {@link key()}, {@link next()}, - * {@link rewind()} and {@link valid()} yourself. - * - * If the search throwed an error, it returns false. - * False is also returned, if the end is reached - * In case no call to next() was made, we will issue one, - * thus returning the first entry. - * - * @return Net_LDAP2_Entry|false - */ - public function current() - { - if (count($this->_iteratorCache) == 0) { - $this->next(); - reset($this->_iteratorCache); - } - $entry = current($this->_iteratorCache); - return ($entry instanceof Net_LDAP2_Entry)? $entry : false; - } - - /** - * SPL Iterator interface: Return the identifying key (DN) of the current entry. - * - * @see current() - * @return string|false DN of the current entry; false in case no entry is returned by current() - */ - public function key() - { - $entry = $this->current(); - return ($entry instanceof Net_LDAP2_Entry)? $entry->dn() :false; - } - - /** - * SPL Iterator interface: Move forward to next entry. - * - * After a call to {@link next()}, {@link current()} will return - * the next entry in the result set. - * - * @see current() - * @return void - */ - public function next() - { - // fetch next entry. - // if we have no entrys anymore, we add false (which is - // returned by shiftEntry()) so current() will complain. - if (count($this->_iteratorCache) - 1 <= $this->count()) { - $this->_iteratorCache[] = $this->shiftEntry(); - } - - // move on array pointer to current element. - // even if we have added all entries, this will - // ensure proper operation in case we rewind() - next($this->_iteratorCache); - } - - /** - * SPL Iterator interface: Check if there is a current element after calls to {@link rewind()} or {@link next()}. - * - * Used to check if we've iterated to the end of the collection. - * - * @see current() - * @return boolean FALSE if there's nothing more to iterate over - */ - public function valid() - { - return ($this->current() instanceof Net_LDAP2_Entry); - } - - /** - * SPL Iterator interface: Rewind the Iterator to the first element. - * - * After rewinding, {@link current()} will return the first entry in the result set. - * - * @see current() - * @return void - */ - public function rewind() - { - reset($this->_iteratorCache); - } -} - -?> diff --git a/extlib/Net/LDAP2/SimpleFileSchemaCache.php b/extlib/Net/LDAP2/SimpleFileSchemaCache.php deleted file mode 100644 index 8019654ac..000000000 --- a/extlib/Net/LDAP2/SimpleFileSchemaCache.php +++ /dev/null @@ -1,97 +0,0 @@ - -* @copyright 2009 Benedikt Hallinger -* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 -* @version SVN: $Id: SimpleFileSchemaCache.php 286718 2009-08-03 07:30:49Z beni $ -* @link http://pear.php.net/package/Net_LDAP2/ -*/ - -/** -* A simple file based schema cacher with cache aging. -* -* Once the cache is too old, the loadSchema() method will return false, so -* Net_LDAP2 will fetch a fresh object from the LDAP server that will -* overwrite the current (outdated) old cache. -*/ -class Net_LDAP2_SimpleFileSchemaCache implements Net_LDAP2_SchemaCache -{ - /** - * Internal config of this cache - * - * @see Net_LDAP2_SimpleFileSchemaCache() - * @var array - */ - protected $config = array( - 'path' => '/tmp/Net_LDAP_Schema.cache', - 'max_age' => 1200 - ); - - /** - * Initialize the simple cache - * - * Config is as following: - * path Complete path to the cache file. - * max_age Maximum age of cache in seconds, 0 means "endlessly". - * - * @param array $cfg Config array - */ - public function Net_LDAP2_SimpleFileSchemaCache($cfg) - { - foreach ($cfg as $key => $value) { - if (array_key_exists($key, $this->config)) { - if (gettype($this->config[$key]) != gettype($value)) { - $this->getCore()->dropFatalError(__CLASS__.": Could not set config! Key $key does not match type ".gettype($this->config[$key])."!"); - } - $this->config[$key] = $value; - } else { - $this->getCore()->dropFatalError(__CLASS__.": Could not set config! Key $key is not defined!"); - } - } - } - - /** - * Return the schema object from the cache - * - * If file is existent and cache has not expired yet, - * then the cache is deserialized and returned. - * - * @return Net_LDAP2_Schema|Net_LDAP2_Error|false - */ - public function loadSchema() - { - $return = false; // Net_LDAP2 will load schema from LDAP - if (file_exists($this->config['path'])) { - $cache_maxage = filemtime($this->config['path']) + $this->config['max_age']; - if (time() <= $cache_maxage || $this->config['max_age'] == 0) { - $return = unserialize(file_get_contents($this->config['path'])); - } - } - return $return; - } - - /** - * Store a schema object in the cache - * - * This method will be called, if Net_LDAP2 has fetched a fresh - * schema object from LDAP and wants to init or refresh the cache. - * - * To invalidate the cache and cause Net_LDAP2 to refresh the cache, - * you can call this method with null or false as value. - * The next call to $ldap->schema() will then refresh the caches object. - * - * @param mixed $schema The object that should be cached - * @return true|Net_LDAP2_Error|false - */ - public function storeSchema($schema) { - file_put_contents($this->config['path'], serialize($schema)); - return true; - } -} diff --git a/extlib/Net/LDAP2/Util.php b/extlib/Net/LDAP2/Util.php deleted file mode 100644 index 48b03f9f9..000000000 --- a/extlib/Net/LDAP2/Util.php +++ /dev/null @@ -1,572 +0,0 @@ - -* @copyright 2009 Benedikt Hallinger -* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 -* @version SVN: $Id: Util.php 286718 2009-08-03 07:30:49Z beni $ -* @link http://pear.php.net/package/Net_LDAP2/ -*/ - -/** -* Includes -*/ -require_once 'PEAR.php'; - -/** -* Utility Class for Net_LDAP2 -* -* This class servers some functionality to the other classes of Net_LDAP2 but most of -* the methods can be used separately as well. -* -* @category Net -* @package Net_LDAP2 -* @author Benedikt Hallinger -* @license http://www.gnu.org/copyleft/lesser.html LGPL -* @link http://pear.php.net/package/Net_LDAP22/ -*/ -class Net_LDAP2_Util extends PEAR -{ - /** - * Constructor - * - * @access public - */ - public function __construct() - { - // We do nothing here, since all methods can be called statically. - // In Net_LDAP <= 0.7, we needed a instance of Util, because - // it was possible to do utf8 encoding and decoding, but this - // has been moved to the LDAP class. The constructor remains only - // here to document the downward compatibility of creating an instance. - } - - /** - * Explodes the given DN into its elements - * - * {@link http://www.ietf.org/rfc/rfc2253.txt RFC 2253} says, a Distinguished Name is a sequence - * of Relative Distinguished Names (RDNs), which themselves - * are sets of Attributes. For each RDN a array is constructed where the RDN part is stored. - * - * For example, the DN 'OU=Sales+CN=J. Smith,DC=example,DC=net' is exploded to: - * array( [0] => array([0] => 'OU=Sales', [1] => 'CN=J. Smith'), [2] => 'DC=example', [3] => 'DC=net' ) - * - * [NOT IMPLEMENTED] DNs might also contain values, which are the bytes of the BER encoding of - * the X.500 AttributeValue rather than some LDAP string syntax. These values are hex-encoded - * and prefixed with a #. To distinguish such BER values, ldap_explode_dn uses references to - * the actual values, e.g. '1.3.6.1.4.1.1466.0=#04024869,DC=example,DC=com' is exploded to: - * [ { '1.3.6.1.4.1.1466.0' => "\004\002Hi" }, { 'DC' => 'example' }, { 'DC' => 'com' } ]; - * See {@link http://www.vijaymukhi.com/vmis/berldap.htm} for more information on BER. - * - * It also performs the following operations on the given DN: - * - Unescape "\" followed by ",", "+", """, "\", "<", ">", ";", "#", "=", " ", or a hexpair - * and strings beginning with "#". - * - Removes the leading 'OID.' characters if the type is an OID instead of a name. - * - If an RDN contains multiple parts, the parts are re-ordered so that the attribute type names are in alphabetical order. - * - * OPTIONS is a list of name/value pairs, valid options are: - * casefold Controls case folding of attribute types names. - * Attribute values are not affected by this option. - * The default is to uppercase. Valid values are: - * lower Lowercase attribute types names. - * upper Uppercase attribute type names. This is the default. - * none Do not change attribute type names. - * reverse If TRUE, the RDN sequence is reversed. - * onlyvalues If TRUE, then only attributes values are returned ('foo' instead of 'cn=foo') - * - - * @param string $dn The DN that should be exploded - * @param array $options Options to use - * - * @static - * @return array Parts of the exploded DN - * @todo implement BER - */ - public static function ldap_explode_dn($dn, $options = array('casefold' => 'upper')) - { - if (!isset($options['onlyvalues'])) $options['onlyvalues'] = false; - if (!isset($options['reverse'])) $options['reverse'] = false; - if (!isset($options['casefold'])) $options['casefold'] = 'upper'; - - // Escaping of DN and stripping of "OID." - $dn = self::canonical_dn($dn, array('casefold' => $options['casefold'])); - - // splitting the DN - $dn_array = preg_split('/(?<=[^\\\\]),/', $dn); - - // clear wrong splitting (possibly we have split too much) - // /!\ Not clear, if this is neccessary here - //$dn_array = self::correct_dn_splitting($dn_array, ','); - - // construct subarrays for multivalued RDNs and unescape DN value - // also convert to output format and apply casefolding - foreach ($dn_array as $key => $value) { - $value_u = self::unescape_dn_value($value); - $rdns = self::split_rdn_multival($value_u[0]); - if (count($rdns) > 1) { - // MV RDN! - foreach ($rdns as $subrdn_k => $subrdn_v) { - // Casefolding - if ($options['casefold'] == 'upper') $subrdn_v = preg_replace("/^(\w+=)/e", "''.strtoupper('\\1').''", $subrdn_v); - if ($options['casefold'] == 'lower') $subrdn_v = preg_replace("/^(\w+=)/e", "''.strtolower('\\1').''", $subrdn_v); - - if ($options['onlyvalues']) { - preg_match('/(.+?)(?", ";", "#", "=" with a special meaning in RFC 2252 - * are preceeded by ba backslash. Control characters with an ASCII code < 32 are represented as \hexpair. - * Finally all leading and trailing spaces are converted to sequences of \20. - * - * @param array $values An array containing the DN values that should be escaped - * - * @static - * @return array The array $values, but escaped - */ - public static function escape_dn_value($values = array()) - { - // Parameter validation - if (!is_array($values)) { - $values = array($values); - } - - foreach ($values as $key => $val) { - // Escaping of filter meta characters - $val = str_replace('\\', '\\\\', $val); - $val = str_replace(',', '\,', $val); - $val = str_replace('+', '\+', $val); - $val = str_replace('"', '\"', $val); - $val = str_replace('<', '\<', $val); - $val = str_replace('>', '\>', $val); - $val = str_replace(';', '\;', $val); - $val = str_replace('#', '\#', $val); - $val = str_replace('=', '\=', $val); - - // ASCII < 32 escaping - $val = self::asc2hex32($val); - - // Convert all leading and trailing spaces to sequences of \20. - if (preg_match('/^(\s*)(.+?)(\s*)$/', $val, $matches)) { - $val = $matches[2]; - for ($i = 0; $i < strlen($matches[1]); $i++) { - $val = '\20'.$val; - } - for ($i = 0; $i < strlen($matches[3]); $i++) { - $val = $val.'\20'; - } - } - - if (null === $val) $val = '\0'; // apply escaped "null" if string is empty - - $values[$key] = $val; - } - - return $values; - } - - /** - * Undoes the conversion done by escape_dn_value(). - * - * Any escape sequence starting with a baskslash - hexpair or special character - - * will be transformed back to the corresponding character. - * - * @param array $values Array of DN Values - * - * @return array Same as $values, but unescaped - * @static - */ - public static function unescape_dn_value($values = array()) - { - // Parameter validation - if (!is_array($values)) { - $values = array($values); - } - - foreach ($values as $key => $val) { - // strip slashes from special chars - $val = str_replace('\\\\', '\\', $val); - $val = str_replace('\,', ',', $val); - $val = str_replace('\+', '+', $val); - $val = str_replace('\"', '"', $val); - $val = str_replace('\<', '<', $val); - $val = str_replace('\>', '>', $val); - $val = str_replace('\;', ';', $val); - $val = str_replace('\#', '#', $val); - $val = str_replace('\=', '=', $val); - - // Translate hex code into ascii - $values[$key] = self::hex2asc($val); - } - - return $values; - } - - /** - * Returns the given DN in a canonical form - * - * Returns false if DN is not a valid Distinguished Name. - * DN can either be a string or an array - * as returned by ldap_explode_dn, which is useful when constructing a DN. - * The DN array may have be indexed (each array value is a OCL=VALUE pair) - * or associative (array key is OCL and value is VALUE). - * - * It performs the following operations on the given DN: - * - Removes the leading 'OID.' characters if the type is an OID instead of a name. - * - Escapes all RFC 2253 special characters (",", "+", """, "\", "<", ">", ";", "#", "="), slashes ("/"), and any other character where the ASCII code is < 32 as \hexpair. - * - Converts all leading and trailing spaces in values to be \20. - * - If an RDN contains multiple parts, the parts are re-ordered so that the attribute type names are in alphabetical order. - * - * OPTIONS is a list of name/value pairs, valid options are: - * casefold Controls case folding of attribute type names. - * Attribute values are not affected by this option. The default is to uppercase. - * Valid values are: - * lower Lowercase attribute type names. - * upper Uppercase attribute type names. This is the default. - * none Do not change attribute type names. - * [NOT IMPLEMENTED] mbcescape If TRUE, characters that are encoded as a multi-octet UTF-8 sequence will be escaped as \(hexpair){2,*}. - * reverse If TRUE, the RDN sequence is reversed. - * separator Separator to use between RDNs. Defaults to comma (','). - * - * Note: The empty string "" is a valid DN, so be sure not to do a "$can_dn == false" test, - * because an empty string evaluates to false. Use the "===" operator instead. - * - * @param array|string $dn The DN - * @param array $options Options to use - * - * @static - * @return false|string The canonical DN or FALSE - * @todo implement option mbcescape - */ - public static function canonical_dn($dn, $options = array('casefold' => 'upper', 'separator' => ',')) - { - if ($dn === '') return $dn; // empty DN is valid! - - // options check - if (!isset($options['reverse'])) { - $options['reverse'] = false; - } else { - $options['reverse'] = true; - } - if (!isset($options['casefold'])) $options['casefold'] = 'upper'; - if (!isset($options['separator'])) $options['separator'] = ','; - - - if (!is_array($dn)) { - // It is not clear to me if the perl implementation splits by the user defined - // separator or if it just uses this separator to construct the new DN - $dn = preg_split('/(?<=[^\\\\])'.$options['separator'].'/', $dn); - - // clear wrong splitting (possibly we have split too much) - $dn = self::correct_dn_splitting($dn, $options['separator']); - } else { - // Is array, check, if the array is indexed or associative - $assoc = false; - foreach ($dn as $dn_key => $dn_part) { - if (!is_int($dn_key)) { - $assoc = true; - } - } - // convert to indexed, if associative array detected - if ($assoc) { - $newdn = array(); - foreach ($dn as $dn_key => $dn_part) { - if (is_array($dn_part)) { - ksort($dn_part, SORT_STRING); // we assume here, that the rdn parts are also associative - $newdn[] = $dn_part; // copy array as-is, so we can resolve it later - } else { - $newdn[] = $dn_key.'='.$dn_part; - } - } - $dn =& $newdn; - } - } - - // Escaping and casefolding - foreach ($dn as $pos => $dnval) { - if (is_array($dnval)) { - // subarray detected, this means very surely, that we had - // a multivalued dn part, which must be resolved - $dnval_new = ''; - foreach ($dnval as $subkey => $subval) { - // build RDN part - if (!is_int($subkey)) { - $subval = $subkey.'='.$subval; - } - $subval_processed = self::canonical_dn($subval); - if (false === $subval_processed) return false; - $dnval_new .= $subval_processed.'+'; - } - $dn[$pos] = substr($dnval_new, 0, -1); // store RDN part, strip last plus - } else { - // try to split multivalued RDNS into array - $rdns = self::split_rdn_multival($dnval); - if (count($rdns) > 1) { - // Multivalued RDN was detected! - // The RDN value is expected to be correctly split by split_rdn_multival(). - // It's time to sort the RDN and build the DN! - $rdn_string = ''; - sort($rdns, SORT_STRING); // Sort RDN keys alphabetically - foreach ($rdns as $rdn) { - $subval_processed = self::canonical_dn($rdn); - if (false === $subval_processed) return false; - $rdn_string .= $subval_processed.'+'; - } - - $dn[$pos] = substr($rdn_string, 0, -1); // store RDN part, strip last plus - - } else { - // no multivalued RDN! - // split at first unescaped "=" - $dn_comp = preg_split('/(?<=[^\\\\])=/', $rdns[0], 2); - $ocl = ltrim($dn_comp[0]); // trim left whitespaces 'cause of "cn=foo, l=bar" syntax (whitespace after comma) - $val = $dn_comp[1]; - - // strip 'OID.', otherwise apply casefolding and escaping - if (substr(strtolower($ocl), 0, 4) == 'oid.') { - $ocl = substr($ocl, 4); - } else { - if ($options['casefold'] == 'upper') $ocl = strtoupper($ocl); - if ($options['casefold'] == 'lower') $ocl = strtolower($ocl); - $ocl = self::escape_dn_value(array($ocl)); - $ocl = $ocl[0]; - } - - // escaping of dn-value - $val = self::escape_dn_value(array($val)); - $val = str_replace('/', '\/', $val[0]); - - $dn[$pos] = $ocl.'='.$val; - } - } - } - - if ($options['reverse']) $dn = array_reverse($dn); - return implode($options['separator'], $dn); - } - - /** - * Escapes the given VALUES according to RFC 2254 so that they can be safely used in LDAP filters. - * - * Any control characters with an ACII code < 32 as well as the characters with special meaning in - * LDAP filters "*", "(", ")", and "\" (the backslash) are converted into the representation of a - * backslash followed by two hex digits representing the hexadecimal value of the character. - * - * @param array $values Array of values to escape - * - * @static - * @return array Array $values, but escaped - */ - public static function escape_filter_value($values = array()) - { - // Parameter validation - if (!is_array($values)) { - $values = array($values); - } - - foreach ($values as $key => $val) { - // Escaping of filter meta characters - $val = str_replace('\\', '\5c', $val); - $val = str_replace('*', '\2a', $val); - $val = str_replace('(', '\28', $val); - $val = str_replace(')', '\29', $val); - - // ASCII < 32 escaping - $val = self::asc2hex32($val); - - if (null === $val) $val = '\0'; // apply escaped "null" if string is empty - - $values[$key] = $val; - } - - return $values; - } - - /** - * Undoes the conversion done by {@link escape_filter_value()}. - * - * Converts any sequences of a backslash followed by two hex digits into the corresponding character. - * - * @param array $values Array of values to escape - * - * @static - * @return array Array $values, but unescaped - */ - public static function unescape_filter_value($values = array()) - { - // Parameter validation - if (!is_array($values)) { - $values = array($values); - } - - foreach ($values as $key => $value) { - // Translate hex code into ascii - $values[$key] = self::hex2asc($value); - } - - return $values; - } - - /** - * Converts all ASCII chars < 32 to "\HEX" - * - * @param string $string String to convert - * - * @static - * @return string - */ - public static function asc2hex32($string) - { - for ($i = 0; $i < strlen($string); $i++) { - $char = substr($string, $i, 1); - if (ord($char) < 32) { - $hex = dechex(ord($char)); - if (strlen($hex) == 1) $hex = '0'.$hex; - $string = str_replace($char, '\\'.$hex, $string); - } - } - return $string; - } - - /** - * Converts all Hex expressions ("\HEX") to their original ASCII characters - * - * @param string $string String to convert - * - * @static - * @author beni@php.net, heavily based on work from DavidSmith@byu.net - * @return string - */ - public static function hex2asc($string) - { - $string = preg_replace("/\\\([0-9A-Fa-f]{2})/e", "''.chr(hexdec('\\1')).''", $string); - return $string; - } - - /** - * Split an multivalued RDN value into an Array - * - * A RDN can contain multiple values, spearated by a plus sign. - * This function returns each separate ocl=value pair of the RDN part. - * - * If no multivalued RDN is detected, an array containing only - * the original rdn part is returned. - * - * For example, the multivalued RDN 'OU=Sales+CN=J. Smith' is exploded to: - * array([0] => 'OU=Sales', [1] => 'CN=J. Smith') - * - * The method trys to be smart if it encounters unescaped "+" characters, but may fail, - * so ensure escaped "+"es in attr names and attr values. - * - * [BUG] If you have a multivalued RDN with unescaped plus characters - * and there is a unescaped plus sign at the end of an value followed by an - * attribute name containing an unescaped plus, then you will get wrong splitting: - * $rdn = 'OU=Sales+C+N=J. Smith'; - * returns: - * array('OU=Sales+C', 'N=J. Smith'); - * The "C+" is treaten as value of the first pair instead as attr name of the second pair. - * To prevent this, escape correctly. - * - * @param string $rdn Part of an (multivalued) escaped RDN (eg. ou=foo OR ou=foo+cn=bar) - * - * @static - * @return array Array with the components of the multivalued RDN or Error - */ - public static function split_rdn_multival($rdn) - { - $rdns = preg_split('/(? $dn_value) { - $dn_value = $dn[$key]; // refresh value (foreach caches!) - // if the dn_value is not in attr=value format, then we had an - // unescaped separator character inside the attr name or the value. - // We assume, that it was the attribute value. - // [TODO] To solve this, we might ask the schema. Keep in mind, that UTIL class - // must remain independent from the other classes or connections. - if (!preg_match('/.+(? diff --git a/plugins/LdapCommon/LdapCommon.php b/plugins/LdapCommon/LdapCommon.php index e2ca569f3..ee436d824 100644 --- a/plugins/LdapCommon/LdapCommon.php +++ b/plugins/LdapCommon/LdapCommon.php @@ -31,6 +31,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } +// We bundle the Net/LDAP2 library... +set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib'); + class LdapCommon { protected static $ldap_connections = array(); diff --git a/plugins/LdapCommon/extlib/Net/LDAP2.php b/plugins/LdapCommon/extlib/Net/LDAP2.php new file mode 100644 index 000000000..26f5e7560 --- /dev/null +++ b/plugins/LdapCommon/extlib/Net/LDAP2.php @@ -0,0 +1,1791 @@ + +* @author Jan Wagner +* @author Del +* @author Benedikt Hallinger +* @copyright 2003-2007 Tarjej Huse, Jan Wagner, Del Elson, Benedikt Hallinger +* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 +* @version SVN: $Id: LDAP2.php 286788 2009-08-04 06:05:49Z beni $ +* @link http://pear.php.net/package/Net_LDAP2/ +*/ + +/** +* Package includes. +*/ +require_once 'PEAR.php'; +require_once 'Net/LDAP2/RootDSE.php'; +require_once 'Net/LDAP2/Schema.php'; +require_once 'Net/LDAP2/Entry.php'; +require_once 'Net/LDAP2/Search.php'; +require_once 'Net/LDAP2/Util.php'; +require_once 'Net/LDAP2/Filter.php'; +require_once 'Net/LDAP2/LDIF.php'; +require_once 'Net/LDAP2/SchemaCache.interface.php'; +require_once 'Net/LDAP2/SimpleFileSchemaCache.php'; + +/** +* Error constants for errors that are not LDAP errors. +*/ +define('NET_LDAP2_ERROR', 1000); + +/** +* Net_LDAP2 Version +*/ +define('NET_LDAP2_VERSION', '2.0.7'); + +/** +* Net_LDAP2 - manipulate LDAP servers the right way! +* +* @category Net +* @package Net_LDAP2 +* @author Tarjej Huse +* @author Jan Wagner +* @author Del +* @author Benedikt Hallinger +* @copyright 2003-2007 Tarjej Huse, Jan Wagner, Del Elson, Benedikt Hallinger +* @license http://www.gnu.org/copyleft/lesser.html LGPL +* @link http://pear.php.net/package/Net_LDAP2/ +*/ +class Net_LDAP2 extends PEAR +{ + /** + * Class configuration array + * + * host = the ldap host to connect to + * (may be an array of several hosts to try) + * port = the server port + * version = ldap version (defaults to v 3) + * starttls = when set, ldap_start_tls() is run after connecting. + * bindpw = no explanation needed + * binddn = the DN to bind as. + * basedn = ldap base + * options = hash of ldap options to set (opt => val) + * filter = default search filter + * scope = default search scope + * + * Newly added in 2.0.0RC4, for auto-reconnect: + * auto_reconnect = if set to true then the class will automatically + * attempt to reconnect to the LDAP server in certain + * failure conditionswhen attempting a search, or other + * LDAP operation. Defaults to false. Note that if you + * set this to true, calls to search() may block + * indefinitely if there is a catastrophic server failure. + * min_backoff = minimum reconnection delay period (in seconds). + * current_backoff = initial reconnection delay period (in seconds). + * max_backoff = maximum reconnection delay period (in seconds). + * + * @access protected + * @var array + */ + protected $_config = array('host' => 'localhost', + 'port' => 389, + 'version' => 3, + 'starttls' => false, + 'binddn' => '', + 'bindpw' => '', + 'basedn' => '', + 'options' => array(), + 'filter' => '(objectClass=*)', + 'scope' => 'sub', + 'auto_reconnect' => false, + 'min_backoff' => 1, + 'current_backoff' => 1, + 'max_backoff' => 32); + + /** + * List of hosts we try to establish a connection to + * + * @access protected + * @var array + */ + protected $_host_list = array(); + + /** + * List of hosts that are known to be down. + * + * @access protected + * @var array + */ + protected $_down_host_list = array(); + + /** + * LDAP resource link. + * + * @access protected + * @var resource + */ + protected $_link = false; + + /** + * Net_LDAP2_Schema object + * + * This gets set and returned by {@link schema()} + * + * @access protected + * @var object Net_LDAP2_Schema + */ + protected $_schema = null; + + /** + * Schema cacher function callback + * + * @see registerSchemaCache() + * @var string + */ + protected $_schema_cache = null; + + /** + * Cache for attribute encoding checks + * + * @access protected + * @var array Hash with attribute names as key and boolean value + * to determine whether they should be utf8 encoded or not. + */ + protected $_schemaAttrs = array(); + + /** + * Cache for rootDSE objects + * + * Hash with requested rootDSE attr names as key and rootDSE object as value + * + * Since the RootDSE object itself may request a rootDSE object, + * {@link rootDse()} caches successful requests. + * Internally, Net_LDAP2 needs several lookups to this object, so + * caching increases performance significally. + * + * @access protected + * @var array + */ + protected $_rootDSE_cache = array(); + + /** + * Returns the Net_LDAP2 Release version, may be called statically + * + * @static + * @return string Net_LDAP2 version + */ + public static function getVersion() + { + return NET_LDAP2_VERSION; + } + + /** + * Configure Net_LDAP2, connect and bind + * + * Use this method as starting point of using Net_LDAP2 + * to establish a connection to your LDAP server. + * + * Static function that returns either an error object or the new Net_LDAP2 + * object. Something like a factory. Takes a config array with the needed + * parameters. + * + * @param array $config Configuration array + * + * @access public + * @return Net_LDAP2_Error|Net_LDAP2 Net_LDAP2_Error or Net_LDAP2 object + */ + public static function &connect($config = array()) + { + $ldap_check = self::checkLDAPExtension(); + if (self::iserror($ldap_check)) { + return $ldap_check; + } + + @$obj = new Net_LDAP2($config); + + // todo? better errorhandling for setConfig()? + + // connect and bind with credentials in config + $err = $obj->bind(); + if (self::isError($err)) { + return $err; + } + + return $obj; + } + + /** + * Net_LDAP2 constructor + * + * Sets the config array + * + * Please note that the usual way of getting Net_LDAP2 to work is + * to call something like: + * $ldap = Net_LDAP2::connect($ldap_config); + * + * @param array $config Configuration array + * + * @access protected + * @return void + * @see $_config + */ + public function __construct($config = array()) + { + $this->PEAR('Net_LDAP2_Error'); + $this->setConfig($config); + } + + /** + * Sets the internal configuration array + * + * @param array $config Configuration array + * + * @access protected + * @return void + */ + protected function setConfig($config) + { + // + // Parameter check -- probably should raise an error here if config + // is not an array. + // + if (! is_array($config)) { + return; + } + + foreach ($config as $k => $v) { + if (isset($this->_config[$k])) { + $this->_config[$k] = $v; + } else { + // map old (Net_LDAP2) parms to new ones + switch($k) { + case "dn": + $this->_config["binddn"] = $v; + break; + case "password": + $this->_config["bindpw"] = $v; + break; + case "tls": + $this->_config["starttls"] = $v; + break; + case "base": + $this->_config["basedn"] = $v; + break; + } + } + } + + // + // Ensure the host list is an array. + // + if (is_array($this->_config['host'])) { + $this->_host_list = $this->_config['host']; + } else { + if (strlen($this->_config['host']) > 0) { + $this->_host_list = array($this->_config['host']); + } else { + $this->_host_list = array(); + // ^ this will cause an error in performConnect(), + // so the user is notified about the failure + } + } + + // + // Reset the down host list, which seems like a sensible thing to do + // if the config is being reset for some reason. + // + $this->_down_host_list = array(); + } + + /** + * Bind or rebind to the ldap-server + * + * This function binds with the given dn and password to the server. In case + * no connection has been made yet, it will be started and startTLS issued + * if appropiate. + * + * The internal bind configuration is not being updated, so if you call + * bind() without parameters, you can rebind with the credentials + * provided at first connecting to the server. + * + * @param string $dn Distinguished name for binding + * @param string $password Password for binding + * + * @access public + * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true + */ + public function bind($dn = null, $password = null) + { + // fetch current bind credentials + if (is_null($dn)) { + $dn = $this->_config["binddn"]; + } + if (is_null($password)) { + $password = $this->_config["bindpw"]; + } + + // Connect first, if we haven't so far. + // This will also bind us to the server. + if ($this->_link === false) { + // store old credentials so we can revert them later + // then overwrite config with new bind credentials + $olddn = $this->_config["binddn"]; + $oldpw = $this->_config["bindpw"]; + + // overwrite bind credentials in config + // so performConnect() knows about them + $this->_config["binddn"] = $dn; + $this->_config["bindpw"] = $password; + + // try to connect with provided credentials + $msg = $this->performConnect(); + + // reset to previous config + $this->_config["binddn"] = $olddn; + $this->_config["bindpw"] = $oldpw; + + // see if bind worked + if (self::isError($msg)) { + return $msg; + } + } else { + // do the requested bind as we are + // asked to bind manually + if (is_null($dn)) { + // anonymous bind + $msg = @ldap_bind($this->_link); + } else { + // privileged bind + $msg = @ldap_bind($this->_link, $dn, $password); + } + if (false === $msg) { + return PEAR::raiseError("Bind failed: " . + @ldap_error($this->_link), + @ldap_errno($this->_link)); + } + } + return true; + } + + /** + * Connect to the ldap-server + * + * This function connects to the LDAP server specified in + * the configuration, binds and set up the LDAP protocol as needed. + * + * @access protected + * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true + */ + protected function performConnect() + { + // Note: Connecting is briefly described in RFC1777. + // Basicly it works like this: + // 1. set up TCP connection + // 2. secure that connection if neccessary + // 3a. setLDAPVersion to tell server which version we want to speak + // 3b. perform bind + // 3c. setLDAPVersion to tell server which version we want to speak + // together with a test for supported versions + // 4. set additional protocol options + + // Return true if we are already connected. + if ($this->_link !== false) { + return true; + } + + // Connnect to the LDAP server if we are not connected. Note that + // with some LDAP clients, ldapperformConnect returns a link value even + // if no connection is made. We need to do at least one anonymous + // bind to ensure that a connection is actually valid. + // + // Ref: http://www.php.net/manual/en/function.ldap-connect.php + + // Default error message in case all connection attempts + // fail but no message is set + $current_error = new PEAR_Error('Unknown connection error'); + + // Catch empty $_host_list arrays. + if (!is_array($this->_host_list) || count($this->_host_list) == 0) { + $current_error = PEAR::raiseError('No Servers configured! Please '. + 'pass in an array of servers to Net_LDAP2'); + return $current_error; + } + + // Cycle through the host list. + foreach ($this->_host_list as $host) { + + // Ensure we have a valid string for host name + if (is_array($host)) { + $current_error = PEAR::raiseError('No Servers configured! '. + 'Please pass in an one dimensional array of servers to '. + 'Net_LDAP2! (multidimensional array detected!)'); + continue; + } + + // Skip this host if it is known to be down. + if (in_array($host, $this->_down_host_list)) { + continue; + } + + // Record the host that we are actually connecting to in case + // we need it later. + $this->_config['host'] = $host; + + // Attempt a connection. + $this->_link = @ldap_connect($host, $this->_config['port']); + if (false === $this->_link) { + $current_error = PEAR::raiseError('Could not connect to ' . + $host . ':' . $this->_config['port']); + $this->_down_host_list[] = $host; + continue; + } + + // If we're supposed to use TLS, do so before we try to bind, + // as some strict servers only allow binding via secure connections + if ($this->_config["starttls"] === true) { + if (self::isError($msg = $this->startTLS())) { + $current_error = $msg; + $this->_link = false; + $this->_down_host_list[] = $host; + continue; + } + } + + // Try to set the configured LDAP version on the connection if LDAP + // server needs that before binding (eg OpenLDAP). + // This could be necessary since rfc-1777 states that the protocol version + // has to be set at the bind request. + // We use force here which means that the test in the rootDSE is skipped; + // this is neccessary, because some strict LDAP servers only allow to + // read the LDAP rootDSE (which tells us the supported protocol versions) + // with authenticated clients. + // This may fail in which case we try again after binding. + // In this case, most probably the bind() or setLDAPVersion()-call + // below will also fail, providing error messages. + $version_set = false; + $ignored_err = $this->setLDAPVersion(0, true); + if (!self::isError($ignored_err)) { + $version_set = true; + } + + // Attempt to bind to the server. If we have credentials configured, + // we try to use them, otherwise its an anonymous bind. + // As stated by RFC-1777, the bind request should be the first + // operation to be performed after the connection is established. + // This may give an protocol error if the server does not support + // V2 binds and the above call to setLDAPVersion() failed. + // In case the above call failed, we try an V2 bind here and set the + // version afterwards (with checking to the rootDSE). + $msg = $this->bind(); + if (self::isError($msg)) { + // The bind failed, discard link and save error msg. + // Then record the host as down and try next one + if ($msg->getCode() == 0x02 && !$version_set) { + // provide a finer grained error message + // if protocol error arieses because of invalid version + $msg = new Net_LDAP2_Error($msg->getMessage(). + " (could not set LDAP protocol version to ". + $this->_config['version'].")", + $msg->getCode()); + } + $this->_link = false; + $current_error = $msg; + $this->_down_host_list[] = $host; + continue; + } + + // Set desired LDAP version if not successfully set before. + // Here, a check against the rootDSE is performed, so we get a + // error message if the server does not support the version. + // The rootDSE entry should tell us which LDAP versions are + // supported. However, some strict LDAP servers only allow + // bound suers to read the rootDSE. + if (!$version_set) { + if (self::isError($msg = $this->setLDAPVersion())) { + $current_error = $msg; + $this->_link = false; + $this->_down_host_list[] = $host; + continue; + } + } + + // Set LDAP parameters, now we know we have a valid connection. + if (isset($this->_config['options']) && + is_array($this->_config['options']) && + count($this->_config['options'])) { + foreach ($this->_config['options'] as $opt => $val) { + $err = $this->setOption($opt, $val); + if (self::isError($err)) { + $current_error = $err; + $this->_link = false; + $this->_down_host_list[] = $host; + continue 2; + } + } + } + + // At this stage we have connected, bound, and set up options, + // so we have a known good LDAP server. Time to go home. + return true; + } + + + // All connection attempts have failed, return the last error. + return $current_error; + } + + /** + * Reconnect to the ldap-server. + * + * In case the connection to the LDAP + * service has dropped out for some reason, this function will reconnect, + * and re-bind if a bind has been attempted in the past. It is probably + * most useful when the server list provided to the new() or connect() + * function is an array rather than a single host name, because in that + * case it will be able to connect to a failover or secondary server in + * case the primary server goes down. + * + * This doesn't return anything, it just tries to re-establish + * the current connection. It will sleep for the current backoff + * period (seconds) before attempting the connect, and if the + * connection fails it will double the backoff period, but not + * try again. If you want to ensure a reconnection during a + * transient period of server downtime then you need to call this + * function in a loop. + * + * @access protected + * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true + */ + protected function performReconnect() + { + + // Return true if we are already connected. + if ($this->_link !== false) { + return true; + } + + // Default error message in case all connection attempts + // fail but no message is set + $current_error = new PEAR_Error('Unknown connection error'); + + // Sleep for a backoff period in seconds. + sleep($this->_config['current_backoff']); + + // Retry all available connections. + $this->_down_host_list = array(); + $msg = $this->performConnect(); + + // Bail out if that fails. + if (self::isError($msg)) { + $this->_config['current_backoff'] = + $this->_config['current_backoff'] * 2; + if ($this->_config['current_backoff'] > $this->_config['max_backoff']) { + $this->_config['current_backoff'] = $this->_config['max_backoff']; + } + return $msg; + } + + // Now we should be able to safely (re-)bind. + $msg = $this->bind(); + if (self::isError($msg)) { + $this->_config['current_backoff'] = $this->_config['current_backoff'] * 2; + if ($this->_config['current_backoff'] > $this->_config['max_backoff']) { + $this->_config['current_backoff'] = $this->_config['max_backoff']; + } + + // _config['host'] should have had the last connected host stored in it + // by performConnect(). Since we are unable to bind to that host we can safely + // assume that it is down or has some other problem. + $this->_down_host_list[] = $this->_config['host']; + return $msg; + } + + // At this stage we have connected, bound, and set up options, + // so we have a known good LDAP server. Time to go home. + $this->_config['current_backoff'] = $this->_config['min_backoff']; + return true; + } + + /** + * Starts an encrypted session + * + * @access public + * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true + */ + public function startTLS() + { + // Test to see if the server supports TLS first. + // This is done via testing the extensions offered by the server. + // The OID 1.3.6.1.4.1.1466.20037 tells us, if TLS is supported. + $rootDSE = $this->rootDse(); + if (self::isError($rootDSE)) { + return $this->raiseError("Unable to fetch rootDSE entry ". + "to see if TLS is supoported: ".$rootDSE->getMessage(), $rootDSE->getCode()); + } + + $supported_extensions = $rootDSE->getValue('supportedExtension'); + if (self::isError($supported_extensions)) { + return $this->raiseError("Unable to fetch rootDSE attribute 'supportedExtension' ". + "to see if TLS is supoported: ".$supported_extensions->getMessage(), $supported_extensions->getCode()); + } + + if (in_array('1.3.6.1.4.1.1466.20037', $supported_extensions)) { + if (false === @ldap_start_tls($this->_link)) { + return $this->raiseError("TLS not started: " . + @ldap_error($this->_link), + @ldap_errno($this->_link)); + } + return true; + } else { + return $this->raiseError("Server reports that it does not support TLS"); + } + } + + /** + * alias function of startTLS() for perl-ldap interface + * + * @return void + * @see startTLS() + */ + public function start_tls() + { + $args = func_get_args(); + return call_user_func_array(array( &$this, 'startTLS' ), $args); + } + + /** + * Close LDAP connection. + * + * Closes the connection. Use this when the session is over. + * + * @return void + */ + public function done() + { + $this->_Net_LDAP2(); + } + + /** + * Alias for {@link done()} + * + * @return void + * @see done() + */ + public function disconnect() + { + $this->done(); + } + + /** + * Destructor + * + * @access protected + */ + public function _Net_LDAP2() + { + @ldap_close($this->_link); + } + + /** + * Add a new entryobject to a directory. + * + * Use add to add a new Net_LDAP2_Entry object to the directory. + * This also links the entry to the connection used for the add, + * if it was a fresh entry ({@link Net_LDAP2_Entry::createFresh()}) + * + * @param Net_LDAP2_Entry &$entry Net_LDAP2_Entry + * + * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true + */ + public function add(&$entry) + { + if (!$entry instanceof Net_LDAP2_Entry) { + return PEAR::raiseError('Parameter to Net_LDAP2::add() must be a Net_LDAP2_Entry object.'); + } + + // Continue attempting the add operation in a loop until we + // get a success, a definitive failure, or the world ends. + $foo = 0; + while (true) { + $link = $this->getLink(); + + if ($link === false) { + // We do not have a successful connection yet. The call to + // getLink() would have kept trying if we wanted one. Go + // home now. + return PEAR::raiseError("Could not add entry " . $entry->dn() . + " no valid LDAP connection could be found."); + } + + if (@ldap_add($link, $entry->dn(), $entry->getValues())) { + // entry successfully added, we should update its $ldap reference + // in case it is not set so far (fresh entry) + if (!$entry->getLDAP() instanceof Net_LDAP2) { + $entry->setLDAP($this); + } + // store, that the entry is present inside the directory + $entry->markAsNew(false); + return true; + } else { + // We have a failure. What type? We may be able to reconnect + // and try again. + $error_code = @ldap_errno($link); + $error_name = $this->errorMessage($error_code); + + if (($error_name === 'LDAP_OPERATIONS_ERROR') && + ($this->_config['auto_reconnect'])) { + + // The server has become disconnected before trying the + // operation. We should try again, possibly with a different + // server. + $this->_link = false; + $this->performReconnect(); + } else { + // Errors other than the above catched are just passed + // back to the user so he may react upon them. + return PEAR::raiseError("Could not add entry " . $entry->dn() . " " . + $error_name, + $error_code); + } + } + } + } + + /** + * Delete an entry from the directory + * + * The object may either be a string representing the dn or a Net_LDAP2_Entry + * object. When the boolean paramter recursive is set, all subentries of the + * entry will be deleted as well. + * + * @param string|Net_LDAP2_Entry $dn DN-string or Net_LDAP2_Entry + * @param boolean $recursive Should we delete all children recursive as well? + * + * @access public + * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true + */ + public function delete($dn, $recursive = false) + { + if ($dn instanceof Net_LDAP2_Entry) { + $dn = $dn->dn(); + } + if (false === is_string($dn)) { + return PEAR::raiseError("Parameter is not a string nor an entry object!"); + } + // Recursive delete searches for children and calls delete for them + if ($recursive) { + $result = @ldap_list($this->_link, $dn, '(objectClass=*)', array(null), 0, 0); + if (@ldap_count_entries($this->_link, $result)) { + $subentry = @ldap_first_entry($this->_link, $result); + $this->delete(@ldap_get_dn($this->_link, $subentry), true); + while ($subentry = @ldap_next_entry($this->_link, $subentry)) { + $this->delete(@ldap_get_dn($this->_link, $subentry), true); + } + } + } + + // Continue attempting the delete operation in a loop until we + // get a success, a definitive failure, or the world ends. + while (true) { + $link = $this->getLink(); + + if ($link === false) { + // We do not have a successful connection yet. The call to + // getLink() would have kept trying if we wanted one. Go + // home now. + return PEAR::raiseError("Could not add entry " . $dn . + " no valid LDAP connection could be found."); + } + + if (@ldap_delete($link, $dn)) { + // entry successfully deleted. + return true; + } else { + // We have a failure. What type? + // We may be able to reconnect and try again. + $error_code = @ldap_errno($link); + $error_name = $this->errorMessage($error_code); + + if (($this->errorMessage($error_code) === 'LDAP_OPERATIONS_ERROR') && + ($this->_config['auto_reconnect'])) { + // The server has become disconnected before trying the + // operation. We should try again, possibly with a + // different server. + $this->_link = false; + $this->performReconnect(); + + } elseif ($error_code == 66) { + // Subentries present, server refused to delete. + // Deleting subentries is the clients responsibility, but + // since the user may not know of the subentries, we do not + // force that here but instead notify the developer so he + // may take actions himself. + return PEAR::raiseError("Could not delete entry $dn because of subentries. Use the recursive parameter to delete them."); + + } else { + // Errors other than the above catched are just passed + // back to the user so he may react upon them. + return PEAR::raiseError("Could not delete entry " . $dn . " " . + $error_name, + $error_code); + } + } + } + } + + /** + * Modify an ldapentry directly on the server + * + * This one takes the DN or a Net_LDAP2_Entry object and an array of actions. + * This array should be something like this: + * + * array('add' => array('attribute1' => array('val1', 'val2'), + * 'attribute2' => array('val1')), + * 'delete' => array('attribute1'), + * 'replace' => array('attribute1' => array('val1')), + * 'changes' => array('add' => ..., + * 'replace' => ..., + * 'delete' => array('attribute1', 'attribute2' => array('val1'))) + * + * The changes array is there so the order of operations can be influenced + * (the operations are done in order of appearance). + * The order of execution is as following: + * 1. adds from 'add' array + * 2. deletes from 'delete' array + * 3. replaces from 'replace' array + * 4. changes (add, replace, delete) in order of appearance + * All subarrays (add, replace, delete, changes) may be given at the same time. + * + * The function calls the corresponding functions of an Net_LDAP2_Entry + * object. A detailed description of array structures can be found there. + * + * Unlike the modification methods provided by the Net_LDAP2_Entry object, + * this method will instantly carry out an update() after each operation, + * thus modifying "directly" on the server. + * + * @param string|Net_LDAP2_Entry $entry DN-string or Net_LDAP2_Entry + * @param array $parms Array of changes + * + * @access public + * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true + */ + public function modify($entry, $parms = array()) + { + if (is_string($entry)) { + $entry = $this->getEntry($entry); + if (self::isError($entry)) { + return $entry; + } + } + if (!$entry instanceof Net_LDAP2_Entry) { + return PEAR::raiseError("Parameter is not a string nor an entry object!"); + } + + // Perform changes mentioned separately + foreach (array('add', 'delete', 'replace') as $action) { + if (isset($parms[$action])) { + $msg = $entry->$action($parms[$action]); + if (self::isError($msg)) { + return $msg; + } + $entry->setLDAP($this); + + // Because the @ldap functions are called inside Net_LDAP2_Entry::update(), + // we have to trap the error codes issued from that if we want to support + // reconnection. + while (true) { + $msg = $entry->update(); + + if (self::isError($msg)) { + // We have a failure. What type? We may be able to reconnect + // and try again. + $error_code = $msg->getCode(); + $error_name = $this->errorMessage($error_code); + + if (($this->errorMessage($error_code) === 'LDAP_OPERATIONS_ERROR') && + ($this->_config['auto_reconnect'])) { + + // The server has become disconnected before trying the + // operation. We should try again, possibly with a different + // server. + $this->_link = false; + $this->performReconnect(); + + } else { + + // Errors other than the above catched are just passed + // back to the user so he may react upon them. + return PEAR::raiseError("Could not modify entry: ".$msg->getMessage()); + } + } else { + // modification succeedet, evaluate next change + break; + } + } + } + } + + // perform combined changes in 'changes' array + if (isset($parms['changes']) && is_array($parms['changes'])) { + foreach ($parms['changes'] as $action => $value) { + + // Because the @ldap functions are called inside Net_LDAP2_Entry::update, + // we have to trap the error codes issued from that if we want to support + // reconnection. + while (true) { + $msg = $this->modify($entry, array($action => $value)); + + if (self::isError($msg)) { + // We have a failure. What type? We may be able to reconnect + // and try again. + $error_code = $msg->getCode(); + $error_name = $this->errorMessage($error_code); + + if (($this->errorMessage($error_code) === 'LDAP_OPERATIONS_ERROR') && + ($this->_config['auto_reconnect'])) { + + // The server has become disconnected before trying the + // operation. We should try again, possibly with a different + // server. + $this->_link = false; + $this->performReconnect(); + + } else { + // Errors other than the above catched are just passed + // back to the user so he may react upon them. + return $msg; + } + } else { + // modification succeedet, evaluate next change + break; + } + } + } + } + + return true; + } + + /** + * Run a ldap search query + * + * Search is used to query the ldap-database. + * $base and $filter may be ommitted. The one from config will + * then be used. $base is either a DN-string or an Net_LDAP2_Entry + * object in which case its DN willb e used. + * + * Params may contain: + * + * scope: The scope which will be used for searching + * base - Just one entry + * sub - The whole tree + * one - Immediately below $base + * sizelimit: Limit the number of entries returned (default: 0 = unlimited), + * timelimit: Limit the time spent for searching (default: 0 = unlimited), + * attrsonly: If true, the search will only return the attribute names, + * attributes: Array of attribute names, which the entry should contain. + * It is good practice to limit this to just the ones you need. + * [NOT IMPLEMENTED] + * deref: By default aliases are dereferenced to locate the base object for the search, but not when + * searching subordinates of the base object. This may be changed by specifying one of the + * following values: + * + * never - Do not dereference aliases in searching or in locating the base object of the search. + * search - Dereference aliases in subordinates of the base object in searching, but not in + * locating the base object of the search. + * find + * always + * + * Please note, that you cannot override server side limitations to sizelimit + * and timelimit: You can always only lower a given limit. + * + * @param string|Net_LDAP2_Entry $base LDAP searchbase + * @param string|Net_LDAP2_Filter $filter LDAP search filter or a Net_LDAP2_Filter object + * @param array $params Array of options + * + * @access public + * @return Net_LDAP2_Search|Net_LDAP2_Error Net_LDAP2_Search object or Net_LDAP2_Error object + * @todo implement search controls (sorting etc) + */ + public function search($base = null, $filter = null, $params = array()) + { + if (is_null($base)) { + $base = $this->_config['basedn']; + } + if ($base instanceof Net_LDAP2_Entry) { + $base = $base->dn(); // fetch DN of entry, making searchbase relative to the entry + } + if (is_null($filter)) { + $filter = $this->_config['filter']; + } + if ($filter instanceof Net_LDAP2_Filter) { + $filter = $filter->asString(); // convert Net_LDAP2_Filter to string representation + } + if (PEAR::isError($filter)) { + return $filter; + } + if (PEAR::isError($base)) { + return $base; + } + + /* setting searchparameters */ + (isset($params['sizelimit'])) ? $sizelimit = $params['sizelimit'] : $sizelimit = 0; + (isset($params['timelimit'])) ? $timelimit = $params['timelimit'] : $timelimit = 0; + (isset($params['attrsonly'])) ? $attrsonly = $params['attrsonly'] : $attrsonly = 0; + (isset($params['attributes'])) ? $attributes = $params['attributes'] : $attributes = array(); + + // Ensure $attributes to be an array in case only one + // attribute name was given as string + if (!is_array($attributes)) { + $attributes = array($attributes); + } + + // reorganize the $attributes array index keys + // sometimes there are problems with not consecutive indexes + $attributes = array_values($attributes); + + // scoping makes searches faster! + $scope = (isset($params['scope']) ? $params['scope'] : $this->_config['scope']); + + switch ($scope) { + case 'one': + $search_function = 'ldap_list'; + break; + case 'base': + $search_function = 'ldap_read'; + break; + default: + $search_function = 'ldap_search'; + } + + // Continue attempting the search operation until we get a success + // or a definitive failure. + while (true) { + $link = $this->getLink(); + $search = @call_user_func($search_function, + $link, + $base, + $filter, + $attributes, + $attrsonly, + $sizelimit, + $timelimit); + + if ($err = @ldap_errno($link)) { + if ($err == 32) { + // Errorcode 32 = no such object, i.e. a nullresult. + return $obj = new Net_LDAP2_Search ($search, $this, $attributes); + } elseif ($err == 4) { + // Errorcode 4 = sizelimit exeeded. + return $obj = new Net_LDAP2_Search ($search, $this, $attributes); + } elseif ($err == 87) { + // bad search filter + return $this->raiseError($this->errorMessage($err) . "($filter)", $err); + } elseif (($err == 1) && ($this->_config['auto_reconnect'])) { + // Errorcode 1 = LDAP_OPERATIONS_ERROR but we can try a reconnect. + $this->_link = false; + $this->performReconnect(); + } else { + $msg = "\nParameters:\nBase: $base\nFilter: $filter\nScope: $scope"; + return $this->raiseError($this->errorMessage($err) . $msg, $err); + } + } else { + return $obj = new Net_LDAP2_Search($search, $this, $attributes); + } + } + } + + /** + * Set an LDAP option + * + * @param string $option Option to set + * @param mixed $value Value to set Option to + * + * @access public + * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true + */ + public function setOption($option, $value) + { + if ($this->_link) { + if (defined($option)) { + if (@ldap_set_option($this->_link, constant($option), $value)) { + return true; + } else { + $err = @ldap_errno($this->_link); + if ($err) { + $msg = @ldap_err2str($err); + } else { + $err = NET_LDAP2_ERROR; + $msg = $this->errorMessage($err); + } + return $this->raiseError($msg, $err); + } + } else { + return $this->raiseError("Unkown Option requested"); + } + } else { + return $this->raiseError("Could not set LDAP option: No LDAP connection"); + } + } + + /** + * Get an LDAP option value + * + * @param string $option Option to get + * + * @access public + * @return Net_LDAP2_Error|string Net_LDAP2_Error or option value + */ + public function getOption($option) + { + if ($this->_link) { + if (defined($option)) { + if (@ldap_get_option($this->_link, constant($option), $value)) { + return $value; + } else { + $err = @ldap_errno($this->_link); + if ($err) { + $msg = @ldap_err2str($err); + } else { + $err = NET_LDAP2_ERROR; + $msg = $this->errorMessage($err); + } + return $this->raiseError($msg, $err); + } + } else { + $this->raiseError("Unkown Option requested"); + } + } else { + $this->raiseError("No LDAP connection"); + } + } + + /** + * Get the LDAP_PROTOCOL_VERSION that is used on the connection. + * + * A lot of ldap functionality is defined by what protocol version the ldap server speaks. + * This might be 2 or 3. + * + * @return int + */ + public function getLDAPVersion() + { + if ($this->_link) { + $version = $this->getOption("LDAP_OPT_PROTOCOL_VERSION"); + } else { + $version = $this->_config['version']; + } + return $version; + } + + /** + * Set the LDAP_PROTOCOL_VERSION that is used on the connection. + * + * @param int $version LDAP-version that should be used + * @param boolean $force If set to true, the check against the rootDSE will be skipped + * + * @return Net_LDAP2_Error|true Net_LDAP2_Error object or true + * @todo Checking via the rootDSE takes much time - why? fetching and instanciation is quick! + */ + public function setLDAPVersion($version = 0, $force = false) + { + if (!$version) { + $version = $this->_config['version']; + } + + // + // Check to see if the server supports this version first. + // + // Todo: Why is this so horribly slow? + // $this->rootDse() is very fast, as well as Net_LDAP2_RootDSE::fetch() + // seems like a problem at copiyng the object inside PHP?? + // Additionally, this is not always reproducable... + // + if (!$force) { + $rootDSE = $this->rootDse(); + if ($rootDSE instanceof Net_LDAP2_Error) { + return $rootDSE; + } else { + $supported_versions = $rootDSE->getValue('supportedLDAPVersion'); + if (is_string($supported_versions)) { + $supported_versions = array($supported_versions); + } + $check_ok = in_array($version, $supported_versions); + } + } + + if ($force || $check_ok) { + return $this->setOption("LDAP_OPT_PROTOCOL_VERSION", $version); + } else { + return $this->raiseError("LDAP Server does not support protocol version " . $version); + } + } + + + /** + * Tells if a DN does exist in the directory + * + * @param string|Net_LDAP2_Entry $dn The DN of the object to test + * + * @return boolean|Net_LDAP2_Error + */ + public function dnExists($dn) + { + if (PEAR::isError($dn)) { + return $dn; + } + if ($dn instanceof Net_LDAP2_Entry) { + $dn = $dn->dn(); + } + if (false === is_string($dn)) { + return PEAR::raiseError('Parameter $dn is not a string nor an entry object!'); + } + + // make dn relative to parent + $base = Net_LDAP2_Util::ldap_explode_dn($dn, array('casefold' => 'none', 'reverse' => false, 'onlyvalues' => false)); + if (self::isError($base)) { + return $base; + } + $entry_rdn = array_shift($base); + if (is_array($entry_rdn)) { + // maybe the dn consist of a multivalued RDN, we must build the dn in this case + // because the $entry_rdn is an array! + $filter_dn = Net_LDAP2_Util::canonical_dn($entry_rdn); + } + $base = Net_LDAP2_Util::canonical_dn($base); + + $result = @ldap_list($this->_link, $base, $entry_rdn, array(), 1, 1); + if (@ldap_count_entries($this->_link, $result)) { + return true; + } + if (ldap_errno($this->_link) == 32) { + return false; + } + if (ldap_errno($this->_link) != 0) { + return PEAR::raiseError(ldap_error($this->_link), ldap_errno($this->_link)); + } + return false; + } + + + /** + * Get a specific entry based on the DN + * + * @param string $dn DN of the entry that should be fetched + * @param array $attr Array of Attributes to select. If ommitted, all attributes are fetched. + * + * @return Net_LDAP2_Entry|Net_LDAP2_Error Reference to a Net_LDAP2_Entry object or Net_LDAP2_Error object + * @todo Maybe check against the shema should be done to be sure the attribute type exists + */ + public function &getEntry($dn, $attr = array()) + { + if (!is_array($attr)) { + $attr = array($attr); + } + $result = $this->search($dn, '(objectClass=*)', + array('scope' => 'base', 'attributes' => $attr)); + if (self::isError($result)) { + return $result; + } elseif ($result->count() == 0) { + return PEAR::raiseError('Could not fetch entry '.$dn.': no entry found'); + } + $entry = $result->shiftEntry(); + if (false == $entry) { + return PEAR::raiseError('Could not fetch entry (error retrieving entry from search result)'); + } + return $entry; + } + + /** + * Rename or move an entry + * + * This method will instantly carry out an update() after the move, + * so the entry is moved instantly. + * You can pass an optional Net_LDAP2 object. In this case, a cross directory + * move will be performed which deletes the entry in the source (THIS) directory + * and adds it in the directory $target_ldap. + * A cross directory move will switch the Entrys internal LDAP reference so + * updates to the entry will go to the new directory. + * + * Note that if you want to do a cross directory move, you need to + * pass an Net_LDAP2_Entry object, otherwise the attributes will be empty. + * + * @param string|Net_LDAP2_Entry $entry Entry DN or Entry object + * @param string $newdn New location + * @param Net_LDAP2 $target_ldap (optional) Target directory for cross server move; should be passed via reference + * + * @return Net_LDAP2_Error|true + */ + public function move($entry, $newdn, $target_ldap = null) + { + if (is_string($entry)) { + $entry_o = $this->getEntry($entry); + } else { + $entry_o =& $entry; + } + if (!$entry_o instanceof Net_LDAP2_Entry) { + return PEAR::raiseError('Parameter $entry is expected to be a Net_LDAP2_Entry object! (If DN was passed, conversion failed)'); + } + if (null !== $target_ldap && !$target_ldap instanceof Net_LDAP2) { + return PEAR::raiseError('Parameter $target_ldap is expected to be a Net_LDAP2 object!'); + } + + if ($target_ldap && $target_ldap !== $this) { + // cross directory move + if (is_string($entry)) { + return PEAR::raiseError('Unable to perform cross directory move: operation requires a Net_LDAP2_Entry object'); + } + if ($target_ldap->dnExists($newdn)) { + return PEAR::raiseError('Unable to perform cross directory move: entry does exist in target directory'); + } + $entry_o->dn($newdn); + $res = $target_ldap->add($entry_o); + if (self::isError($res)) { + return PEAR::raiseError('Unable to perform cross directory move: '.$res->getMessage().' in target directory'); + } + $res = $this->delete($entry_o->currentDN()); + if (self::isError($res)) { + $res2 = $target_ldap->delete($entry_o); // undo add + if (self::isError($res2)) { + $add_error_string = 'Additionally, the deletion (undo add) of $entry in target directory failed.'; + } + return PEAR::raiseError('Unable to perform cross directory move: '.$res->getMessage().' in source directory. '.$add_error_string); + } + $entry_o->setLDAP($target_ldap); + return true; + } else { + // local move + $entry_o->dn($newdn); + $entry_o->setLDAP($this); + return $entry_o->update(); + } + } + + /** + * Copy an entry to a new location + * + * The entry will be immediately copied. + * Please note that only attributes you have + * selected will be copied. + * + * @param Net_LDAP2_Entry &$entry Entry object + * @param string $newdn New FQF-DN of the entry + * + * @return Net_LDAP2_Error|Net_LDAP2_Entry Error Message or reference to the copied entry + */ + public function ©(&$entry, $newdn) + { + if (!$entry instanceof Net_LDAP2_Entry) { + return PEAR::raiseError('Parameter $entry is expected to be a Net_LDAP2_Entry object!'); + } + + $newentry = Net_LDAP2_Entry::createFresh($newdn, $entry->getValues()); + $result = $this->add($newentry); + + if ($result instanceof Net_LDAP2_Error) { + return $result; + } else { + return $newentry; + } + } + + + /** + * Returns the string for an ldap errorcode. + * + * Made to be able to make better errorhandling + * Function based on DB::errorMessage() + * Tip: The best description of the errorcodes is found here: + * http://www.directory-info.com/LDAP2/LDAPErrorCodes.html + * + * @param int $errorcode Error code + * + * @return string The errorstring for the error. + */ + public function errorMessage($errorcode) + { + $errorMessages = array( + 0x00 => "LDAP_SUCCESS", + 0x01 => "LDAP_OPERATIONS_ERROR", + 0x02 => "LDAP_PROTOCOL_ERROR", + 0x03 => "LDAP_TIMELIMIT_EXCEEDED", + 0x04 => "LDAP_SIZELIMIT_EXCEEDED", + 0x05 => "LDAP_COMPARE_FALSE", + 0x06 => "LDAP_COMPARE_TRUE", + 0x07 => "LDAP_AUTH_METHOD_NOT_SUPPORTED", + 0x08 => "LDAP_STRONG_AUTH_REQUIRED", + 0x09 => "LDAP_PARTIAL_RESULTS", + 0x0a => "LDAP_REFERRAL", + 0x0b => "LDAP_ADMINLIMIT_EXCEEDED", + 0x0c => "LDAP_UNAVAILABLE_CRITICAL_EXTENSION", + 0x0d => "LDAP_CONFIDENTIALITY_REQUIRED", + 0x0e => "LDAP_SASL_BIND_INPROGRESS", + 0x10 => "LDAP_NO_SUCH_ATTRIBUTE", + 0x11 => "LDAP_UNDEFINED_TYPE", + 0x12 => "LDAP_INAPPROPRIATE_MATCHING", + 0x13 => "LDAP_CONSTRAINT_VIOLATION", + 0x14 => "LDAP_TYPE_OR_VALUE_EXISTS", + 0x15 => "LDAP_INVALID_SYNTAX", + 0x20 => "LDAP_NO_SUCH_OBJECT", + 0x21 => "LDAP_ALIAS_PROBLEM", + 0x22 => "LDAP_INVALID_DN_SYNTAX", + 0x23 => "LDAP_IS_LEAF", + 0x24 => "LDAP_ALIAS_DEREF_PROBLEM", + 0x30 => "LDAP_INAPPROPRIATE_AUTH", + 0x31 => "LDAP_INVALID_CREDENTIALS", + 0x32 => "LDAP_INSUFFICIENT_ACCESS", + 0x33 => "LDAP_BUSY", + 0x34 => "LDAP_UNAVAILABLE", + 0x35 => "LDAP_UNWILLING_TO_PERFORM", + 0x36 => "LDAP_LOOP_DETECT", + 0x3C => "LDAP_SORT_CONTROL_MISSING", + 0x3D => "LDAP_INDEX_RANGE_ERROR", + 0x40 => "LDAP_NAMING_VIOLATION", + 0x41 => "LDAP_OBJECT_CLASS_VIOLATION", + 0x42 => "LDAP_NOT_ALLOWED_ON_NONLEAF", + 0x43 => "LDAP_NOT_ALLOWED_ON_RDN", + 0x44 => "LDAP_ALREADY_EXISTS", + 0x45 => "LDAP_NO_OBJECT_CLASS_MODS", + 0x46 => "LDAP_RESULTS_TOO_LARGE", + 0x47 => "LDAP_AFFECTS_MULTIPLE_DSAS", + 0x50 => "LDAP_OTHER", + 0x51 => "LDAP_SERVER_DOWN", + 0x52 => "LDAP_LOCAL_ERROR", + 0x53 => "LDAP_ENCODING_ERROR", + 0x54 => "LDAP_DECODING_ERROR", + 0x55 => "LDAP_TIMEOUT", + 0x56 => "LDAP_AUTH_UNKNOWN", + 0x57 => "LDAP_FILTER_ERROR", + 0x58 => "LDAP_USER_CANCELLED", + 0x59 => "LDAP_PARAM_ERROR", + 0x5a => "LDAP_NO_MEMORY", + 0x5b => "LDAP_CONNECT_ERROR", + 0x5c => "LDAP_NOT_SUPPORTED", + 0x5d => "LDAP_CONTROL_NOT_FOUND", + 0x5e => "LDAP_NO_RESULTS_RETURNED", + 0x5f => "LDAP_MORE_RESULTS_TO_RETURN", + 0x60 => "LDAP_CLIENT_LOOP", + 0x61 => "LDAP_REFERRAL_LIMIT_EXCEEDED", + 1000 => "Unknown Net_LDAP2 Error" + ); + + return isset($errorMessages[$errorcode]) ? + $errorMessages[$errorcode] : + $errorMessages[NET_LDAP2_ERROR] . ' (' . $errorcode . ')'; + } + + /** + * Gets a rootDSE object + * + * This either fetches a fresh rootDSE object or returns it from + * the internal cache for performance reasons, if possible. + * + * @param array $attrs Array of attributes to search for + * + * @access public + * @return Net_LDAP2_Error|Net_LDAP2_RootDSE Net_LDAP2_Error or Net_LDAP2_RootDSE object + */ + public function &rootDse($attrs = null) + { + if ($attrs !== null && !is_array($attrs)) { + return PEAR::raiseError('Parameter $attr is expected to be an array!'); + } + + $attrs_signature = serialize($attrs); + + // see if we need to fetch a fresh object, or if we already + // requested this object with the same attributes + if (true || !array_key_exists($attrs_signature, $this->_rootDSE_cache)) { + $rootdse =& Net_LDAP2_RootDSE::fetch($this, $attrs); + if ($rootdse instanceof Net_LDAP2_Error) { + return $rootdse; + } + + // search was ok, store rootDSE in cache + $this->_rootDSE_cache[$attrs_signature] = $rootdse; + } + return $this->_rootDSE_cache[$attrs_signature]; + } + + /** + * Alias function of rootDse() for perl-ldap interface + * + * @access public + * @see rootDse() + * @return Net_LDAP2_Error|Net_LDAP2_RootDSE + */ + public function &root_dse() + { + $args = func_get_args(); + return call_user_func_array(array(&$this, 'rootDse'), $args); + } + + /** + * Get a schema object + * + * @param string $dn (optional) Subschema entry dn + * + * @access public + * @return Net_LDAP2_Schema|Net_LDAP2_Error Net_LDAP2_Schema or Net_LDAP2_Error object + */ + public function &schema($dn = null) + { + // Schema caching by Knut-Olav Hoven + // If a schema caching object is registered, we use that to fetch + // a schema object. + // See registerSchemaCache() for more info on this. + if ($this->_schema === null) { + if ($this->_schema_cache) { + $cached_schema = $this->_schema_cache->loadSchema(); + if ($cached_schema instanceof Net_LDAP2_Error) { + return $cached_schema; // route error to client + } else { + if ($cached_schema instanceof Net_LDAP2_Schema) { + $this->_schema = $cached_schema; + } + } + } + } + + // Fetch schema, if not tried before and no cached version available. + // If we are already fetching the schema, we will skip fetching. + if ($this->_schema === null) { + // store a temporary error message so subsequent calls to schema() can + // detect, that we are fetching the schema already. + // Otherwise we will get an infinite loop at Net_LDAP2_Schema::fetch() + $this->_schema = new Net_LDAP2_Error('Schema not initialized'); + $this->_schema = Net_LDAP2_Schema::fetch($this, $dn); + + // If schema caching is active, advise the cache to store the schema + if ($this->_schema_cache) { + $caching_result = $this->_schema_cache->storeSchema($this->_schema); + if ($caching_result instanceof Net_LDAP2_Error) { + return $caching_result; // route error to client + } + } + } + return $this->_schema; + } + + /** + * Enable/disable persistent schema caching + * + * Sometimes it might be useful to allow your scripts to cache + * the schema information on disk, so the schema is not fetched + * every time the script runs which could make your scripts run + * faster. + * + * This method allows you to register a custom object that + * implements your schema cache. Please see the SchemaCache interface + * (SchemaCache.interface.php) for informations on how to implement this. + * To unregister the cache, pass null as $cache parameter. + * + * For ease of use, Net_LDAP2 provides a simple file based cache + * which is used in the example below. You may use this, for example, + * to store the schema in a linux tmpfs which results in the schema + * beeing cached inside the RAM which allows nearly instant access. + * + * // Create the simple file cache object that comes along with Net_LDAP2 + * $mySchemaCache_cfg = array( + * 'path' => '/tmp/Net_LDAP2_Schema.cache', + * 'max_age' => 86400 // max age is 24 hours (in seconds) + * ); + * $mySchemaCache = new Net_LDAP2_SimpleFileSchemaCache($mySchemaCache_cfg); + * $ldap = new Net_LDAP2::connect(...); + * $ldap->registerSchemaCache($mySchemaCache); // enable caching + * // now each call to $ldap->schema() will get the schema from disk! + * + * + * @param Net_LDAP2_SchemaCache|null $cache Object implementing the Net_LDAP2_SchemaCache interface + * + * @return true|Net_LDAP2_Error + */ + public function registerSchemaCache($cache) { + if (is_null($cache) + || (is_object($cache) && in_array('Net_LDAP2_SchemaCache', class_implements($cache))) ) { + $this->_schema_cache = $cache; + return true; + } else { + return new Net_LDAP2_Error('Custom schema caching object is either no '. + 'valid object or does not implement the Net_LDAP2_SchemaCache interface!'); + } + } + + + /** + * Checks if phps ldap-extension is loaded + * + * If it is not loaded, it tries to load it manually using PHPs dl(). + * It knows both windows-dll and *nix-so. + * + * @static + * @return Net_LDAP2_Error|true + */ + public static function checkLDAPExtension() + { + if (!extension_loaded('ldap') && !@dl('ldap.' . PHP_SHLIB_SUFFIX)) { + return new Net_LDAP2_Error("It seems that you do not have the ldap-extension installed. Please install it before using the Net_LDAP2 package."); + } else { + return true; + } + } + + /** + * Encodes given attributes to UTF8 if needed by schema + * + * This function takes attributes in an array and then checks against the schema if they need + * UTF8 encoding. If that is so, they will be encoded. An encoded array will be returned and + * can be used for adding or modifying. + * + * $attributes is expected to be an array with keys describing + * the attribute names and the values as the value of this attribute: + * $attributes = array('cn' => 'foo', 'attr2' => array('mv1', 'mv2')); + * + * @param array $attributes Array of attributes + * + * @access public + * @return array|Net_LDAP2_Error Array of UTF8 encoded attributes or Error + */ + public function utf8Encode($attributes) + { + return $this->utf8($attributes, 'utf8_encode'); + } + + /** + * Decodes the given attribute values if needed by schema + * + * $attributes is expected to be an array with keys describing + * the attribute names and the values as the value of this attribute: + * $attributes = array('cn' => 'foo', 'attr2' => array('mv1', 'mv2')); + * + * @param array $attributes Array of attributes + * + * @access public + * @see utf8Encode() + * @return array|Net_LDAP2_Error Array with decoded attribute values or Error + */ + public function utf8Decode($attributes) + { + return $this->utf8($attributes, 'utf8_decode'); + } + + /** + * Encodes or decodes attribute values if needed + * + * @param array $attributes Array of attributes + * @param array $function Function to apply to attribute values + * + * @access protected + * @return array|Net_LDAP2_Error Array of attributes with function applied to values or Error + */ + protected function utf8($attributes, $function) + { + if (!is_array($attributes) || array_key_exists(0, $attributes)) { + return PEAR::raiseError('Parameter $attributes is expected to be an associative array'); + } + + if (!$this->_schema) { + $this->_schema = $this->schema(); + } + + if (!$this->_link || self::isError($this->_schema) || !function_exists($function)) { + return $attributes; + } + + if (is_array($attributes) && count($attributes) > 0) { + + foreach ($attributes as $k => $v) { + + if (!isset($this->_schemaAttrs[$k])) { + + $attr = $this->_schema->get('attribute', $k); + if (self::isError($attr)) { + continue; + } + + if (false !== strpos($attr['syntax'], '1.3.6.1.4.1.1466.115.121.1.15')) { + $encode = true; + } else { + $encode = false; + } + $this->_schemaAttrs[$k] = $encode; + + } else { + $encode = $this->_schemaAttrs[$k]; + } + + if ($encode) { + if (is_array($v)) { + foreach ($v as $ak => $av) { + $v[$ak] = call_user_func($function, $av); + } + } else { + $v = call_user_func($function, $v); + } + } + $attributes[$k] = $v; + } + } + return $attributes; + } + + /** + * Get the LDAP link resource. It will loop attempting to + * re-establish the connection if the connection attempt fails and + * auto_reconnect has been turned on (see the _config array documentation). + * + * @access public + * @return resource LDAP link + */ + public function &getLink() + { + if ($this->_config['auto_reconnect']) { + while (true) { + // + // Return the link handle if we are already connected. Otherwise + // try to reconnect. + // + if ($this->_link !== false) { + return $this->_link; + } else { + $this->performReconnect(); + } + } + } + return $this->_link; + } +} + +/** +* Net_LDAP2_Error implements a class for reporting portable LDAP error messages. +* +* @category Net +* @package Net_LDAP2 +* @author Tarjej Huse +* @license http://www.gnu.org/copyleft/lesser.html LGPL +* @link http://pear.php.net/package/Net_LDAP22/ +*/ +class Net_LDAP2_Error extends PEAR_Error +{ + /** + * Net_LDAP2_Error constructor. + * + * @param string $message String with error message. + * @param integer $code Net_LDAP2 error code + * @param integer $mode what "error mode" to operate in + * @param mixed $level what error level to use for $mode & PEAR_ERROR_TRIGGER + * @param mixed $debuginfo additional debug info, such as the last query + * + * @access public + * @see PEAR_Error + */ + public function __construct($message = 'Net_LDAP2_Error', $code = NET_LDAP2_ERROR, $mode = PEAR_ERROR_RETURN, + $level = E_USER_NOTICE, $debuginfo = null) + { + if (is_int($code)) { + $this->PEAR_Error($message . ': ' . Net_LDAP2::errorMessage($code), $code, $mode, $level, $debuginfo); + } else { + $this->PEAR_Error("$message: $code", NET_LDAP2_ERROR, $mode, $level, $debuginfo); + } + } +} + +?> diff --git a/plugins/LdapCommon/extlib/Net/LDAP2/Entry.php b/plugins/LdapCommon/extlib/Net/LDAP2/Entry.php new file mode 100644 index 000000000..66de96678 --- /dev/null +++ b/plugins/LdapCommon/extlib/Net/LDAP2/Entry.php @@ -0,0 +1,1055 @@ + +* @author Tarjej Huse +* @author Benedikt Hallinger +* @copyright 2009 Tarjej Huse, Jan Wagner, Benedikt Hallinger +* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 +* @version SVN: $Id: Entry.php 286787 2009-08-04 06:03:12Z beni $ +* @link http://pear.php.net/package/Net_LDAP2/ +*/ + +/** +* Includes +*/ +require_once 'PEAR.php'; +require_once 'Util.php'; + +/** +* Object representation of a directory entry +* +* This class represents a directory entry. You can add, delete, replace +* attributes and their values, rename the entry, delete the entry. +* +* @category Net +* @package Net_LDAP2 +* @author Jan Wagner +* @author Tarjej Huse +* @author Benedikt Hallinger +* @license http://www.gnu.org/copyleft/lesser.html LGPL +* @link http://pear.php.net/package/Net_LDAP2/ +*/ +class Net_LDAP2_Entry extends PEAR +{ + /** + * Entry ressource identifier + * + * @access protected + * @var ressource + */ + protected $_entry = null; + + /** + * LDAP ressource identifier + * + * @access protected + * @var ressource + */ + protected $_link = null; + + /** + * Net_LDAP2 object + * + * This object will be used for updating and schema checking + * + * @access protected + * @var object Net_LDAP2 + */ + protected $_ldap = null; + + /** + * Distinguished name of the entry + * + * @access protected + * @var string + */ + protected $_dn = null; + + /** + * Attributes + * + * @access protected + * @var array + */ + protected $_attributes = array(); + + /** + * Original attributes before any modification + * + * @access protected + * @var array + */ + protected $_original = array(); + + + /** + * Map of attribute names + * + * @access protected + * @var array + */ + protected $_map = array(); + + + /** + * Is this a new entry? + * + * @access protected + * @var boolean + */ + protected $_new = true; + + /** + * New distinguished name + * + * @access protected + * @var string + */ + protected $_newdn = null; + + /** + * Shall the entry be deleted? + * + * @access protected + * @var boolean + */ + protected $_delete = false; + + /** + * Map with changes to the entry + * + * @access protected + * @var array + */ + protected $_changes = array("add" => array(), + "delete" => array(), + "replace" => array() + ); + /** + * Internal Constructor + * + * Constructor of the entry. Sets up the distinguished name and the entries + * attributes. + * You should not call this method manually! Use {@link Net_LDAP2_Entry::createFresh()} + * or {@link Net_LDAP2_Entry::createConnected()} instead! + * + * @param Net_LDAP2|ressource|array &$ldap Net_LDAP2 object, ldap-link ressource or array of attributes + * @param string|ressource $entry Either a DN or a LDAP-Entry ressource + * + * @access protected + * @return none + */ + protected function __construct(&$ldap, $entry = null) + { + $this->PEAR('Net_LDAP2_Error'); + + // set up entry resource or DN + if (is_resource($entry)) { + $this->_entry = &$entry; + } else { + $this->_dn = $entry; + } + + // set up LDAP link + if ($ldap instanceof Net_LDAP2) { + $this->_ldap = &$ldap; + $this->_link = $ldap->getLink(); + } elseif (is_resource($ldap)) { + $this->_link = $ldap; + } elseif (is_array($ldap)) { + // Special case: here $ldap is an array of attributes, + // this means, we have no link. This is a "virtual" entry. + // We just set up the attributes so one can work with the object + // as expected, but an update() fails unless setLDAP() is called. + $this->setAttributes($ldap); + } + + // if this is an entry existing in the directory, + // then set up as old and fetch attrs + if (is_resource($this->_entry) && is_resource($this->_link)) { + $this->_new = false; + $this->_dn = @ldap_get_dn($this->_link, $this->_entry); + $this->setAttributes(); // fetch attributes from server + } + } + + /** + * Creates a fresh entry that may be added to the directory later on + * + * Use this method, if you want to initialize a fresh entry. + * + * The method should be called statically: $entry = Net_LDAP2_Entry::createFresh(); + * You should put a 'objectClass' attribute into the $attrs so the directory server + * knows which object you want to create. However, you may omit this in case you + * don't want to add this entry to a directory server. + * + * The attributes parameter is as following: + * + * $attrs = array( 'attribute1' => array('value1', 'value2'), + * 'attribute2' => 'single value' + * ); + * + * + * @param string $dn DN of the Entry + * @param array $attrs Attributes of the entry + * + * @static + * @return Net_LDAP2_Entry|Net_LDAP2_Error + */ + public static function createFresh($dn, $attrs = array()) + { + if (!is_array($attrs)) { + return PEAR::raiseError("Unable to create fresh entry: Parameter \$attrs needs to be an array!"); + } + + $entry = new Net_LDAP2_Entry($attrs, $dn); + return $entry; + } + + /** + * Creates a Net_LDAP2_Entry object out of an ldap entry resource + * + * Use this method, if you want to initialize an entry object that is + * already present in some directory and that you have read manually. + * + * Please note, that if you want to create an entry object that represents + * some already existing entry, you should use {@link createExisting()}. + * + * The method should be called statically: $entry = Net_LDAP2_Entry::createConnected(); + * + * @param Net_LDAP2 $ldap Net_LDA2 object + * @param resource $entry PHP LDAP entry resource + * + * @static + * @return Net_LDAP2_Entry|Net_LDAP2_Error + */ + public static function createConnected($ldap, $entry) + { + if (!$ldap instanceof Net_LDAP2) { + return PEAR::raiseError("Unable to create connected entry: Parameter \$ldap needs to be a Net_LDAP2 object!"); + } + if (!is_resource($entry)) { + return PEAR::raiseError("Unable to create connected entry: Parameter \$entry needs to be a ldap entry resource!"); + } + + $entry = new Net_LDAP2_Entry($ldap, $entry); + return $entry; + } + + /** + * Creates an Net_LDAP2_Entry object that is considered already existing + * + * Use this method, if you want to modify an already existing entry + * without fetching it first. + * In most cases however, it is better to fetch the entry via Net_LDAP2->getEntry()! + * + * Please note that you should take care if you construct entries manually with this + * because you may get weird synchronisation problems. + * The attributes and values as well as the entry itself are considered existent + * which may produce errors if you try to modify an entry which doesn't really exist + * or if you try to overwrite some attribute with an value already present. + * + * This method is equal to calling createFresh() and after that markAsNew(FALSE). + * + * The method should be called statically: $entry = Net_LDAP2_Entry::createExisting(); + * + * The attributes parameter is as following: + * + * $attrs = array( 'attribute1' => array('value1', 'value2'), + * 'attribute2' => 'single value' + * ); + * + * + * @param string $dn DN of the Entry + * @param array $attrs Attributes of the entry + * + * @static + * @return Net_LDAP2_Entry|Net_LDAP2_Error + */ + public static function createExisting($dn, $attrs = array()) + { + if (!is_array($attrs)) { + return PEAR::raiseError("Unable to create entry object: Parameter \$attrs needs to be an array!"); + } + + $entry = Net_LDAP2_Entry::createFresh($dn, $attrs); + if ($entry instanceof Net_LDAP2_Error) { + return $entry; + } else { + $entry->markAsNew(false); + return $entry; + } + } + + /** + * Get or set the distinguished name of the entry + * + * If called without an argument the current (or the new DN if set) DN gets returned. + * If you provide an DN, this entry is moved to the new location specified if a DN existed. + * If the DN was not set, the DN gets initialized. Call {@link update()} to actually create + * the new Entry in the directory. + * To fetch the current active DN after setting a new DN but before an update(), you can use + * {@link currentDN()} to retrieve the DN that is currently active. + * + * Please note that special characters (eg german umlauts) should be encoded using utf8_encode(). + * You may use {@link Net_LDAP2_Util::canonical_dn()} for properly encoding of the DN. + * + * @param string $dn New distinguished name + * + * @access public + * @return string|true Distinguished name (or true if a new DN was provided) + */ + public function dn($dn = null) + { + if (false == is_null($dn)) { + if (is_null($this->_dn)) { + $this->_dn = $dn; + } else { + $this->_newdn = $dn; + } + return true; + } + return (isset($this->_newdn) ? $this->_newdn : $this->currentDN()); + } + + /** + * Renames or moves the entry + * + * This is just a convinience alias to {@link dn()} + * to make your code more meaningful. + * + * @param string $newdn The new DN + * + * @return true + */ + public function move($newdn) + { + return $this->dn($newdn); + } + + /** + * Sets the internal attributes array + * + * This fetches the values for the attributes from the server. + * The attribute Syntax will be checked so binary attributes will be returned + * as binary values. + * + * Attributes may be passed directly via the $attributes parameter to setup this + * entry manually. This overrides attribute fetching from the server. + * + * @param array $attributes Attributes to set for this entry + * + * @access protected + * @return void + */ + protected function setAttributes($attributes = null) + { + /* + * fetch attributes from the server + */ + if (is_null($attributes) && is_resource($this->_entry) && is_resource($this->_link)) { + // fetch schema + if ($this->_ldap instanceof Net_LDAP2) { + $schema =& $this->_ldap->schema(); + } + // fetch attributes + $attributes = array(); + do { + if (empty($attr)) { + $ber = null; + $attr = @ldap_first_attribute($this->_link, $this->_entry, $ber); + } else { + $attr = @ldap_next_attribute($this->_link, $this->_entry, $ber); + } + if ($attr) { + $func = 'ldap_get_values'; // standard function to fetch value + + // Try to get binary values as binary data + if ($schema instanceof Net_LDAP2_Schema) { + if ($schema->isBinary($attr)) { + $func = 'ldap_get_values_len'; + } + } + // fetch attribute value (needs error checking?) + $attributes[$attr] = $func($this->_link, $this->_entry, $attr); + } + } while ($attr); + } + + /* + * set attribute data directly, if passed + */ + if (is_array($attributes) && count($attributes) > 0) { + if (isset($attributes["count"]) && is_numeric($attributes["count"])) { + unset($attributes["count"]); + } + foreach ($attributes as $k => $v) { + // attribute names should not be numeric + if (is_numeric($k)) { + continue; + } + // map generic attribute name to real one + $this->_map[strtolower($k)] = $k; + // attribute values should be in an array + if (false == is_array($v)) { + $v = array($v); + } + // remove the value count (comes from ldap server) + if (isset($v["count"])) { + unset($v["count"]); + } + $this->_attributes[$k] = $v; + } + } + + // save a copy for later use + $this->_original = $this->_attributes; + } + + /** + * Get the values of all attributes in a hash + * + * The returned hash has the form + * array('attributename' => 'single value', + * 'attributename' => array('value1', value2', value3')) + * + * @access public + * @return array Hash of all attributes with their values + */ + public function getValues() + { + $attrs = array(); + foreach ($this->_attributes as $attr => $value) { + $attrs[$attr] = $this->getValue($attr); + } + return $attrs; + } + + /** + * Get the value of a specific attribute + * + * The first parameter is the name of the attribute + * The second parameter influences the way the value is returned: + * 'single': only the first value is returned as string + * 'all': all values including the value count are returned in an + * array + * 'default': in all other cases an attribute value with a single value is + * returned as string, if it has multiple values it is returned + * as an array (without value count) + * + * @param string $attr Attribute name + * @param string $option Option + * + * @access public + * @return string|array|PEAR_Error string, array or PEAR_Error + */ + public function getValue($attr, $option = null) + { + $attr = $this->getAttrName($attr); + + if (false == array_key_exists($attr, $this->_attributes)) { + return PEAR::raiseError("Unknown attribute ($attr) requested"); + } + + $value = $this->_attributes[$attr]; + + if ($option == "single" || (count($value) == 1 && $option != 'all')) { + $value = array_shift($value); + } + + return $value; + } + + /** + * Alias function of getValue for perl-ldap interface + * + * @see getValue() + * @return string|array|PEAR_Error + */ + public function get_value() + { + $args = func_get_args(); + return call_user_func_array(array( &$this, 'getValue' ), $args); + } + + /** + * Returns an array of attributes names + * + * @access public + * @return array Array of attribute names + */ + public function attributes() + { + return array_keys($this->_attributes); + } + + /** + * Returns whether an attribute exists or not + * + * @param string $attr Attribute name + * + * @access public + * @return boolean + */ + public function exists($attr) + { + $attr = $this->getAttrName($attr); + return array_key_exists($attr, $this->_attributes); + } + + /** + * Adds a new attribute or a new value to an existing attribute + * + * The paramter has to be an array of the form: + * array('attributename' => 'single value', + * 'attributename' => array('value1', 'value2)) + * When the attribute already exists the values will be added, else the + * attribute will be created. These changes are local to the entry and do + * not affect the entry on the server until update() is called. + * + * Note, that you can add values of attributes that you haven't selected, but if + * you do so, {@link getValue()} and {@link getValues()} will only return the + * values you added, _NOT_ all values present on the server. To avoid this, just refetch + * the entry after calling {@link update()} or select the attribute. + * + * @param array $attr Attributes to add + * + * @access public + * @return true|Net_LDAP2_Error + */ + public function add($attr = array()) + { + if (false == is_array($attr)) { + return PEAR::raiseError("Parameter must be an array"); + } + foreach ($attr as $k => $v) { + $k = $this->getAttrName($k); + if (false == is_array($v)) { + // Do not add empty values + if ($v == null) { + continue; + } else { + $v = array($v); + } + } + // add new values to existing attribute or add new attribute + if ($this->exists($k)) { + $this->_attributes[$k] = array_unique(array_merge($this->_attributes[$k], $v)); + } else { + $this->_map[strtolower($k)] = $k; + $this->_attributes[$k] = $v; + } + // save changes for update() + if (empty($this->_changes["add"][$k])) { + $this->_changes["add"][$k] = array(); + } + $this->_changes["add"][$k] = array_unique(array_merge($this->_changes["add"][$k], $v)); + } + $return = true; + return $return; + } + + /** + * Deletes an whole attribute or a value or the whole entry + * + * The parameter can be one of the following: + * + * "attributename" - The attribute as a whole will be deleted + * array("attributename1", "attributename2) - All given attributes will be + * deleted + * array("attributename" => "value") - The value will be deleted + * array("attributename" => array("value1", "value2") - The given values + * will be deleted + * If $attr is null or omitted , then the whole Entry will be deleted! + * + * These changes are local to the entry and do + * not affect the entry on the server until {@link update()} is called. + * + * Please note that you must select the attribute (at $ldap->search() for example) + * to be able to delete values of it, Otherwise {@link update()} will silently fail + * and remove nothing. + * + * @param string|array $attr Attributes to delete (NULL or missing to delete whole entry) + * + * @access public + * @return true + */ + public function delete($attr = null) + { + if (is_null($attr)) { + $this->_delete = true; + return true; + } + if (is_string($attr)) { + $attr = array($attr); + } + // Make the assumption that attribute names cannot be numeric, + // therefore this has to be a simple list of attribute names to delete + if (is_numeric(key($attr))) { + foreach ($attr as $name) { + if (is_array($name)) { + // someone mixed modes (list mode but specific values given!) + $del_attr_name = array_search($name, $attr); + $this->delete(array($del_attr_name => $name)); + } else { + // mark for update() if this attr was not marked before + $name = $this->getAttrName($name); + if ($this->exists($name)) { + $this->_changes["delete"][$name] = null; + unset($this->_attributes[$name]); + } + } + } + } else { + // Here we have a hash with "attributename" => "value to delete" + foreach ($attr as $name => $values) { + if (is_int($name)) { + // someone mixed modes and gave us just an attribute name + $this->delete($values); + } else { + // mark for update() if this attr was not marked before; + // this time it must consider the selected values also + $name = $this->getAttrName($name); + if ($this->exists($name)) { + if (false == is_array($values)) { + $values = array($values); + } + // save values to be deleted + if (empty($this->_changes["delete"][$name])) { + $this->_changes["delete"][$name] = array(); + } + $this->_changes["delete"][$name] = + array_unique(array_merge($this->_changes["delete"][$name], $values)); + foreach ($values as $value) { + // find the key for the value that should be deleted + $key = array_search($value, $this->_attributes[$name]); + if (false !== $key) { + // delete the value + unset($this->_attributes[$name][$key]); + } + } + } + } + } + } + $return = true; + return $return; + } + + /** + * Replaces attributes or its values + * + * The parameter has to an array of the following form: + * array("attributename" => "single value", + * "attribute2name" => array("value1", "value2"), + * "deleteme1" => null, + * "deleteme2" => "") + * If the attribute does not yet exist it will be added instead (see also $force). + * If the attribue value is null, the attribute will de deleted. + * + * These changes are local to the entry and do + * not affect the entry on the server until {@link update()} is called. + * + * In some cases you are not allowed to read the attributes value (for + * example the ActiveDirectory attribute unicodePwd) but are allowed to + * replace the value. In this case replace() would assume that the attribute + * is not in the directory yet and tries to add it which will result in an + * LDAP_TYPE_OR_VALUE_EXISTS error. + * To force replace mode instead of add, you can set $force to true. + * + * @param array $attr Attributes to replace + * @param bool $force Force replacing mode in case we can't read the attr value but are allowed to replace it + * + * @access public + * @return true|Net_LDAP2_Error + */ + public function replace($attr = array(), $force = false) + { + if (false == is_array($attr)) { + return PEAR::raiseError("Parameter must be an array"); + } + foreach ($attr as $k => $v) { + $k = $this->getAttrName($k); + if (false == is_array($v)) { + // delete attributes with empty values; treat ints as string + if (is_int($v)) { + $v = "$v"; + } + if ($v == null) { + $this->delete($k); + continue; + } else { + $v = array($v); + } + } + // existing attributes will get replaced + if ($this->exists($k) || $force) { + $this->_changes["replace"][$k] = $v; + $this->_attributes[$k] = $v; + } else { + // new ones just get added + $this->add(array($k => $v)); + } + } + $return = true; + return $return; + } + + /** + * Update the entry on the directory server + * + * This will evaluate all changes made so far and send them + * to the directory server. + * Please note, that if you make changes to objectclasses wich + * have mandatory attributes set, update() will currently fail. + * Remove the entry from the server and readd it as new in such cases. + * This also will deal with problems with setting structural object classes. + * + * @param Net_LDAP2 $ldap If passed, a call to setLDAP() is issued prior update, thus switching the LDAP-server. This is for perl-ldap interface compliance + * + * @access public + * @return true|Net_LDAP2_Error + * @todo Entry rename with a DN containing special characters needs testing! + */ + public function update($ldap = null) + { + if ($ldap) { + $msg = $this->setLDAP($ldap); + if (Net_LDAP2::isError($msg)) { + return PEAR::raiseError('You passed an invalid $ldap variable to update()'); + } + } + + // ensure we have a valid LDAP object + $ldap =& $this->getLDAP(); + if (!$ldap instanceof Net_LDAP2) { + return PEAR::raiseError("The entries LDAP object is not valid"); + } + + // Get and check link + $link = $ldap->getLink(); + if (!is_resource($link)) { + return PEAR::raiseError("Could not update entry: internal LDAP link is invalid"); + } + + /* + * Delete the entry + */ + if (true === $this->_delete) { + return $ldap->delete($this); + } + + /* + * New entry + */ + if (true === $this->_new) { + $msg = $ldap->add($this); + if (Net_LDAP2::isError($msg)) { + return $msg; + } + $this->_new = false; + $this->_changes['add'] = array(); + $this->_changes['delete'] = array(); + $this->_changes['replace'] = array(); + $this->_original = $this->_attributes; + + $return = true; + return $return; + } + + /* + * Rename/move entry + */ + if (false == is_null($this->_newdn)) { + if ($ldap->getLDAPVersion() !== 3) { + return PEAR::raiseError("Renaming/Moving an entry is only supported in LDAPv3"); + } + // make dn relative to parent (needed for ldap rename) + $parent = Net_LDAP2_Util::ldap_explode_dn($this->_newdn, array('casefolding' => 'none', 'reverse' => false, 'onlyvalues' => false)); + if (Net_LDAP2::isError($parent)) { + return $parent; + } + $child = array_shift($parent); + // maybe the dn consist of a multivalued RDN, we must build the dn in this case + // because the $child-RDN is an array! + if (is_array($child)) { + $child = Net_LDAP2_Util::canonical_dn($child); + } + $parent = Net_LDAP2_Util::canonical_dn($parent); + + // rename/move + if (false == @ldap_rename($link, $this->_dn, $child, $parent, true)) { + return PEAR::raiseError("Entry not renamed: " . + @ldap_error($link), @ldap_errno($link)); + } + // reflect changes to local copy + $this->_dn = $this->_newdn; + $this->_newdn = null; + } + + /* + * Carry out modifications to the entry + */ + // ADD + foreach ($this->_changes["add"] as $attr => $value) { + // if attribute exists, add new values + if ($this->exists($attr)) { + if (false === @ldap_mod_add($link, $this->dn(), array($attr => $value))) { + return PEAR::raiseError("Could not add new values to attribute $attr: " . + @ldap_error($link), @ldap_errno($link)); + } + } else { + // new attribute + if (false === @ldap_modify($link, $this->dn(), array($attr => $value))) { + return PEAR::raiseError("Could not add new attribute $attr: " . + @ldap_error($link), @ldap_errno($link)); + } + } + // all went well here, I guess + unset($this->_changes["add"][$attr]); + } + + // DELETE + foreach ($this->_changes["delete"] as $attr => $value) { + // In LDAPv3 you need to specify the old values for deleting + if (is_null($value) && $ldap->getLDAPVersion() === 3) { + $value = $this->_original[$attr]; + } + if (false === @ldap_mod_del($link, $this->dn(), array($attr => $value))) { + return PEAR::raiseError("Could not delete attribute $attr: " . + @ldap_error($link), @ldap_errno($link)); + } + unset($this->_changes["delete"][$attr]); + } + + // REPLACE + foreach ($this->_changes["replace"] as $attr => $value) { + if (false === @ldap_modify($link, $this->dn(), array($attr => $value))) { + return PEAR::raiseError("Could not replace attribute $attr values: " . + @ldap_error($link), @ldap_errno($link)); + } + unset($this->_changes["replace"][$attr]); + } + + // all went well, so _original (server) becomes _attributes (local copy) + $this->_original = $this->_attributes; + + $return = true; + return $return; + } + + /** + * Returns the right attribute name + * + * @param string $attr Name of attribute + * + * @access protected + * @return string The right name of the attribute + */ + protected function getAttrName($attr) + { + $name = strtolower($attr); + if (array_key_exists($name, $this->_map)) { + $attr = $this->_map[$name]; + } + return $attr; + } + + /** + * Returns a reference to the LDAP-Object of this entry + * + * @access public + * @return Net_LDAP2|Net_LDAP2_Error Reference to the Net_LDAP2 Object (the connection) or Net_LDAP2_Error + */ + public function &getLDAP() + { + if (!$this->_ldap instanceof Net_LDAP2) { + $err = new PEAR_Error('LDAP is not a valid Net_LDAP2 object'); + return $err; + } else { + return $this->_ldap; + } + } + + /** + * Sets a reference to the LDAP-Object of this entry + * + * After setting a Net_LDAP2 object, calling update() will use that object for + * updating directory contents. Use this to dynamicly switch directorys. + * + * @param Net_LDAP2 &$ldap Net_LDAP2 object that this entry should be connected to + * + * @access public + * @return true|Net_LDAP2_Error + */ + public function setLDAP(&$ldap) + { + if (!$ldap instanceof Net_LDAP2) { + return PEAR::raiseError("LDAP is not a valid Net_LDAP2 object"); + } else { + $this->_ldap =& $ldap; + return true; + } + } + + /** + * Marks the entry as new/existing. + * + * If an Entry is marked as new, it will be added to the directory + * when calling {@link update()}. + * If the entry is marked as old ($mark = false), then the entry is + * assumed to be present in the directory server wich results in + * modification when calling {@link update()}. + * + * @param boolean $mark Value to set, defaults to "true" + * + * @return void + */ + public function markAsNew($mark = true) + { + $this->_new = ($mark)? true : false; + } + + /** + * Applies a regular expression onto a single- or multivalued attribute (like preg_match()) + * + * This method behaves like PHPs preg_match() but with some exceptions. + * If you want to retrieve match information, then you MUST pass the + * $matches parameter via reference! otherwise you will get no matches. + * Since it is possible to have multi valued attributes the $matches + * array will have a additionally numerical dimension (one for each value): + * + * $matches = array( + * 0 => array (usual preg_match() returnarray), + * 1 => array (usual preg_match() returnarray) + * ) + * + * Please note, that $matches will be initialized to an empty array inside. + * + * Usage example: + * + * $result = $entry->preg_match('/089(\d+)/', 'telephoneNumber', &$matches); + * if ( $result === true ){ + * echo "First match: ".$matches[0][1]; // Match of value 1, content of first bracket + * } else { + * if ( Net_LDAP2::isError($result) ) { + * echo "Error: ".$result->getMessage(); + * } else { + * echo "No match found."; + * } + * } + * + * + * Please note that it is important to test for an Net_LDAP2_Error, because objects are + * evaluating to true by default, thus if an error occured, and you only check using "==" then + * you get misleading results. Use the "identical" (===) operator to test for matches to + * avoid this as shown above. + * + * @param string $regex The regular expression + * @param string $attr_name The attribute to search in + * @param array $matches (optional, PASS BY REFERENCE!) Array to store matches in + * + * @return boolean|Net_LDAP2_Error TRUE, if we had a match in one of the values, otherwise false. Net_LDAP2_Error in case something went wrong + */ + public function pregMatch($regex, $attr_name, $matches = array()) + { + $matches = array(); + + // fetch attribute values + $attr = $this->getValue($attr_name, 'all'); + if (Net_LDAP2::isError($attr)) { + return $attr; + } else { + unset($attr['count']); + } + + // perform preg_match() on all values + $match = false; + foreach ($attr as $thisvalue) { + $matches_int = array(); + if (preg_match($regex, $thisvalue, $matches_int)) { + $match = true; + array_push($matches, $matches_int); // store matches in reference + } + } + return $match; + } + + /** + * Alias of {@link pregMatch()} for compatibility to Net_LDAP 1 + * + * @see pregMatch() + * @return boolean|Net_LDAP2_Error + */ + public function preg_match() + { + $args = func_get_args(); + return call_user_func_array(array( &$this, 'pregMatch' ), $args); + } + + /** + * Tells if the entry is consiedered as new (not present in the server) + * + * Please note, that this doesn't tell you if the entry is present on the server. + * Use {@link Net_LDAP2::dnExists()} to see if an entry is already there. + * + * @return boolean + */ + public function isNew() + { + return $this->_new; + } + + + /** + * Is this entry going to be deleted once update() is called? + * + * @return boolean + */ + public function willBeDeleted() + { + return $this->_delete; + } + + /** + * Is this entry going to be moved once update() is called? + * + * @return boolean + */ + public function willBeMoved() + { + return ($this->dn() !== $this->currentDN()); + } + + /** + * Returns always the original DN + * + * If an entry will be moved but {@link update()} was not called, + * {@link dn()} will return the new DN. This method however, returns + * always the current active DN. + * + * @return string + */ + public function currentDN() + { + return $this->_dn; + } + + /** + * Returns the attribute changes to be carried out once update() is called + * + * @return array + */ + public function getChanges() + { + return $this->_changes; + } +} +?> diff --git a/plugins/LdapCommon/extlib/Net/LDAP2/Filter.php b/plugins/LdapCommon/extlib/Net/LDAP2/Filter.php new file mode 100644 index 000000000..0723edab2 --- /dev/null +++ b/plugins/LdapCommon/extlib/Net/LDAP2/Filter.php @@ -0,0 +1,514 @@ + +* @copyright 2009 Benedikt Hallinger +* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 +* @version SVN: $Id: Filter.php 289978 2009-10-27 09:56:41Z beni $ +* @link http://pear.php.net/package/Net_LDAP2/ +*/ + +/** +* Includes +*/ +require_once 'PEAR.php'; +require_once 'Util.php'; + +/** +* Object representation of a part of a LDAP filter. +* +* This Class is not completely compatible to the PERL interface! +* +* The purpose of this class is, that users can easily build LDAP filters +* without having to worry about right escaping etc. +* A Filter is built using several independent filter objects +* which are combined afterwards. This object works in two +* modes, depending how the object is created. +* If the object is created using the {@link create()} method, then this is a leaf-object. +* If the object is created using the {@link combine()} method, then this is a container object. +* +* LDAP filters are defined in RFC-2254 and can be found under +* {@link http://www.ietf.org/rfc/rfc2254.txt} +* +* Here a quick copy&paste example: +* +* $filter0 = Net_LDAP2_Filter::create('stars', 'equals', '***'); +* $filter_not0 = Net_LDAP2_Filter::combine('not', $filter0); +* +* $filter1 = Net_LDAP2_Filter::create('gn', 'begins', 'bar'); +* $filter2 = Net_LDAP2_Filter::create('gn', 'ends', 'baz'); +* $filter_comp = Net_LDAP2_Filter::combine('or',array($filter_not0, $filter1, $filter2)); +* +* echo $filter_comp->asString(); +* // This will output: (|(!(stars=\0x5c0x2a\0x5c0x2a\0x5c0x2a))(gn=bar*)(gn=*baz)) +* // The stars in $filter0 are treaten as real stars unless you disable escaping. +* +* +* @category Net +* @package Net_LDAP2 +* @author Benedikt Hallinger +* @license http://www.gnu.org/copyleft/lesser.html LGPL +* @link http://pear.php.net/package/Net_LDAP2/ +*/ +class Net_LDAP2_Filter extends PEAR +{ + /** + * Storage for combination of filters + * + * This variable holds a array of filter objects + * that should be combined by this filter object. + * + * @access protected + * @var array + */ + protected $_subfilters = array(); + + /** + * Match of this filter + * + * If this is a leaf filter, then a matching rule is stored, + * if it is a container, then it is a logical operator + * + * @access protected + * @var string + */ + protected $_match; + + /** + * Single filter + * + * If we operate in leaf filter mode, + * then the constructing method stores + * the filter representation here + * + * @acces private + * @var string + */ + protected $_filter; + + /** + * Create a new Net_LDAP2_Filter object and parse $filter. + * + * This is for PERL Net::LDAP interface. + * Construction of Net_LDAP2_Filter objects should happen through either + * {@link create()} or {@link combine()} which give you more control. + * However, you may use the perl iterface if you already have generated filters. + * + * @param string $filter LDAP filter string + * + * @see parse() + */ + public function __construct($filter = false) + { + // The optional parameter must remain here, because otherwise create() crashes + if (false !== $filter) { + $filter_o = self::parse($filter); + if (PEAR::isError($filter_o)) { + $this->_filter = $filter_o; // assign error, so asString() can report it + } else { + $this->_filter = $filter_o->asString(); + } + } + } + + /** + * Constructor of a new part of a LDAP filter. + * + * The following matching rules exists: + * - equals: One of the attributes values is exactly $value + * Please note that case sensitiviness is depends on the + * attributes syntax configured in the server. + * - begins: One of the attributes values must begin with $value + * - ends: One of the attributes values must end with $value + * - contains: One of the attributes values must contain $value + * - present | any: The attribute can contain any value but must be existent + * - greater: The attributes value is greater than $value + * - less: The attributes value is less than $value + * - greaterOrEqual: The attributes value is greater or equal than $value + * - lessOrEqual: The attributes value is less or equal than $value + * - approx: One of the attributes values is similar to $value + * + * If $escape is set to true (default) then $value will be escaped + * properly. If it is set to false then $value will be treaten as raw filter value string. + * You should escape yourself using {@link Net_LDAP2_Util::escape_filter_value()}! + * + * Examples: + * + * // This will find entries that contain an attribute "sn" that ends with "foobar": + * $filter = new Net_LDAP2_Filter('sn', 'ends', 'foobar'); + * + * // This will find entries that contain an attribute "sn" that has any value set: + * $filter = new Net_LDAP2_Filter('sn', 'any'); + * + * + * @param string $attr_name Name of the attribute the filter should apply to + * @param string $match Matching rule (equals, begins, ends, contains, greater, less, greaterOrEqual, lessOrEqual, approx, any) + * @param string $value (optional) if given, then this is used as a filter + * @param boolean $escape Should $value be escaped? (default: yes, see {@link Net_LDAP2_Util::escape_filter_value()} for detailed information) + * + * @return Net_LDAP2_Filter|Net_LDAP2_Error + */ + public static function &create($attr_name, $match, $value = '', $escape = true) + { + $leaf_filter = new Net_LDAP2_Filter(); + if ($escape) { + $array = Net_LDAP2_Util::escape_filter_value(array($value)); + $value = $array[0]; + } + switch (strtolower($match)) { + case 'equals': + $leaf_filter->_filter = '(' . $attr_name . '=' . $value . ')'; + break; + case 'begins': + $leaf_filter->_filter = '(' . $attr_name . '=' . $value . '*)'; + break; + case 'ends': + $leaf_filter->_filter = '(' . $attr_name . '=*' . $value . ')'; + break; + case 'contains': + $leaf_filter->_filter = '(' . $attr_name . '=*' . $value . '*)'; + break; + case 'greater': + $leaf_filter->_filter = '(' . $attr_name . '>' . $value . ')'; + break; + case 'less': + $leaf_filter->_filter = '(' . $attr_name . '<' . $value . ')'; + break; + case 'greaterorequal': + case '>=': + $leaf_filter->_filter = '(' . $attr_name . '>=' . $value . ')'; + break; + case 'lessorequal': + case '<=': + $leaf_filter->_filter = '(' . $attr_name . '<=' . $value . ')'; + break; + case 'approx': + case '~=': + $leaf_filter->_filter = '(' . $attr_name . '~=' . $value . ')'; + break; + case 'any': + case 'present': // alias that may improve user code readability + $leaf_filter->_filter = '(' . $attr_name . '=*)'; + break; + default: + return PEAR::raiseError('Net_LDAP2_Filter create error: matching rule "' . $match . '" not known!'); + } + return $leaf_filter; + } + + /** + * Combine two or more filter objects using a logical operator + * + * This static method combines two or more filter objects and returns one single + * filter object that contains all the others. + * Call this method statically: $filter = Net_LDAP2_Filter('or', array($filter1, $filter2)) + * If the array contains filter strings instead of filter objects, we will try to parse them. + * + * @param string $log_op The locicall operator. May be "and", "or", "not" or the subsequent logical equivalents "&", "|", "!" + * @param array|Net_LDAP2_Filter $filters array with Net_LDAP2_Filter objects + * + * @return Net_LDAP2_Filter|Net_LDAP2_Error + * @static + */ + public static function &combine($log_op, $filters) + { + if (PEAR::isError($filters)) { + return $filters; + } + + // substitude named operators to logical operators + if ($log_op == 'and') $log_op = '&'; + if ($log_op == 'or') $log_op = '|'; + if ($log_op == 'not') $log_op = '!'; + + // tests for sane operation + if ($log_op == '!') { + // Not-combination, here we only accept one filter object or filter string + if ($filters instanceof Net_LDAP2_Filter) { + $filters = array($filters); // force array + } elseif (is_string($filters)) { + $filter_o = self::parse($filters); + if (PEAR::isError($filter_o)) { + $err = PEAR::raiseError('Net_LDAP2_Filter combine error: '.$filter_o->getMessage()); + return $err; + } else { + $filters = array($filter_o); + } + } elseif (is_array($filters)) { + $err = PEAR::raiseError('Net_LDAP2_Filter combine error: operator is "not" but $filter is an array!'); + return $err; + } else { + $err = PEAR::raiseError('Net_LDAP2_Filter combine error: operator is "not" but $filter is not a valid Net_LDAP2_Filter nor a filter string!'); + return $err; + } + } elseif ($log_op == '&' || $log_op == '|') { + if (!is_array($filters) || count($filters) < 2) { + $err = PEAR::raiseError('Net_LDAP2_Filter combine error: parameter $filters is not an array or contains less than two Net_LDAP2_Filter objects!'); + return $err; + } + } else { + $err = PEAR::raiseError('Net_LDAP2_Filter combine error: logical operator is not known!'); + return $err; + } + + $combined_filter = new Net_LDAP2_Filter(); + foreach ($filters as $key => $testfilter) { // check for errors + if (PEAR::isError($testfilter)) { + return $testfilter; + } elseif (is_string($testfilter)) { + // string found, try to parse into an filter object + $filter_o = self::parse($testfilter); + if (PEAR::isError($filter_o)) { + return $filter_o; + } else { + $filters[$key] = $filter_o; + } + } elseif (!$testfilter instanceof Net_LDAP2_Filter) { + $err = PEAR::raiseError('Net_LDAP2_Filter combine error: invalid object passed in array $filters!'); + return $err; + } + } + + $combined_filter->_subfilters = $filters; + $combined_filter->_match = $log_op; + return $combined_filter; + } + + /** + * Parse FILTER into a Net_LDAP2_Filter object + * + * This parses an filter string into Net_LDAP2_Filter objects. + * + * @param string $FILTER The filter string + * + * @access static + * @return Net_LDAP2_Filter|Net_LDAP2_Error + * @todo Leaf-mode: Do we need to escape at all? what about *-chars?check for the need of encoding values, tackle problems (see code comments) + */ + public static function parse($FILTER) + { + if (preg_match('/^\((.+?)\)$/', $FILTER, $matches)) { + if (in_array(substr($matches[1], 0, 1), array('!', '|', '&'))) { + // Subfilter processing: pass subfilters to parse() and combine + // the objects using the logical operator detected + // we have now something like "&(...)(...)(...)" but at least one part ("!(...)"). + // Each subfilter could be an arbitary complex subfilter. + + // extract logical operator and filter arguments + $log_op = substr($matches[1], 0, 1); + $remaining_component = substr($matches[1], 1); + + // split $remaining_component into individual subfilters + // we cannot use split() for this, because we do not know the + // complexiness of the subfilter. Thus, we look trough the filter + // string and just recognize ending filters at the first level. + // We record the index number of the char and use that information + // later to split the string. + $sub_index_pos = array(); + $prev_char = ''; // previous character looked at + $level = 0; // denotes the current bracket level we are, + // >1 is too deep, 1 is ok, 0 is outside any + // subcomponent + for ($curpos = 0; $curpos < strlen($remaining_component); $curpos++) { + $cur_char = substr($remaining_component, $curpos, 1); + + // rise/lower bracket level + if ($cur_char == '(' && $prev_char != '\\') { + $level++; + } elseif ($cur_char == ')' && $prev_char != '\\') { + $level--; + } + + if ($cur_char == '(' && $prev_char == ')' && $level == 1) { + array_push($sub_index_pos, $curpos); // mark the position for splitting + } + $prev_char = $cur_char; + } + + // now perform the splits. To get also the last part, we + // need to add the "END" index to the split array + array_push($sub_index_pos, strlen($remaining_component)); + $subfilters = array(); + $oldpos = 0; + foreach ($sub_index_pos as $s_pos) { + $str_part = substr($remaining_component, $oldpos, $s_pos - $oldpos); + array_push($subfilters, $str_part); + $oldpos = $s_pos; + } + + // some error checking... + if (count($subfilters) == 1) { + // only one subfilter found + } elseif (count($subfilters) > 1) { + // several subfilters found + if ($log_op == "!") { + return PEAR::raiseError("Filter parsing error: invalid filter syntax - NOT operator detected but several arguments given!"); + } + } else { + // this should not happen unless the user specified a wrong filter + return PEAR::raiseError("Filter parsing error: invalid filter syntax - got operator '$log_op' but no argument!"); + } + + // Now parse the subfilters into objects and combine them using the operator + $subfilters_o = array(); + foreach ($subfilters as $s_s) { + $o = self::parse($s_s); + if (PEAR::isError($o)) { + return $o; + } else { + array_push($subfilters_o, self::parse($s_s)); + } + } + + $filter_o = self::combine($log_op, $subfilters_o); + return $filter_o; + + } else { + // This is one leaf filter component, do some syntax checks, then escape and build filter_o + // $matches[1] should be now something like "foo=bar" + + // detect multiple leaf components + // [TODO] Maybe this will make problems with filters containing brackets inside the value + if (stristr($matches[1], ')(')) { + return PEAR::raiseError("Filter parsing error: invalid filter syntax - multiple leaf components detected!"); + } else { + $filter_parts = preg_split('/(?|<|>=|<=)/', $matches[1], 2, PREG_SPLIT_DELIM_CAPTURE); + if (count($filter_parts) != 3) { + return PEAR::raiseError("Filter parsing error: invalid filter syntax - unknown matching rule used"); + } else { + $filter_o = new Net_LDAP2_Filter(); + // [TODO]: Do we need to escape at all? what about *-chars user provide and that should remain special? + // I think, those prevent escaping! We need to check against PERL Net::LDAP! + // $value_arr = Net_LDAP2_Util::escape_filter_value(array($filter_parts[2])); + // $value = $value_arr[0]; + $value = $filter_parts[2]; + $filter_o->_filter = '('.$filter_parts[0].$filter_parts[1].$value.')'; + return $filter_o; + } + } + } + } else { + // ERROR: Filter components must be enclosed in round brackets + return PEAR::raiseError("Filter parsing error: invalid filter syntax - filter components must be enclosed in round brackets"); + } + } + + /** + * Get the string representation of this filter + * + * This method runs through all filter objects and creates + * the string representation of the filter. If this + * filter object is a leaf filter, then it will return + * the string representation of this filter. + * + * @return string|Net_LDAP2_Error + */ + public function asString() + { + if ($this->isLeaf()) { + $return = $this->_filter; + } else { + $return = ''; + foreach ($this->_subfilters as $filter) { + $return = $return.$filter->asString(); + } + $return = '(' . $this->_match . $return . ')'; + } + return $return; + } + + /** + * Alias for perl interface as_string() + * + * @see asString() + * @return string|Net_LDAP2_Error + */ + public function as_string() + { + return $this->asString(); + } + + /** + * Print the text representation of the filter to FH, or the currently selected output handle if FH is not given + * + * This method is only for compatibility to the perl interface. + * However, the original method was called "print" but due to PHP language restrictions, + * we can't have a print() method. + * + * @param resource $FH (optional) A filehandle resource + * + * @return true|Net_LDAP2_Error + */ + public function printMe($FH = false) + { + if (!is_resource($FH)) { + if (PEAR::isError($FH)) { + return $FH; + } + $filter_str = $this->asString(); + if (PEAR::isError($filter_str)) { + return $filter_str; + } else { + print($filter_str); + } + } else { + $filter_str = $this->asString(); + if (PEAR::isError($filter_str)) { + return $filter_str; + } else { + $res = @fwrite($FH, $this->asString()); + if ($res == false) { + return PEAR::raiseError("Unable to write filter string to filehandle \$FH!"); + } + } + } + return true; + } + + /** + * This can be used to escape a string to provide a valid LDAP-Filter. + * + * LDAP will only recognise certain characters as the + * character istself if they are properly escaped. This is + * what this method does. + * The method can be called statically, so you can use it outside + * for your own purposes (eg for escaping only parts of strings) + * + * In fact, this is just a shorthand to {@link Net_LDAP2_Util::escape_filter_value()}. + * For upward compatibiliy reasons you are strongly encouraged to use the escape + * methods provided by the Net_LDAP2_Util class. + * + * @param string $value Any string who should be escaped + * + * @static + * @return string The string $string, but escaped + * @deprecated Do not use this method anymore, instead use Net_LDAP2_Util::escape_filter_value() directly + */ + public static function escape($value) + { + $return = Net_LDAP2_Util::escape_filter_value(array($value)); + return $return[0]; + } + + /** + * Is this a container or a leaf filter object? + * + * @access protected + * @return boolean + */ + protected function isLeaf() + { + if (count($this->_subfilters) > 0) { + return false; // Container! + } else { + return true; // Leaf! + } + } +} +?> diff --git a/plugins/LdapCommon/extlib/Net/LDAP2/LDIF.php b/plugins/LdapCommon/extlib/Net/LDAP2/LDIF.php new file mode 100644 index 000000000..34f3e75dd --- /dev/null +++ b/plugins/LdapCommon/extlib/Net/LDAP2/LDIF.php @@ -0,0 +1,922 @@ + +* @copyright 2009 Benedikt Hallinger +* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 +* @version SVN: $Id: LDIF.php 286718 2009-08-03 07:30:49Z beni $ +* @link http://pear.php.net/package/Net_LDAP2/ +*/ + +/** +* Includes +*/ +require_once 'PEAR.php'; +require_once 'Net/LDAP2.php'; +require_once 'Net/LDAP2/Entry.php'; +require_once 'Net/LDAP2/Util.php'; + +/** +* LDIF capabilitys for Net_LDAP2, closely taken from PERLs Net::LDAP +* +* It provides a means to convert between Net_LDAP2_Entry objects and LDAP entries +* represented in LDIF format files. Reading and writing are supported and may +* manipulate single entries or lists of entries. +* +* Usage example: +* +* // Read and parse an ldif-file into Net_LDAP2_Entry objects +* // and print out the DNs. Store the entries for later use. +* require 'Net/LDAP2/LDIF.php'; +* $options = array( +* 'onerror' => 'die' +* ); +* $entries = array(); +* $ldif = new Net_LDAP2_LDIF('test.ldif', 'r', $options); +* do { +* $entry = $ldif->read_entry(); +* $dn = $entry->dn(); +* echo " done building entry: $dn\n"; +* array_push($entries, $entry); +* } while (!$ldif->eof()); +* $ldif->done(); +* +* +* // write those entries to another file +* $ldif = new Net_LDAP2_LDIF('test.out.ldif', 'w', $options); +* $ldif->write_entry($entries); +* $ldif->done(); +* +* +* @category Net +* @package Net_LDAP2 +* @author Benedikt Hallinger +* @license http://www.gnu.org/copyleft/lesser.html LGPL +* @link http://pear.php.net/package/Net_LDAP22/ +* @see http://www.ietf.org/rfc/rfc2849.txt +* @todo Error handling should be PEARified +* @todo LDAPv3 controls are not implemented yet +*/ +class Net_LDAP2_LDIF extends PEAR +{ + /** + * Options + * + * @access protected + * @var array + */ + protected $_options = array('encode' => 'base64', + 'onerror' => null, + 'change' => 0, + 'lowercase' => 0, + 'sort' => 0, + 'version' => null, + 'wrap' => 78, + 'raw' => '' + ); + + /** + * Errorcache + * + * @access protected + * @var array + */ + protected $_error = array('error' => null, + 'line' => 0 + ); + + /** + * Filehandle for read/write + * + * @access protected + * @var array + */ + protected $_FH = null; + + /** + * Says, if we opened the filehandle ourselves + * + * @access protected + * @var array + */ + protected $_FH_opened = false; + + /** + * Linecounter for input file handle + * + * @access protected + * @var array + */ + protected $_input_line = 0; + + /** + * counter for processed entries + * + * @access protected + * @var int + */ + protected $_entrynum = 0; + + /** + * Mode we are working in + * + * Either 'r', 'a' or 'w' + * + * @access protected + * @var string + */ + protected $_mode = false; + + /** + * Tells, if the LDIF version string was already written + * + * @access protected + * @var boolean + */ + protected $_version_written = false; + + /** + * Cache for lines that have build the current entry + * + * @access protected + * @var boolean + */ + protected $_lines_cur = array(); + + /** + * Cache for lines that will build the next entry + * + * @access protected + * @var boolean + */ + protected $_lines_next = array(); + + /** + * Open LDIF file for reading or for writing + * + * new (FILE): + * Open the file read-only. FILE may be the name of a file + * or an already open filehandle. + * If the file doesn't exist, it will be created if in write mode. + * + * new (FILE, MODE, OPTIONS): + * Open the file with the given MODE (see PHPs fopen()), eg "w" or "a". + * FILE may be the name of a file or an already open filehandle. + * PERLs Net_LDAP2 "FILE|" mode does not work curently. + * + * OPTIONS is an associative array and may contain: + * encode => 'none' | 'canonical' | 'base64' + * Some DN values in LDIF cannot be written verbatim and have to be encoded in some way: + * 'none' No encoding. + * 'canonical' See "canonical_dn()" in Net::LDAP::Util. + * 'base64' Use base64. (default, this differs from the Perl interface. + * The perl default is "none"!) + * + * onerror => 'die' | 'warn' | NULL + * Specify what happens when an error is detected. + * 'die' Net_LDAP2_LDIF will croak with an appropriate message. + * 'warn' Net_LDAP2_LDIF will warn (echo) with an appropriate message. + * NULL Net_LDAP2_LDIF will not warn (default), use error(). + * + * change => 1 + * Write entry changes to the LDIF file instead of the entries itself. I.e. write LDAP + * operations acting on the entries to the file instead of the entries contents. + * This writes the changes usually carried out by an update() to the LDIF file. + * + * lowercase => 1 + * Convert attribute names to lowercase when writing. + * + * sort => 1 + * Sort attribute names when writing entries according to the rule: + * objectclass first then all other attributes alphabetically sorted by attribute name + * + * version => '1' + * Set the LDIF version to write to the resulting LDIF file. + * According to RFC 2849 currently the only legal value for this option is 1. + * When this option is set Net_LDAP2_LDIF tries to adhere more strictly to + * the LDIF specification in RFC2489 in a few places. + * The default is NULL meaning no version information is written to the LDIF file. + * + * wrap => 78 + * Number of columns where output line wrapping shall occur. + * Default is 78. Setting it to 40 or lower inhibits wrapping. + * + * raw => REGEX + * Use REGEX to denote the names of attributes that are to be + * considered binary in search results if writing entries. + * Example: raw => "/(?i:^jpegPhoto|;binary)/i" + * + * @param string|ressource $file Filename or filehandle + * @param string $mode Mode to open filename + * @param array $options Options like described above + */ + public function __construct($file, $mode = 'r', $options = array()) + { + $this->PEAR('Net_LDAP2_Error'); // default error class + + // First, parse options + // todo: maybe implement further checks on possible values + foreach ($options as $option => $value) { + if (!array_key_exists($option, $this->_options)) { + $this->dropError('Net_LDAP2_LDIF error: option '.$option.' not known!'); + return; + } else { + $this->_options[$option] = strtolower($value); + } + } + + // setup LDIF class + $this->version($this->_options['version']); + + // setup file mode + if (!preg_match('/^[rwa]\+?$/', $mode)) { + $this->dropError('Net_LDAP2_LDIF error: file mode '.$mode.' not supported!'); + } else { + $this->_mode = $mode; + + // setup filehandle + if (is_resource($file)) { + // TODO: checks on mode possible? + $this->_FH =& $file; + } else { + $imode = substr($this->_mode, 0, 1); + if ($imode == 'r') { + if (!file_exists($file)) { + $this->dropError('Unable to open '.$file.' for read: file not found'); + $this->_mode = false; + } + if (!is_readable($file)) { + $this->dropError('Unable to open '.$file.' for read: permission denied'); + $this->_mode = false; + } + } + + if (($imode == 'w' || $imode == 'a')) { + if (file_exists($file)) { + if (!is_writable($file)) { + $this->dropError('Unable to open '.$file.' for write: permission denied'); + $this->_mode = false; + } + } else { + if (!@touch($file)) { + $this->dropError('Unable to create '.$file.' for write: permission denied'); + $this->_mode = false; + } + } + } + + if ($this->_mode) { + $this->_FH = @fopen($file, $this->_mode); + if (false === $this->_FH) { + // Fallback; should never be reached if tests above are good enough! + $this->dropError('Net_LDAP2_LDIF error: Could not open file '.$file); + } else { + $this->_FH_opened = true; + } + } + } + } + } + + /** + * Read one entry from the file and return it as a Net::LDAP::Entry object. + * + * @return Net_LDAP2_Entry + */ + public function read_entry() + { + // read fresh lines, set them as current lines and create the entry + $attrs = $this->next_lines(true); + if (count($attrs) > 0) { + $this->_lines_cur = $attrs; + } + return $this->current_entry(); + } + + /** + * Returns true when the end of the file is reached. + * + * @return boolean + */ + public function eof() + { + return feof($this->_FH); + } + + /** + * Write the entry or entries to the LDIF file. + * + * If you want to build an LDIF file containing several entries AND + * you want to call write_entry() several times, you must open the filehandle + * in append mode ("a"), otherwise you will always get the last entry only. + * + * @param Net_LDAP2_Entry|array $entries Entry or array of entries + * + * @return void + * @todo implement operations on whole entries (adding a whole entry) + */ + public function write_entry($entries) + { + if (!is_array($entries)) { + $entries = array($entries); + } + + foreach ($entries as $entry) { + $this->_entrynum++; + if (!$entry instanceof Net_LDAP2_Entry) { + $this->dropError('Net_LDAP2_LDIF error: entry '.$this->_entrynum.' is not an Net_LDAP2_Entry object'); + } else { + if ($this->_options['change']) { + // LDIF change mode + // fetch change information from entry + $entry_attrs_changes = $entry->getChanges(); + $num_of_changes = count($entry_attrs_changes['add']) + + count($entry_attrs_changes['replace']) + + count($entry_attrs_changes['delete']); + + $is_changed = ($num_of_changes > 0 || $entry->willBeDeleted() || $entry->willBeMoved()); + + // write version if not done yet + // also write DN of entry + if ($is_changed) { + if (!$this->_version_written) { + $this->write_version(); + } + $this->writeDN($entry->currentDN()); + } + + // process changes + // TODO: consider DN add! + if ($entry->willBeDeleted()) { + $this->writeLine("changetype: delete".PHP_EOL); + } elseif ($entry->willBeMoved()) { + $this->writeLine("changetype: modrdn".PHP_EOL); + $olddn = Net_LDAP2_Util::ldap_explode_dn($entry->currentDN(), array('casefold' => 'none')); // maybe gives a bug if using multivalued RDNs + $oldrdn = array_shift($olddn); + $oldparent = implode(',', $olddn); + $newdn = Net_LDAP2_Util::ldap_explode_dn($entry->dn(), array('casefold' => 'none')); // maybe gives a bug if using multivalued RDNs + $rdn = array_shift($newdn); + $parent = implode(',', $newdn); + $this->writeLine("newrdn: ".$rdn.PHP_EOL); + $this->writeLine("deleteoldrdn: 1".PHP_EOL); + if ($parent !== $oldparent) { + $this->writeLine("newsuperior: ".$parent.PHP_EOL); + } + // TODO: What if the entry has attribute changes as well? + // I think we should check for that and make a dummy + // entry with the changes that is written to the LDIF file + } elseif ($num_of_changes > 0) { + // write attribute change data + $this->writeLine("changetype: modify".PHP_EOL); + foreach ($entry_attrs_changes as $changetype => $entry_attrs) { + foreach ($entry_attrs as $attr_name => $attr_values) { + $this->writeLine("$changetype: $attr_name".PHP_EOL); + if ($attr_values !== null) $this->writeAttribute($attr_name, $attr_values, $changetype); + $this->writeLine("-".PHP_EOL); + } + } + } + + // finish this entrys data if we had changes + if ($is_changed) { + $this->finishEntry(); + } + } else { + // LDIF-content mode + // fetch attributes for further processing + $entry_attrs = $entry->getValues(); + + // sort and put objectclass-attrs to first position + if ($this->_options['sort']) { + ksort($entry_attrs); + if (array_key_exists('objectclass', $entry_attrs)) { + $oc = $entry_attrs['objectclass']; + unset($entry_attrs['objectclass']); + $entry_attrs = array_merge(array('objectclass' => $oc), $entry_attrs); + } + } + + // write data + if (!$this->_version_written) { + $this->write_version(); + } + $this->writeDN($entry->dn()); + foreach ($entry_attrs as $attr_name => $attr_values) { + $this->writeAttribute($attr_name, $attr_values); + } + $this->finishEntry(); + } + } + } + } + + /** + * Write version to LDIF + * + * If the object's version is defined, this method allows to explicitely write the version before an entry is written. + * If not called explicitely, it gets called automatically when writing the first entry. + * + * @return void + */ + public function write_version() + { + $this->_version_written = true; + if (!is_null($this->version())) { + return $this->writeLine('version: '.$this->version().PHP_EOL, 'Net_LDAP2_LDIF error: unable to write version'); + } + } + + /** + * Get or set LDIF version + * + * If called without arguments it returns the version of the LDIF file or NULL if no version has been set. + * If called with an argument it sets the LDIF version to VERSION. + * According to RFC 2849 currently the only legal value for VERSION is 1. + * + * @param int $version (optional) LDIF version to set + * + * @return int + */ + public function version($version = null) + { + if ($version !== null) { + if ($version != 1) { + $this->dropError('Net_LDAP2_LDIF error: illegal LDIF version set'); + } else { + $this->_options['version'] = $version; + } + } + return $this->_options['version']; + } + + /** + * Returns the file handle the Net_LDAP2_LDIF object reads from or writes to. + * + * You can, for example, use this to fetch the content of the LDIF file yourself + * + * @return null|resource + */ + public function &handle() + { + if (!is_resource($this->_FH)) { + $this->dropError('Net_LDAP2_LDIF error: invalid file resource'); + $null = null; + return $null; + } else { + return $this->_FH; + } + } + + /** + * Clean up + * + * This method signals that the LDIF object is no longer needed. + * You can use this to free up some memory and close the file handle. + * The file handle is only closed, if it was opened from Net_LDAP2_LDIF. + * + * @return void + */ + public function done() + { + // close FH if we opened it + if ($this->_FH_opened) { + fclose($this->handle()); + } + + // free variables + foreach (get_object_vars($this) as $name => $value) { + unset($this->$name); + } + } + + /** + * Returns last error message if error was found. + * + * Example: + * + * $ldif->someAction(); + * if ($ldif->error()) { + * echo "Error: ".$ldif->error()." at input line: ".$ldif->error_lines(); + * } + * + * + * @param boolean $as_string If set to true, only the message is returned + * + * @return false|Net_LDAP2_Error + */ + public function error($as_string = false) + { + if (Net_LDAP2::isError($this->_error['error'])) { + return ($as_string)? $this->_error['error']->getMessage() : $this->_error['error']; + } else { + return false; + } + } + + /** + * Returns lines that resulted in error. + * + * Perl returns an array of faulty lines in list context, + * but we always just return an int because of PHPs language. + * + * @return int + */ + public function error_lines() + { + return $this->_error['line']; + } + + /** + * Returns the current Net::LDAP::Entry object. + * + * @return Net_LDAP2_Entry|false + */ + public function current_entry() + { + return $this->parseLines($this->current_lines()); + } + + /** + * Parse LDIF lines of one entry into an Net_LDAP2_Entry object + * + * @param array $lines LDIF lines for one entry + * + * @return Net_LDAP2_Entry|false Net_LDAP2_Entry object for those lines + * @todo what about file inclusions and urls? "jpegphoto:< file:///usr/local/directory/photos/fiona.jpg" + */ + public function parseLines($lines) + { + // parse lines into an array of attributes and build the entry + $attributes = array(); + $dn = false; + foreach ($lines as $line) { + if (preg_match('/^(\w+)(:|::|:<)\s(.+)$/', $line, $matches)) { + $attr =& $matches[1]; + $delim =& $matches[2]; + $data =& $matches[3]; + + if ($delim == ':') { + // normal data + $attributes[$attr][] = $data; + } elseif ($delim == '::') { + // base64 data + $attributes[$attr][] = base64_decode($data); + } elseif ($delim == ':<') { + // file inclusion + // TODO: Is this the job of the LDAP-client or the server? + $this->dropError('File inclusions are currently not supported'); + //$attributes[$attr][] = ...; + } else { + // since the pattern above, the delimeter cannot be something else. + $this->dropError('Net_LDAP2_LDIF parsing error: invalid syntax at parsing entry line: '.$line); + continue; + } + + if (strtolower($attr) == 'dn') { + // DN line detected + $dn = $attributes[$attr][0]; // save possibly decoded DN + unset($attributes[$attr]); // remove wrongly added "dn: " attribute + } + } else { + // line not in "attr: value" format -> ignore + // maybe we should rise an error here, but this should be covered by + // next_lines() already. A problem arises, if users try to feed data of + // several entries to this method - the resulting entry will + // get wrong attributes. However, this is already mentioned in the + // methods documentation above. + } + } + + if (false === $dn) { + $this->dropError('Net_LDAP2_LDIF parsing error: unable to detect DN for entry'); + return false; + } else { + $newentry = Net_LDAP2_Entry::createFresh($dn, $attributes); + return $newentry; + } + } + + /** + * Returns the lines that generated the current Net::LDAP::Entry object. + * + * Note that this returns an empty array if no lines have been read so far. + * + * @return array Array of lines + */ + public function current_lines() + { + return $this->_lines_cur; + } + + /** + * Returns the lines that will generate the next Net::LDAP::Entry object. + * + * If you set $force to TRUE then you can iterate over the lines that build + * up entries manually. Otherwise, iterating is done using {@link read_entry()}. + * Force will move the file pointer forward, thus returning the next entries lines. + * + * Wrapped lines will be unwrapped. Comments are stripped. + * + * @param boolean $force Set this to true if you want to iterate over the lines manually + * + * @return array + */ + public function next_lines($force = false) + { + // if we already have those lines, just return them, otherwise read + if (count($this->_lines_next) == 0 || $force) { + $this->_lines_next = array(); // empty in case something was left (if used $force) + $entry_done = false; + $fh = &$this->handle(); + $commentmode = false; // if we are in an comment, for wrapping purposes + $datalines_read = 0; // how many lines with data we have read + + while (!$entry_done && !$this->eof()) { + $this->_input_line++; + // Read line. Remove line endings, we want only data; + // this is okay since ending spaces should be encoded + $data = rtrim(fgets($fh)); + if ($data === false) { + // error only, if EOF not reached after fgets() call + if (!$this->eof()) { + $this->dropError('Net_LDAP2_LDIF error: error reading from file at input line '.$this->_input_line, $this->_input_line); + } + break; + } else { + if (count($this->_lines_next) > 0 && preg_match('/^$/', $data)) { + // Entry is finished if we have an empty line after we had data + $entry_done = true; + + // Look ahead if the next EOF is nearby. Comments and empty + // lines at the file end may cause problems otherwise + $current_pos = ftell($fh); + $data = fgets($fh); + while (!feof($fh)) { + if (preg_match('/^\s*$/', $data) || preg_match('/^#/', $data)) { + // only empty lines or comments, continue to seek + // TODO: Known bug: Wrappings for comments are okay but are treaten as + // error, since we do not honor comment mode here. + // This should be a very theoretically case, however + // i am willing to fix this if really necessary. + $this->_input_line++; + $current_pos = ftell($fh); + $data = fgets($fh); + } else { + // Data found if non emtpy line and not a comment!! + // Rewind to position prior last read and stop lookahead + fseek($fh, $current_pos); + break; + } + } + // now we have either the file pointer at the beginning of + // a new data position or at the end of file causing feof() to return true + + } else { + // build lines + if (preg_match('/^version:\s(.+)$/', $data, $match)) { + // version statement, set version + $this->version($match[1]); + } elseif (preg_match('/^\w+::?\s.+$/', $data)) { + // normal attribute: add line + $commentmode = false; + $this->_lines_next[] = trim($data); + $datalines_read++; + } elseif (preg_match('/^\s(.+)$/', $data, $matches)) { + // wrapped data: unwrap if not in comment mode + if (!$commentmode) { + if ($datalines_read == 0) { + // first line of entry: wrapped data is illegal + $this->dropError('Net_LDAP2_LDIF error: illegal wrapping at input line '.$this->_input_line, $this->_input_line); + } else { + $last = array_pop($this->_lines_next); + $last = $last.trim($matches[1]); + $this->_lines_next[] = $last; + $datalines_read++; + } + } + } elseif (preg_match('/^#/', $data)) { + // LDIF comments + $commentmode = true; + } elseif (preg_match('/^\s*$/', $data)) { + // empty line but we had no data for this + // entry, so just ignore this line + $commentmode = false; + } else { + $this->dropError('Net_LDAP2_LDIF error: invalid syntax at input line '.$this->_input_line, $this->_input_line); + continue; + } + + } + } + } + } + return $this->_lines_next; + } + + /** + * Convert an attribute and value to LDIF string representation + * + * It honors correct encoding of values according to RFC 2849. + * Line wrapping will occur at the configured maximum but only if + * the value is greater than 40 chars. + * + * @param string $attr_name Name of the attribute + * @param string $attr_value Value of the attribute + * + * @access protected + * @return string LDIF string for that attribute and value + */ + protected function convertAttribute($attr_name, $attr_value) + { + // Handle empty attribute or process + if (strlen($attr_value) == 0) { + $attr_value = " "; + } else { + $base64 = false; + // ASCII-chars that are NOT safe for the + // start and for being inside the value. + // These are the int values of those chars. + $unsafe_init = array(0, 10, 13, 32, 58, 60); + $unsafe = array(0, 10, 13); + + // Test for illegal init char + $init_ord = ord(substr($attr_value, 0, 1)); + if ($init_ord > 127 || in_array($init_ord, $unsafe_init)) { + $base64 = true; + } + + // Test for illegal content char + for ($i = 0; $i < strlen($attr_value); $i++) { + $char_ord = ord(substr($attr_value, $i, 1)); + if ($char_ord > 127 || in_array($char_ord, $unsafe)) { + $base64 = true; + } + } + + // Test for ending space + if (substr($attr_value, -1) == ' ') { + $base64 = true; + } + + // If converting is needed, do it + // Either we have some special chars or a matching "raw" regex + if ($base64 || ($this->_options['raw'] && preg_match($this->_options['raw'], $attr_name))) { + $attr_name .= ':'; + $attr_value = base64_encode($attr_value); + } + + // Lowercase attr names if requested + if ($this->_options['lowercase']) $attr_name = strtolower($attr_name); + + // Handle line wrapping + if ($this->_options['wrap'] > 40 && strlen($attr_value) > $this->_options['wrap']) { + $attr_value = wordwrap($attr_value, $this->_options['wrap'], PHP_EOL." ", true); + } + } + + return $attr_name.': '.$attr_value; + } + + /** + * Convert an entries DN to LDIF string representation + * + * It honors correct encoding of values according to RFC 2849. + * + * @param string $dn UTF8-Encoded DN + * + * @access protected + * @return string LDIF string for that DN + * @todo I am not sure, if the UTF8 stuff is correctly handled right now + */ + protected function convertDN($dn) + { + $base64 = false; + // ASCII-chars that are NOT safe for the + // start and for being inside the dn. + // These are the int values of those chars. + $unsafe_init = array(0, 10, 13, 32, 58, 60); + $unsafe = array(0, 10, 13); + + // Test for illegal init char + $init_ord = ord(substr($dn, 0, 1)); + if ($init_ord >= 127 || in_array($init_ord, $unsafe_init)) { + $base64 = true; + } + + // Test for illegal content char + for ($i = 0; $i < strlen($dn); $i++) { + $char = substr($dn, $i, 1); + if (ord($char) >= 127 || in_array($init_ord, $unsafe)) { + $base64 = true; + } + } + + // Test for ending space + if (substr($dn, -1) == ' ') { + $base64 = true; + } + + // if converting is needed, do it + return ($base64)? 'dn:: '.base64_encode($dn) : 'dn: '.$dn; + } + + /** + * Writes an attribute to the filehandle + * + * @param string $attr_name Name of the attribute + * @param string|array $attr_values Single attribute value or array with attribute values + * + * @access protected + * @return void + */ + protected function writeAttribute($attr_name, $attr_values) + { + // write out attribute content + if (!is_array($attr_values)) { + $attr_values = array($attr_values); + } + foreach ($attr_values as $attr_val) { + $line = $this->convertAttribute($attr_name, $attr_val).PHP_EOL; + $this->writeLine($line, 'Net_LDAP2_LDIF error: unable to write attribute '.$attr_name.' of entry '.$this->_entrynum); + } + } + + /** + * Writes a DN to the filehandle + * + * @param string $dn DN to write + * + * @access protected + * @return void + */ + protected function writeDN($dn) + { + // prepare DN + if ($this->_options['encode'] == 'base64') { + $dn = $this->convertDN($dn).PHP_EOL; + } elseif ($this->_options['encode'] == 'canonical') { + $dn = Net_LDAP2_Util::canonical_dn($dn, array('casefold' => 'none')).PHP_EOL; + } else { + $dn = $dn.PHP_EOL; + } + $this->writeLine($dn, 'Net_LDAP2_LDIF error: unable to write DN of entry '.$this->_entrynum); + } + + /** + * Finishes an LDIF entry + * + * @access protected + * @return void + */ + protected function finishEntry() + { + $this->writeLine(PHP_EOL, 'Net_LDAP2_LDIF error: unable to close entry '.$this->_entrynum); + } + + /** + * Just write an arbitary line to the filehandle + * + * @param string $line Content to write + * @param string $error If error occurs, drop this message + * + * @access protected + * @return true|false + */ + protected function writeLine($line, $error = 'Net_LDAP2_LDIF error: unable to write to filehandle') + { + if (is_resource($this->handle()) && fwrite($this->handle(), $line, strlen($line)) === false) { + $this->dropError($error); + return false; + } else { + return true; + } + } + + /** + * Optionally raises an error and pushes the error on the error cache + * + * @param string $msg Errortext + * @param int $line Line in the LDIF that caused the error + * + * @access protected + * @return void + */ + protected function dropError($msg, $line = null) + { + $this->_error['error'] = new Net_LDAP2_Error($msg); + if ($line !== null) $this->_error['line'] = $line; + + if ($this->_options['onerror'] == 'die') { + die($msg.PHP_EOL); + } elseif ($this->_options['onerror'] == 'warn') { + echo $msg.PHP_EOL; + } + } +} +?> diff --git a/plugins/LdapCommon/extlib/Net/LDAP2/RootDSE.php b/plugins/LdapCommon/extlib/Net/LDAP2/RootDSE.php new file mode 100644 index 000000000..8dc81fd4f --- /dev/null +++ b/plugins/LdapCommon/extlib/Net/LDAP2/RootDSE.php @@ -0,0 +1,240 @@ + +* @copyright 2009 Jan Wagner +* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 +* @version SVN: $Id: RootDSE.php 286718 2009-08-03 07:30:49Z beni $ +* @link http://pear.php.net/package/Net_LDAP2/ +*/ + +/** +* Includes +*/ +require_once 'PEAR.php'; + +/** +* Getting the rootDSE entry of a LDAP server +* +* @category Net +* @package Net_LDAP2 +* @author Jan Wagner +* @license http://www.gnu.org/copyleft/lesser.html LGPL +* @link http://pear.php.net/package/Net_LDAP22/ +*/ +class Net_LDAP2_RootDSE extends PEAR +{ + /** + * @access protected + * @var object Net_LDAP2_Entry + **/ + protected $_entry; + + /** + * Class constructor + * + * @param Net_LDAP2_Entry &$entry Net_LDAP2_Entry object of the RootDSE + */ + protected function __construct(&$entry) + { + $this->_entry = $entry; + } + + /** + * Fetches a RootDSE object from an LDAP connection + * + * @param Net_LDAP2 $ldap Directory from which the RootDSE should be fetched + * @param array $attrs Array of attributes to search for + * + * @access static + * @return Net_LDAP2_RootDSE|Net_LDAP2_Error + */ + public static function fetch($ldap, $attrs = null) + { + if (!$ldap instanceof Net_LDAP2) { + return PEAR::raiseError("Unable to fetch Schema: Parameter \$ldap must be a Net_LDAP2 object!"); + } + + if (is_array($attrs) && count($attrs) > 0 ) { + $attributes = $attrs; + } else { + $attributes = array('vendorName', + 'vendorVersion', + 'namingContexts', + 'altServer', + 'supportedExtension', + 'supportedControl', + 'supportedSASLMechanisms', + 'supportedLDAPVersion', + 'subschemaSubentry' ); + } + $result = $ldap->search('', '(objectClass=*)', array('attributes' => $attributes, 'scope' => 'base')); + if (self::isError($result)) { + return $result; + } + $entry = $result->shiftEntry(); + if (false === $entry) { + return PEAR::raiseError('Could not fetch RootDSE entry'); + } + $ret = new Net_LDAP2_RootDSE($entry); + return $ret; + } + + /** + * Gets the requested attribute value + * + * Same usuage as {@link Net_LDAP2_Entry::getValue()} + * + * @param string $attr Attribute name + * @param array $options Array of options + * + * @access public + * @return mixed Net_LDAP2_Error object or attribute values + * @see Net_LDAP2_Entry::get_value() + */ + public function getValue($attr = '', $options = '') + { + return $this->_entry->get_value($attr, $options); + } + + /** + * Alias function of getValue() for perl-ldap interface + * + * @see getValue() + * @return mixed + */ + public function get_value() + { + $args = func_get_args(); + return call_user_func_array(array( &$this, 'getValue' ), $args); + } + + /** + * Determines if the extension is supported + * + * @param array $oids Array of oids to check + * + * @access public + * @return boolean + */ + public function supportedExtension($oids) + { + return $this->checkAttr($oids, 'supportedExtension'); + } + + /** + * Alias function of supportedExtension() for perl-ldap interface + * + * @see supportedExtension() + * @return boolean + */ + public function supported_extension() + { + $args = func_get_args(); + return call_user_func_array(array( &$this, 'supportedExtension'), $args); + } + + /** + * Determines if the version is supported + * + * @param array $versions Versions to check + * + * @access public + * @return boolean + */ + public function supportedVersion($versions) + { + return $this->checkAttr($versions, 'supportedLDAPVersion'); + } + + /** + * Alias function of supportedVersion() for perl-ldap interface + * + * @see supportedVersion() + * @return boolean + */ + public function supported_version() + { + $args = func_get_args(); + return call_user_func_array(array(&$this, 'supportedVersion'), $args); + } + + /** + * Determines if the control is supported + * + * @param array $oids Control oids to check + * + * @access public + * @return boolean + */ + public function supportedControl($oids) + { + return $this->checkAttr($oids, 'supportedControl'); + } + + /** + * Alias function of supportedControl() for perl-ldap interface + * + * @see supportedControl() + * @return boolean + */ + public function supported_control() + { + $args = func_get_args(); + return call_user_func_array(array(&$this, 'supportedControl' ), $args); + } + + /** + * Determines if the sasl mechanism is supported + * + * @param array $mechlist SASL mechanisms to check + * + * @access public + * @return boolean + */ + public function supportedSASLMechanism($mechlist) + { + return $this->checkAttr($mechlist, 'supportedSASLMechanisms'); + } + + /** + * Alias function of supportedSASLMechanism() for perl-ldap interface + * + * @see supportedSASLMechanism() + * @return boolean + */ + public function supported_sasl_mechanism() + { + $args = func_get_args(); + return call_user_func_array(array(&$this, 'supportedSASLMechanism'), $args); + } + + /** + * Checks for existance of value in attribute + * + * @param array $values values to check + * @param string $attr attribute name + * + * @access protected + * @return boolean + */ + protected function checkAttr($values, $attr) + { + if (!is_array($values)) $values = array($values); + + foreach ($values as $value) { + if (!@in_array($value, $this->get_value($attr, 'all'))) { + return false; + } + } + return true; + } +} + +?> diff --git a/plugins/LdapCommon/extlib/Net/LDAP2/Schema.php b/plugins/LdapCommon/extlib/Net/LDAP2/Schema.php new file mode 100644 index 000000000..b590eabc5 --- /dev/null +++ b/plugins/LdapCommon/extlib/Net/LDAP2/Schema.php @@ -0,0 +1,516 @@ + +* @author Benedikt Hallinger +* @copyright 2009 Jan Wagner, Benedikt Hallinger +* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 +* @version SVN: $Id: Schema.php 286718 2009-08-03 07:30:49Z beni $ +* @link http://pear.php.net/package/Net_LDAP2/ +* @todo see the comment at the end of the file +*/ + +/** +* Includes +*/ +require_once 'PEAR.php'; + +/** +* Syntax definitions +* +* Please don't forget to add binary attributes to isBinary() below +* to support proper value fetching from Net_LDAP2_Entry +*/ +define('NET_LDAP2_SYNTAX_BOOLEAN', '1.3.6.1.4.1.1466.115.121.1.7'); +define('NET_LDAP2_SYNTAX_DIRECTORY_STRING', '1.3.6.1.4.1.1466.115.121.1.15'); +define('NET_LDAP2_SYNTAX_DISTINGUISHED_NAME', '1.3.6.1.4.1.1466.115.121.1.12'); +define('NET_LDAP2_SYNTAX_INTEGER', '1.3.6.1.4.1.1466.115.121.1.27'); +define('NET_LDAP2_SYNTAX_JPEG', '1.3.6.1.4.1.1466.115.121.1.28'); +define('NET_LDAP2_SYNTAX_NUMERIC_STRING', '1.3.6.1.4.1.1466.115.121.1.36'); +define('NET_LDAP2_SYNTAX_OID', '1.3.6.1.4.1.1466.115.121.1.38'); +define('NET_LDAP2_SYNTAX_OCTET_STRING', '1.3.6.1.4.1.1466.115.121.1.40'); + +/** +* Load an LDAP Schema and provide information +* +* This class takes a Subschema entry, parses this information +* and makes it available in an array. Most of the code has been +* inspired by perl-ldap( http://perl-ldap.sourceforge.net). +* You will find portions of their implementation in here. +* +* @category Net +* @package Net_LDAP2 +* @author Jan Wagner +* @author Benedikt Hallinger +* @license http://www.gnu.org/copyleft/lesser.html LGPL +* @link http://pear.php.net/package/Net_LDAP22/ +*/ +class Net_LDAP2_Schema extends PEAR +{ + /** + * Map of entry types to ldap attributes of subschema entry + * + * @access public + * @var array + */ + public $types = array( + 'attribute' => 'attributeTypes', + 'ditcontentrule' => 'dITContentRules', + 'ditstructurerule' => 'dITStructureRules', + 'matchingrule' => 'matchingRules', + 'matchingruleuse' => 'matchingRuleUse', + 'nameform' => 'nameForms', + 'objectclass' => 'objectClasses', + 'syntax' => 'ldapSyntaxes' + ); + + /** + * Array of entries belonging to this type + * + * @access protected + * @var array + */ + protected $_attributeTypes = array(); + protected $_matchingRules = array(); + protected $_matchingRuleUse = array(); + protected $_ldapSyntaxes = array(); + protected $_objectClasses = array(); + protected $_dITContentRules = array(); + protected $_dITStructureRules = array(); + protected $_nameForms = array(); + + + /** + * hash of all fetched oids + * + * @access protected + * @var array + */ + protected $_oids = array(); + + /** + * Tells if the schema is initialized + * + * @access protected + * @var boolean + * @see parse(), get() + */ + protected $_initialized = false; + + + /** + * Constructor of the class + * + * @access protected + */ + protected function __construct() + { + $this->PEAR('Net_LDAP2_Error'); // default error class + } + + /** + * Fetch the Schema from an LDAP connection + * + * @param Net_LDAP2 $ldap LDAP connection + * @param string $dn (optional) Subschema entry dn + * + * @access public + * @return Net_LDAP2_Schema|NET_LDAP2_Error + */ + public function fetch($ldap, $dn = null) + { + if (!$ldap instanceof Net_LDAP2) { + return PEAR::raiseError("Unable to fetch Schema: Parameter \$ldap must be a Net_LDAP2 object!"); + } + + $schema_o = new Net_LDAP2_Schema(); + + if (is_null($dn)) { + // get the subschema entry via root dse + $dse = $ldap->rootDSE(array('subschemaSubentry')); + if (false == Net_LDAP2::isError($dse)) { + $base = $dse->getValue('subschemaSubentry', 'single'); + if (!Net_LDAP2::isError($base)) { + $dn = $base; + } + } + } + + // Support for buggy LDAP servers (e.g. Siemens DirX 6.x) that incorrectly + // call this entry subSchemaSubentry instead of subschemaSubentry. + // Note the correct case/spelling as per RFC 2251. + if (is_null($dn)) { + // get the subschema entry via root dse + $dse = $ldap->rootDSE(array('subSchemaSubentry')); + if (false == Net_LDAP2::isError($dse)) { + $base = $dse->getValue('subSchemaSubentry', 'single'); + if (!Net_LDAP2::isError($base)) { + $dn = $base; + } + } + } + + // Final fallback case where there is no subschemaSubentry attribute + // in the root DSE (this is a bug for an LDAP v3 server so report this + // to your LDAP vendor if you get this far). + if (is_null($dn)) { + $dn = 'cn=Subschema'; + } + + // fetch the subschema entry + $result = $ldap->search($dn, '(objectClass=*)', + array('attributes' => array_values($schema_o->types), + 'scope' => 'base')); + if (Net_LDAP2::isError($result)) { + return $result; + } + + $entry = $result->shiftEntry(); + if (!$entry instanceof Net_LDAP2_Entry) { + return PEAR::raiseError('Could not fetch Subschema entry'); + } + + $schema_o->parse($entry); + return $schema_o; + } + + /** + * Return a hash of entries for the given type + * + * Returns a hash of entry for th givene type. Types may be: + * objectclasses, attributes, ditcontentrules, ditstructurerules, matchingrules, + * matchingruleuses, nameforms, syntaxes + * + * @param string $type Type to fetch + * + * @access public + * @return array|Net_LDAP2_Error Array or Net_LDAP2_Error + */ + public function &getAll($type) + { + $map = array('objectclasses' => &$this->_objectClasses, + 'attributes' => &$this->_attributeTypes, + 'ditcontentrules' => &$this->_dITContentRules, + 'ditstructurerules' => &$this->_dITStructureRules, + 'matchingrules' => &$this->_matchingRules, + 'matchingruleuses' => &$this->_matchingRuleUse, + 'nameforms' => &$this->_nameForms, + 'syntaxes' => &$this->_ldapSyntaxes ); + + $key = strtolower($type); + $ret = ((key_exists($key, $map)) ? $map[$key] : PEAR::raiseError("Unknown type $type")); + return $ret; + } + + /** + * Return a specific entry + * + * @param string $type Type of name + * @param string $name Name or OID to fetch + * + * @access public + * @return mixed Entry or Net_LDAP2_Error + */ + public function &get($type, $name) + { + if ($this->_initialized) { + $type = strtolower($type); + if (false == key_exists($type, $this->types)) { + return PEAR::raiseError("No such type $type"); + } + + $name = strtolower($name); + $type_var = &$this->{'_' . $this->types[$type]}; + + if (key_exists($name, $type_var)) { + return $type_var[$name]; + } elseif (key_exists($name, $this->_oids) && $this->_oids[$name]['type'] == $type) { + return $this->_oids[$name]; + } else { + return PEAR::raiseError("Could not find $type $name"); + } + } else { + $return = null; + return $return; + } + } + + + /** + * Fetches attributes that MAY be present in the given objectclass + * + * @param string $oc Name or OID of objectclass + * + * @access public + * @return array|Net_LDAP2_Error Array with attributes or Net_LDAP2_Error + */ + public function may($oc) + { + return $this->_getAttr($oc, 'may'); + } + + /** + * Fetches attributes that MUST be present in the given objectclass + * + * @param string $oc Name or OID of objectclass + * + * @access public + * @return array|Net_LDAP2_Error Array with attributes or Net_LDAP2_Error + */ + public function must($oc) + { + return $this->_getAttr($oc, 'must'); + } + + /** + * Fetches the given attribute from the given objectclass + * + * @param string $oc Name or OID of objectclass + * @param string $attr Name of attribute to fetch + * + * @access protected + * @return array|Net_LDAP2_Error The attribute or Net_LDAP2_Error + */ + protected function _getAttr($oc, $attr) + { + $oc = strtolower($oc); + if (key_exists($oc, $this->_objectClasses) && key_exists($attr, $this->_objectClasses[$oc])) { + return $this->_objectClasses[$oc][$attr]; + } elseif (key_exists($oc, $this->_oids) && + $this->_oids[$oc]['type'] == 'objectclass' && + key_exists($attr, $this->_oids[$oc])) { + return $this->_oids[$oc][$attr]; + } else { + return PEAR::raiseError("Could not find $attr attributes for $oc "); + } + } + + /** + * Returns the name(s) of the immediate superclass(es) + * + * @param string $oc Name or OID of objectclass + * + * @access public + * @return array|Net_LDAP2_Error Array of names or Net_LDAP2_Error + */ + public function superclass($oc) + { + $o = $this->get('objectclass', $oc); + if (Net_LDAP2::isError($o)) { + return $o; + } + return (key_exists('sup', $o) ? $o['sup'] : array()); + } + + /** + * Parses the schema of the given Subschema entry + * + * @param Net_LDAP2_Entry &$entry Subschema entry + * + * @access public + * @return void + */ + public function parse(&$entry) + { + foreach ($this->types as $type => $attr) { + // initialize map type to entry + $type_var = '_' . $attr; + $this->{$type_var} = array(); + + // get values for this type + if ($entry->exists($attr)) { + $values = $entry->getValue($attr); + if (is_array($values)) { + foreach ($values as $value) { + + unset($schema_entry); // this was a real mess without it + + // get the schema entry + $schema_entry = $this->_parse_entry($value); + + // set the type + $schema_entry['type'] = $type; + + // save a ref in $_oids + $this->_oids[$schema_entry['oid']] = &$schema_entry; + + // save refs for all names in type map + $names = $schema_entry['aliases']; + array_push($names, $schema_entry['name']); + foreach ($names as $name) { + $this->{$type_var}[strtolower($name)] = &$schema_entry; + } + } + } + } + } + $this->_initialized = true; + } + + /** + * Parses an attribute value into a schema entry + * + * @param string $value Attribute value + * + * @access protected + * @return array|false Schema entry array or false + */ + protected function &_parse_entry($value) + { + // tokens that have no value associated + $noValue = array('single-value', + 'obsolete', + 'collective', + 'no-user-modification', + 'abstract', + 'structural', + 'auxiliary'); + + // tokens that can have multiple values + $multiValue = array('must', 'may', 'sup'); + + $schema_entry = array('aliases' => array()); // initilization + + $tokens = $this->_tokenize($value); // get an array of tokens + + // remove surrounding brackets + if ($tokens[0] == '(') array_shift($tokens); + if ($tokens[count($tokens) - 1] == ')') array_pop($tokens); // -1 doesnt work on arrays :-( + + $schema_entry['oid'] = array_shift($tokens); // first token is the oid + + // cycle over the tokens until none are left + while (count($tokens) > 0) { + $token = strtolower(array_shift($tokens)); + if (in_array($token, $noValue)) { + $schema_entry[$token] = 1; // single value token + } else { + // this one follows a string or a list if it is multivalued + if (($schema_entry[$token] = array_shift($tokens)) == '(') { + // this creates the list of values and cycles through the tokens + // until the end of the list is reached ')' + $schema_entry[$token] = array(); + while ($tmp = array_shift($tokens)) { + if ($tmp == ')') break; + if ($tmp != '$') array_push($schema_entry[$token], $tmp); + } + } + // create a array if the value should be multivalued but was not + if (in_array($token, $multiValue) && !is_array($schema_entry[$token])) { + $schema_entry[$token] = array($schema_entry[$token]); + } + } + } + // get max length from syntax + if (key_exists('syntax', $schema_entry)) { + if (preg_match('/{(\d+)}/', $schema_entry['syntax'], $matches)) { + $schema_entry['max_length'] = $matches[1]; + } + } + // force a name + if (empty($schema_entry['name'])) { + $schema_entry['name'] = $schema_entry['oid']; + } + // make one name the default and put the other ones into aliases + if (is_array($schema_entry['name'])) { + $aliases = $schema_entry['name']; + $schema_entry['name'] = array_shift($aliases); + $schema_entry['aliases'] = $aliases; + } + return $schema_entry; + } + + /** + * Tokenizes the given value into an array of tokens + * + * @param string $value String to parse + * + * @access protected + * @return array Array of tokens + */ + protected function _tokenize($value) + { + $tokens = array(); // array of tokens + $matches = array(); // matches[0] full pattern match, [1,2,3] subpatterns + + // this one is taken from perl-ldap, modified for php + $pattern = "/\s* (?:([()]) | ([^'\s()]+) | '((?:[^']+|'[^\s)])*)') \s*/x"; + + /** + * This one matches one big pattern wherin only one of the three subpatterns matched + * We are interested in the subpatterns that matched. If it matched its value will be + * non-empty and so it is a token. Tokens may be round brackets, a string, or a string + * enclosed by ' + */ + preg_match_all($pattern, $value, $matches); + + for ($i = 0; $i < count($matches[0]); $i++) { // number of tokens (full pattern match) + for ($j = 1; $j < 4; $j++) { // each subpattern + if (null != trim($matches[$j][$i])) { // pattern match in this subpattern + $tokens[$i] = trim($matches[$j][$i]); // this is the token + } + } + } + return $tokens; + } + + /** + * Returns wether a attribute syntax is binary or not + * + * This method gets used by Net_LDAP2_Entry to decide which + * PHP function needs to be used to fetch the value in the + * proper format (e.g. binary or string) + * + * @param string $attribute The name of the attribute (eg.: 'sn') + * + * @access public + * @return boolean + */ + public function isBinary($attribute) + { + $return = false; // default to false + + // This list contains all syntax that should be treaten as + // containing binary values + // The Syntax Definitons go into constants at the top of this page + $syntax_binary = array( + NET_LDAP2_SYNTAX_OCTET_STRING, + NET_LDAP2_SYNTAX_JPEG + ); + + // Check Syntax + $attr_s = $this->get('attribute', $attribute); + if (Net_LDAP2::isError($attr_s)) { + // Attribute not found in schema + $return = false; // consider attr not binary + } elseif (isset($attr_s['syntax']) && in_array($attr_s['syntax'], $syntax_binary)) { + // Syntax is defined as binary in schema + $return = true; + } else { + // Syntax not defined as binary, or not found + // if attribute is a subtype, check superior attribute syntaxes + if (isset($attr_s['sup'])) { + foreach ($attr_s['sup'] as $superattr) { + $return = $this->isBinary($superattr); + if ($return) { + break; // stop checking parents since we are binary + } + } + } + } + + return $return; + } + + // [TODO] add method that allows us to see to which objectclasses a certain attribute belongs to + // it should return the result structured, e.g. sorted in "may" and "must". Optionally it should + // be able to return it just "flat", e.g. array_merge()d. + // We could use get_all() to achieve this easily, i think +} +?> diff --git a/plugins/LdapCommon/extlib/Net/LDAP2/SchemaCache.interface.php b/plugins/LdapCommon/extlib/Net/LDAP2/SchemaCache.interface.php new file mode 100644 index 000000000..e0c3094c4 --- /dev/null +++ b/plugins/LdapCommon/extlib/Net/LDAP2/SchemaCache.interface.php @@ -0,0 +1,59 @@ + +* @copyright 2009 Benedikt Hallinger +* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 +* @version SVN: $Id: SchemaCache.interface.php 286718 2009-08-03 07:30:49Z beni $ +* @link http://pear.php.net/package/Net_LDAP2/ +*/ + +/** +* Interface describing a custom schema cache object +* +* To implement a custom schema cache, one must implement this interface and +* pass the instanciated object to Net_LDAP2s registerSchemaCache() method. +*/ +interface Net_LDAP2_SchemaCache +{ + /** + * Return the schema object from the cache + * + * Net_LDAP2 will consider anything returned invalid, except + * a valid Net_LDAP2_Schema object. + * In case you return a Net_LDAP2_Error, this error will be routed + * to the return of the $ldap->schema() call. + * If you return something else, Net_LDAP2 will + * fetch a fresh Schema object from the LDAP server. + * + * You may want to implement a cache aging mechanism here too. + * + * @return Net_LDAP2_Schema|Net_LDAP2_Error|false + */ + public function loadSchema(); + + /** + * Store a schema object in the cache + * + * This method will be called, if Net_LDAP2 has fetched a fresh + * schema object from LDAP and wants to init or refresh the cache. + * + * In case of errors you may return a Net_LDAP2_Error which will + * be routet to the client. + * Note that doing this prevents, that the schema object fetched from LDAP + * will be given back to the client, so only return errors if storing + * of the cache is something crucial (e.g. for doing something else with it). + * Normaly you dont want to give back errors in which case Net_LDAP2 needs to + * fetch the schema once per script run and instead use the error + * returned from loadSchema(). + * + * @return true|Net_LDAP2_Error + */ + public function storeSchema($schema); +} diff --git a/plugins/LdapCommon/extlib/Net/LDAP2/Search.php b/plugins/LdapCommon/extlib/Net/LDAP2/Search.php new file mode 100644 index 000000000..de4fde122 --- /dev/null +++ b/plugins/LdapCommon/extlib/Net/LDAP2/Search.php @@ -0,0 +1,614 @@ + +* @author Benedikt Hallinger +* @copyright 2009 Tarjej Huse, Benedikt Hallinger +* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 +* @version SVN: $Id: Search.php 286718 2009-08-03 07:30:49Z beni $ +* @link http://pear.php.net/package/Net_LDAP2/ +*/ + +/** +* Includes +*/ +require_once 'PEAR.php'; + +/** +* Result set of an LDAP search +* +* @category Net +* @package Net_LDAP2 +* @author Tarjej Huse +* @author Benedikt Hallinger +* @license http://www.gnu.org/copyleft/lesser.html LGPL +* @link http://pear.php.net/package/Net_LDAP22/ +*/ +class Net_LDAP2_Search extends PEAR implements Iterator +{ + /** + * Search result identifier + * + * @access protected + * @var resource + */ + protected $_search; + + /** + * LDAP resource link + * + * @access protected + * @var resource + */ + protected $_link; + + /** + * Net_LDAP2 object + * + * A reference of the Net_LDAP2 object for passing to Net_LDAP2_Entry + * + * @access protected + * @var object Net_LDAP2 + */ + protected $_ldap; + + /** + * Result entry identifier + * + * @access protected + * @var resource + */ + protected $_entry = null; + + /** + * The errorcode the search got + * + * Some errorcodes might be of interest, but might not be best handled as errors. + * examples: 4 - LDAP_SIZELIMIT_EXCEEDED - indicates a huge search. + * Incomplete results are returned. If you just want to check if there's anything in the search. + * than this is a point to handle. + * 32 - no such object - search here returns a count of 0. + * + * @access protected + * @var int + */ + protected $_errorCode = 0; // if not set - sucess! + + /** + * Cache for all entries already fetched from iterator interface + * + * @access protected + * @var array + */ + protected $_iteratorCache = array(); + + /** + * What attributes we searched for + * + * The $attributes array contains the names of the searched attributes and gets + * passed from $Net_LDAP2->search() so the Net_LDAP2_Search object can tell + * what attributes was searched for ({@link searchedAttrs()) + * + * This variable gets set from the constructor and returned + * from {@link searchedAttrs()} + * + * @access protected + * @var array + */ + protected $_searchedAttrs = array(); + + /** + * Cache variable for storing entries fetched internally + * + * This currently is only used by {@link pop_entry()} + * + * @access protected + * @var array + */ + protected $_entry_cache = false; + + /** + * Constructor + * + * @param resource &$search Search result identifier + * @param Net_LDAP2|resource &$ldap Net_LDAP2 object or just a LDAP-Link resource + * @param array $attributes (optional) Array with searched attribute names. (see {@link $_searchedAttrs}) + * + * @access public + */ + public function __construct(&$search, &$ldap, $attributes = array()) + { + $this->PEAR('Net_LDAP2_Error'); + + $this->setSearch($search); + + if ($ldap instanceof Net_LDAP2) { + $this->_ldap =& $ldap; + $this->setLink($this->_ldap->getLink()); + } else { + $this->setLink($ldap); + } + + $this->_errorCode = @ldap_errno($this->_link); + + if (is_array($attributes) && !empty($attributes)) { + $this->_searchedAttrs = $attributes; + } + } + + /** + * Returns an array of entry objects + * + * @return array Array of entry objects. + */ + public function entries() + { + $entries = array(); + + while ($entry = $this->shiftEntry()) { + $entries[] = $entry; + } + + return $entries; + } + + /** + * Get the next entry in the searchresult. + * + * This will return a valid Net_LDAP2_Entry object or false, so + * you can use this method to easily iterate over the entries inside + * a while loop. + * + * @return Net_LDAP2_Entry|false Reference to Net_LDAP2_Entry object or false + */ + public function &shiftEntry() + { + if ($this->count() == 0 ) { + $false = false; + return $false; + } + + if (is_null($this->_entry)) { + $this->_entry = @ldap_first_entry($this->_link, $this->_search); + $entry = Net_LDAP2_Entry::createConnected($this->_ldap, $this->_entry); + if ($entry instanceof Net_LDAP2_Error) $entry = false; + } else { + if (!$this->_entry = @ldap_next_entry($this->_link, $this->_entry)) { + $false = false; + return $false; + } + $entry = Net_LDAP2_Entry::createConnected($this->_ldap, $this->_entry); + if ($entry instanceof Net_LDAP2_Error) $entry = false; + } + return $entry; + } + + /** + * Alias function of shiftEntry() for perl-ldap interface + * + * @see shiftEntry() + * @return Net_LDAP2_Entry|false + */ + public function shift_entry() + { + $args = func_get_args(); + return call_user_func_array(array( &$this, 'shiftEntry' ), $args); + } + + /** + * Retrieve the next entry in the searchresult, but starting from last entry + * + * This is the opposite to {@link shiftEntry()} and is also very useful + * to be used inside a while loop. + * + * @return Net_LDAP2_Entry|false + */ + public function popEntry() + { + if (false === $this->_entry_cache) { + // fetch entries into cache if not done so far + $this->_entry_cache = $this->entries(); + } + + $return = array_pop($this->_entry_cache); + return (null === $return)? false : $return; + } + + /** + * Alias function of popEntry() for perl-ldap interface + * + * @see popEntry() + * @return Net_LDAP2_Entry|false + */ + public function pop_entry() + { + $args = func_get_args(); + return call_user_func_array(array( &$this, 'popEntry' ), $args); + } + + /** + * Return entries sorted as array + * + * This returns a array with sorted entries and the values. + * Sorting is done with PHPs {@link array_multisort()}. + * This method relies on {@link as_struct()} to fetch the raw data of the entries. + * + * Please note that attribute names are case sensitive! + * + * Usage example: + * + * // to sort entries first by location, then by surename, but descending: + * $entries = $search->sorted_as_struct(array('locality','sn'), SORT_DESC); + * + * + * @param array $attrs Array of attribute names to sort; order from left to right. + * @param int $order Ordering direction, either constant SORT_ASC or SORT_DESC + * + * @return array|Net_LDAP2_Error Array with sorted entries or error + * @todo what about server side sorting as specified in http://www.ietf.org/rfc/rfc2891.txt? + */ + public function sorted_as_struct($attrs = array('cn'), $order = SORT_ASC) + { + /* + * Old Code, suitable and fast for single valued sorting + * This code should be used if we know that single valued sorting is desired, + * but we need some method to get that knowledge... + */ + /* + $attrs = array_reverse($attrs); + foreach ($attrs as $attribute) { + if (!ldap_sort($this->_link, $this->_search, $attribute)){ + $this->raiseError("Sorting failed for Attribute " . $attribute); + } + } + + $results = ldap_get_entries($this->_link, $this->_search); + + unset($results['count']); //for tidier output + if ($order) { + return array_reverse($results); + } else { + return $results; + }*/ + + /* + * New code: complete "client side" sorting + */ + // first some parameterchecks + if (!is_array($attrs)) { + return PEAR::raiseError("Sorting failed: Parameterlist must be an array!"); + } + if ($order != SORT_ASC && $order != SORT_DESC) { + return PEAR::raiseError("Sorting failed: sorting direction not understood! (neither constant SORT_ASC nor SORT_DESC)"); + } + + // fetch the entries data + $entries = $this->as_struct(); + + // now sort each entries attribute values + // this is neccessary because later we can only sort by one value, + // so we need the highest or lowest attribute now, depending on the + // selected ordering for that specific attribute + foreach ($entries as $dn => $entry) { + foreach ($entry as $attr_name => $attr_values) { + sort($entries[$dn][$attr_name]); + if ($order == SORT_DESC) { + array_reverse($entries[$dn][$attr_name]); + } + } + } + + // reformat entrys array for later use with array_multisort() + $to_sort = array(); // <- will be a numeric array similar to ldap_get_entries + foreach ($entries as $dn => $entry_attr) { + $row = array(); + $row['dn'] = $dn; + foreach ($entry_attr as $attr_name => $attr_values) { + $row[$attr_name] = $attr_values; + } + $to_sort[] = $row; + } + + // Build columns for array_multisort() + // each requested attribute is one row + $columns = array(); + foreach ($attrs as $attr_name) { + foreach ($to_sort as $key => $row) { + $columns[$attr_name][$key] =& $to_sort[$key][$attr_name][0]; + } + } + + // sort the colums with array_multisort, if there is something + // to sort and if we have requested sort columns + if (!empty($to_sort) && !empty($columns)) { + $sort_params = ''; + foreach ($attrs as $attr_name) { + $sort_params .= '$columns[\''.$attr_name.'\'], '.$order.', '; + } + eval("array_multisort($sort_params \$to_sort);"); // perform sorting + } + + return $to_sort; + } + + /** + * Return entries sorted as objects + * + * This returns a array with sorted Net_LDAP2_Entry objects. + * The sorting is actually done with {@link sorted_as_struct()}. + * + * Please note that attribute names are case sensitive! + * Also note, that it is (depending on server capabilitys) possible to let + * the server sort your results. This happens through search controls + * and is described in detail at {@link http://www.ietf.org/rfc/rfc2891.txt} + * + * Usage example: + * + * // to sort entries first by location, then by surename, but descending: + * $entries = $search->sorted(array('locality','sn'), SORT_DESC); + * + * + * @param array $attrs Array of sort attributes to sort; order from left to right. + * @param int $order Ordering direction, either constant SORT_ASC or SORT_DESC + * + * @return array|Net_LDAP2_Error Array with sorted Net_LDAP2_Entries or error + * @todo Entry object construction could be faster. Maybe we could use one of the factorys instead of fetching the entry again + */ + public function sorted($attrs = array('cn'), $order = SORT_ASC) + { + $return = array(); + $sorted = $this->sorted_as_struct($attrs, $order); + if (PEAR::isError($sorted)) { + return $sorted; + } + foreach ($sorted as $key => $row) { + $entry = $this->_ldap->getEntry($row['dn'], $this->searchedAttrs()); + if (!PEAR::isError($entry)) { + array_push($return, $entry); + } else { + return $entry; + } + } + return $return; + } + + /** + * Return entries as array + * + * This method returns the entries and the selected attributes values as + * array. + * The first array level contains all found entries where the keys are the + * DNs of the entries. The second level arrays contian the entries attributes + * such that the keys is the lowercased name of the attribute and the values + * are stored in another indexed array. Note that the attribute values are stored + * in an array even if there is no or just one value. + * + * The array has the following structure: + * + * $return = array( + * 'cn=foo,dc=example,dc=com' => array( + * 'sn' => array('foo'), + * 'multival' => array('val1', 'val2', 'valN') + * ) + * 'cn=bar,dc=example,dc=com' => array( + * 'sn' => array('bar'), + * 'multival' => array('val1', 'valN') + * ) + * ) + * + * + * @return array associative result array as described above + */ + public function as_struct() + { + $return = array(); + $entries = $this->entries(); + foreach ($entries as $entry) { + $attrs = array(); + $entry_attributes = $entry->attributes(); + foreach ($entry_attributes as $attr_name) { + $attr_values = $entry->getValue($attr_name, 'all'); + if (!is_array($attr_values)) { + $attr_values = array($attr_values); + } + $attrs[$attr_name] = $attr_values; + } + $return[$entry->dn()] = $attrs; + } + return $return; + } + + /** + * Set the search objects resource link + * + * @param resource &$search Search result identifier + * + * @access public + * @return void + */ + public function setSearch(&$search) + { + $this->_search = $search; + } + + /** + * Set the ldap ressource link + * + * @param resource &$link Link identifier + * + * @access public + * @return void + */ + public function setLink(&$link) + { + $this->_link = $link; + } + + /** + * Returns the number of entries in the searchresult + * + * @return int Number of entries in search. + */ + public function count() + { + // this catches the situation where OL returned errno 32 = no such object! + if (!$this->_search) { + return 0; + } + return @ldap_count_entries($this->_link, $this->_search); + } + + /** + * Get the errorcode the object got in its search. + * + * @return int The ldap error number. + */ + public function getErrorCode() + { + return $this->_errorCode; + } + + /** + * Destructor + * + * @access protected + */ + public function _Net_LDAP2_Search() + { + @ldap_free_result($this->_search); + } + + /** + * Closes search result + * + * @return void + */ + public function done() + { + $this->_Net_LDAP2_Search(); + } + + /** + * Return the attribute names this search selected + * + * @return array + * @see $_searchedAttrs + * @access protected + */ + protected function searchedAttrs() + { + return $this->_searchedAttrs; + } + + /** + * Tells if this search exceeds a sizelimit + * + * @return boolean + */ + public function sizeLimitExceeded() + { + return ($this->getErrorCode() == 4); + } + + + /* + * SPL Iterator interface methods. + * This interface allows to use Net_LDAP2_Search + * objects directly inside a foreach loop! + */ + /** + * SPL Iterator interface: Return the current element. + * + * The SPL Iterator interface allows you to fetch entries inside + * a foreach() loop: foreach ($search as $dn => $entry) { ... + * + * Of course, you may call {@link current()}, {@link key()}, {@link next()}, + * {@link rewind()} and {@link valid()} yourself. + * + * If the search throwed an error, it returns false. + * False is also returned, if the end is reached + * In case no call to next() was made, we will issue one, + * thus returning the first entry. + * + * @return Net_LDAP2_Entry|false + */ + public function current() + { + if (count($this->_iteratorCache) == 0) { + $this->next(); + reset($this->_iteratorCache); + } + $entry = current($this->_iteratorCache); + return ($entry instanceof Net_LDAP2_Entry)? $entry : false; + } + + /** + * SPL Iterator interface: Return the identifying key (DN) of the current entry. + * + * @see current() + * @return string|false DN of the current entry; false in case no entry is returned by current() + */ + public function key() + { + $entry = $this->current(); + return ($entry instanceof Net_LDAP2_Entry)? $entry->dn() :false; + } + + /** + * SPL Iterator interface: Move forward to next entry. + * + * After a call to {@link next()}, {@link current()} will return + * the next entry in the result set. + * + * @see current() + * @return void + */ + public function next() + { + // fetch next entry. + // if we have no entrys anymore, we add false (which is + // returned by shiftEntry()) so current() will complain. + if (count($this->_iteratorCache) - 1 <= $this->count()) { + $this->_iteratorCache[] = $this->shiftEntry(); + } + + // move on array pointer to current element. + // even if we have added all entries, this will + // ensure proper operation in case we rewind() + next($this->_iteratorCache); + } + + /** + * SPL Iterator interface: Check if there is a current element after calls to {@link rewind()} or {@link next()}. + * + * Used to check if we've iterated to the end of the collection. + * + * @see current() + * @return boolean FALSE if there's nothing more to iterate over + */ + public function valid() + { + return ($this->current() instanceof Net_LDAP2_Entry); + } + + /** + * SPL Iterator interface: Rewind the Iterator to the first element. + * + * After rewinding, {@link current()} will return the first entry in the result set. + * + * @see current() + * @return void + */ + public function rewind() + { + reset($this->_iteratorCache); + } +} + +?> diff --git a/plugins/LdapCommon/extlib/Net/LDAP2/SimpleFileSchemaCache.php b/plugins/LdapCommon/extlib/Net/LDAP2/SimpleFileSchemaCache.php new file mode 100644 index 000000000..8019654ac --- /dev/null +++ b/plugins/LdapCommon/extlib/Net/LDAP2/SimpleFileSchemaCache.php @@ -0,0 +1,97 @@ + +* @copyright 2009 Benedikt Hallinger +* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 +* @version SVN: $Id: SimpleFileSchemaCache.php 286718 2009-08-03 07:30:49Z beni $ +* @link http://pear.php.net/package/Net_LDAP2/ +*/ + +/** +* A simple file based schema cacher with cache aging. +* +* Once the cache is too old, the loadSchema() method will return false, so +* Net_LDAP2 will fetch a fresh object from the LDAP server that will +* overwrite the current (outdated) old cache. +*/ +class Net_LDAP2_SimpleFileSchemaCache implements Net_LDAP2_SchemaCache +{ + /** + * Internal config of this cache + * + * @see Net_LDAP2_SimpleFileSchemaCache() + * @var array + */ + protected $config = array( + 'path' => '/tmp/Net_LDAP_Schema.cache', + 'max_age' => 1200 + ); + + /** + * Initialize the simple cache + * + * Config is as following: + * path Complete path to the cache file. + * max_age Maximum age of cache in seconds, 0 means "endlessly". + * + * @param array $cfg Config array + */ + public function Net_LDAP2_SimpleFileSchemaCache($cfg) + { + foreach ($cfg as $key => $value) { + if (array_key_exists($key, $this->config)) { + if (gettype($this->config[$key]) != gettype($value)) { + $this->getCore()->dropFatalError(__CLASS__.": Could not set config! Key $key does not match type ".gettype($this->config[$key])."!"); + } + $this->config[$key] = $value; + } else { + $this->getCore()->dropFatalError(__CLASS__.": Could not set config! Key $key is not defined!"); + } + } + } + + /** + * Return the schema object from the cache + * + * If file is existent and cache has not expired yet, + * then the cache is deserialized and returned. + * + * @return Net_LDAP2_Schema|Net_LDAP2_Error|false + */ + public function loadSchema() + { + $return = false; // Net_LDAP2 will load schema from LDAP + if (file_exists($this->config['path'])) { + $cache_maxage = filemtime($this->config['path']) + $this->config['max_age']; + if (time() <= $cache_maxage || $this->config['max_age'] == 0) { + $return = unserialize(file_get_contents($this->config['path'])); + } + } + return $return; + } + + /** + * Store a schema object in the cache + * + * This method will be called, if Net_LDAP2 has fetched a fresh + * schema object from LDAP and wants to init or refresh the cache. + * + * To invalidate the cache and cause Net_LDAP2 to refresh the cache, + * you can call this method with null or false as value. + * The next call to $ldap->schema() will then refresh the caches object. + * + * @param mixed $schema The object that should be cached + * @return true|Net_LDAP2_Error|false + */ + public function storeSchema($schema) { + file_put_contents($this->config['path'], serialize($schema)); + return true; + } +} diff --git a/plugins/LdapCommon/extlib/Net/LDAP2/Util.php b/plugins/LdapCommon/extlib/Net/LDAP2/Util.php new file mode 100644 index 000000000..48b03f9f9 --- /dev/null +++ b/plugins/LdapCommon/extlib/Net/LDAP2/Util.php @@ -0,0 +1,572 @@ + +* @copyright 2009 Benedikt Hallinger +* @license http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3 +* @version SVN: $Id: Util.php 286718 2009-08-03 07:30:49Z beni $ +* @link http://pear.php.net/package/Net_LDAP2/ +*/ + +/** +* Includes +*/ +require_once 'PEAR.php'; + +/** +* Utility Class for Net_LDAP2 +* +* This class servers some functionality to the other classes of Net_LDAP2 but most of +* the methods can be used separately as well. +* +* @category Net +* @package Net_LDAP2 +* @author Benedikt Hallinger +* @license http://www.gnu.org/copyleft/lesser.html LGPL +* @link http://pear.php.net/package/Net_LDAP22/ +*/ +class Net_LDAP2_Util extends PEAR +{ + /** + * Constructor + * + * @access public + */ + public function __construct() + { + // We do nothing here, since all methods can be called statically. + // In Net_LDAP <= 0.7, we needed a instance of Util, because + // it was possible to do utf8 encoding and decoding, but this + // has been moved to the LDAP class. The constructor remains only + // here to document the downward compatibility of creating an instance. + } + + /** + * Explodes the given DN into its elements + * + * {@link http://www.ietf.org/rfc/rfc2253.txt RFC 2253} says, a Distinguished Name is a sequence + * of Relative Distinguished Names (RDNs), which themselves + * are sets of Attributes. For each RDN a array is constructed where the RDN part is stored. + * + * For example, the DN 'OU=Sales+CN=J. Smith,DC=example,DC=net' is exploded to: + * array( [0] => array([0] => 'OU=Sales', [1] => 'CN=J. Smith'), [2] => 'DC=example', [3] => 'DC=net' ) + * + * [NOT IMPLEMENTED] DNs might also contain values, which are the bytes of the BER encoding of + * the X.500 AttributeValue rather than some LDAP string syntax. These values are hex-encoded + * and prefixed with a #. To distinguish such BER values, ldap_explode_dn uses references to + * the actual values, e.g. '1.3.6.1.4.1.1466.0=#04024869,DC=example,DC=com' is exploded to: + * [ { '1.3.6.1.4.1.1466.0' => "\004\002Hi" }, { 'DC' => 'example' }, { 'DC' => 'com' } ]; + * See {@link http://www.vijaymukhi.com/vmis/berldap.htm} for more information on BER. + * + * It also performs the following operations on the given DN: + * - Unescape "\" followed by ",", "+", """, "\", "<", ">", ";", "#", "=", " ", or a hexpair + * and strings beginning with "#". + * - Removes the leading 'OID.' characters if the type is an OID instead of a name. + * - If an RDN contains multiple parts, the parts are re-ordered so that the attribute type names are in alphabetical order. + * + * OPTIONS is a list of name/value pairs, valid options are: + * casefold Controls case folding of attribute types names. + * Attribute values are not affected by this option. + * The default is to uppercase. Valid values are: + * lower Lowercase attribute types names. + * upper Uppercase attribute type names. This is the default. + * none Do not change attribute type names. + * reverse If TRUE, the RDN sequence is reversed. + * onlyvalues If TRUE, then only attributes values are returned ('foo' instead of 'cn=foo') + * + + * @param string $dn The DN that should be exploded + * @param array $options Options to use + * + * @static + * @return array Parts of the exploded DN + * @todo implement BER + */ + public static function ldap_explode_dn($dn, $options = array('casefold' => 'upper')) + { + if (!isset($options['onlyvalues'])) $options['onlyvalues'] = false; + if (!isset($options['reverse'])) $options['reverse'] = false; + if (!isset($options['casefold'])) $options['casefold'] = 'upper'; + + // Escaping of DN and stripping of "OID." + $dn = self::canonical_dn($dn, array('casefold' => $options['casefold'])); + + // splitting the DN + $dn_array = preg_split('/(?<=[^\\\\]),/', $dn); + + // clear wrong splitting (possibly we have split too much) + // /!\ Not clear, if this is neccessary here + //$dn_array = self::correct_dn_splitting($dn_array, ','); + + // construct subarrays for multivalued RDNs and unescape DN value + // also convert to output format and apply casefolding + foreach ($dn_array as $key => $value) { + $value_u = self::unescape_dn_value($value); + $rdns = self::split_rdn_multival($value_u[0]); + if (count($rdns) > 1) { + // MV RDN! + foreach ($rdns as $subrdn_k => $subrdn_v) { + // Casefolding + if ($options['casefold'] == 'upper') $subrdn_v = preg_replace("/^(\w+=)/e", "''.strtoupper('\\1').''", $subrdn_v); + if ($options['casefold'] == 'lower') $subrdn_v = preg_replace("/^(\w+=)/e", "''.strtolower('\\1').''", $subrdn_v); + + if ($options['onlyvalues']) { + preg_match('/(.+?)(?", ";", "#", "=" with a special meaning in RFC 2252 + * are preceeded by ba backslash. Control characters with an ASCII code < 32 are represented as \hexpair. + * Finally all leading and trailing spaces are converted to sequences of \20. + * + * @param array $values An array containing the DN values that should be escaped + * + * @static + * @return array The array $values, but escaped + */ + public static function escape_dn_value($values = array()) + { + // Parameter validation + if (!is_array($values)) { + $values = array($values); + } + + foreach ($values as $key => $val) { + // Escaping of filter meta characters + $val = str_replace('\\', '\\\\', $val); + $val = str_replace(',', '\,', $val); + $val = str_replace('+', '\+', $val); + $val = str_replace('"', '\"', $val); + $val = str_replace('<', '\<', $val); + $val = str_replace('>', '\>', $val); + $val = str_replace(';', '\;', $val); + $val = str_replace('#', '\#', $val); + $val = str_replace('=', '\=', $val); + + // ASCII < 32 escaping + $val = self::asc2hex32($val); + + // Convert all leading and trailing spaces to sequences of \20. + if (preg_match('/^(\s*)(.+?)(\s*)$/', $val, $matches)) { + $val = $matches[2]; + for ($i = 0; $i < strlen($matches[1]); $i++) { + $val = '\20'.$val; + } + for ($i = 0; $i < strlen($matches[3]); $i++) { + $val = $val.'\20'; + } + } + + if (null === $val) $val = '\0'; // apply escaped "null" if string is empty + + $values[$key] = $val; + } + + return $values; + } + + /** + * Undoes the conversion done by escape_dn_value(). + * + * Any escape sequence starting with a baskslash - hexpair or special character - + * will be transformed back to the corresponding character. + * + * @param array $values Array of DN Values + * + * @return array Same as $values, but unescaped + * @static + */ + public static function unescape_dn_value($values = array()) + { + // Parameter validation + if (!is_array($values)) { + $values = array($values); + } + + foreach ($values as $key => $val) { + // strip slashes from special chars + $val = str_replace('\\\\', '\\', $val); + $val = str_replace('\,', ',', $val); + $val = str_replace('\+', '+', $val); + $val = str_replace('\"', '"', $val); + $val = str_replace('\<', '<', $val); + $val = str_replace('\>', '>', $val); + $val = str_replace('\;', ';', $val); + $val = str_replace('\#', '#', $val); + $val = str_replace('\=', '=', $val); + + // Translate hex code into ascii + $values[$key] = self::hex2asc($val); + } + + return $values; + } + + /** + * Returns the given DN in a canonical form + * + * Returns false if DN is not a valid Distinguished Name. + * DN can either be a string or an array + * as returned by ldap_explode_dn, which is useful when constructing a DN. + * The DN array may have be indexed (each array value is a OCL=VALUE pair) + * or associative (array key is OCL and value is VALUE). + * + * It performs the following operations on the given DN: + * - Removes the leading 'OID.' characters if the type is an OID instead of a name. + * - Escapes all RFC 2253 special characters (",", "+", """, "\", "<", ">", ";", "#", "="), slashes ("/"), and any other character where the ASCII code is < 32 as \hexpair. + * - Converts all leading and trailing spaces in values to be \20. + * - If an RDN contains multiple parts, the parts are re-ordered so that the attribute type names are in alphabetical order. + * + * OPTIONS is a list of name/value pairs, valid options are: + * casefold Controls case folding of attribute type names. + * Attribute values are not affected by this option. The default is to uppercase. + * Valid values are: + * lower Lowercase attribute type names. + * upper Uppercase attribute type names. This is the default. + * none Do not change attribute type names. + * [NOT IMPLEMENTED] mbcescape If TRUE, characters that are encoded as a multi-octet UTF-8 sequence will be escaped as \(hexpair){2,*}. + * reverse If TRUE, the RDN sequence is reversed. + * separator Separator to use between RDNs. Defaults to comma (','). + * + * Note: The empty string "" is a valid DN, so be sure not to do a "$can_dn == false" test, + * because an empty string evaluates to false. Use the "===" operator instead. + * + * @param array|string $dn The DN + * @param array $options Options to use + * + * @static + * @return false|string The canonical DN or FALSE + * @todo implement option mbcescape + */ + public static function canonical_dn($dn, $options = array('casefold' => 'upper', 'separator' => ',')) + { + if ($dn === '') return $dn; // empty DN is valid! + + // options check + if (!isset($options['reverse'])) { + $options['reverse'] = false; + } else { + $options['reverse'] = true; + } + if (!isset($options['casefold'])) $options['casefold'] = 'upper'; + if (!isset($options['separator'])) $options['separator'] = ','; + + + if (!is_array($dn)) { + // It is not clear to me if the perl implementation splits by the user defined + // separator or if it just uses this separator to construct the new DN + $dn = preg_split('/(?<=[^\\\\])'.$options['separator'].'/', $dn); + + // clear wrong splitting (possibly we have split too much) + $dn = self::correct_dn_splitting($dn, $options['separator']); + } else { + // Is array, check, if the array is indexed or associative + $assoc = false; + foreach ($dn as $dn_key => $dn_part) { + if (!is_int($dn_key)) { + $assoc = true; + } + } + // convert to indexed, if associative array detected + if ($assoc) { + $newdn = array(); + foreach ($dn as $dn_key => $dn_part) { + if (is_array($dn_part)) { + ksort($dn_part, SORT_STRING); // we assume here, that the rdn parts are also associative + $newdn[] = $dn_part; // copy array as-is, so we can resolve it later + } else { + $newdn[] = $dn_key.'='.$dn_part; + } + } + $dn =& $newdn; + } + } + + // Escaping and casefolding + foreach ($dn as $pos => $dnval) { + if (is_array($dnval)) { + // subarray detected, this means very surely, that we had + // a multivalued dn part, which must be resolved + $dnval_new = ''; + foreach ($dnval as $subkey => $subval) { + // build RDN part + if (!is_int($subkey)) { + $subval = $subkey.'='.$subval; + } + $subval_processed = self::canonical_dn($subval); + if (false === $subval_processed) return false; + $dnval_new .= $subval_processed.'+'; + } + $dn[$pos] = substr($dnval_new, 0, -1); // store RDN part, strip last plus + } else { + // try to split multivalued RDNS into array + $rdns = self::split_rdn_multival($dnval); + if (count($rdns) > 1) { + // Multivalued RDN was detected! + // The RDN value is expected to be correctly split by split_rdn_multival(). + // It's time to sort the RDN and build the DN! + $rdn_string = ''; + sort($rdns, SORT_STRING); // Sort RDN keys alphabetically + foreach ($rdns as $rdn) { + $subval_processed = self::canonical_dn($rdn); + if (false === $subval_processed) return false; + $rdn_string .= $subval_processed.'+'; + } + + $dn[$pos] = substr($rdn_string, 0, -1); // store RDN part, strip last plus + + } else { + // no multivalued RDN! + // split at first unescaped "=" + $dn_comp = preg_split('/(?<=[^\\\\])=/', $rdns[0], 2); + $ocl = ltrim($dn_comp[0]); // trim left whitespaces 'cause of "cn=foo, l=bar" syntax (whitespace after comma) + $val = $dn_comp[1]; + + // strip 'OID.', otherwise apply casefolding and escaping + if (substr(strtolower($ocl), 0, 4) == 'oid.') { + $ocl = substr($ocl, 4); + } else { + if ($options['casefold'] == 'upper') $ocl = strtoupper($ocl); + if ($options['casefold'] == 'lower') $ocl = strtolower($ocl); + $ocl = self::escape_dn_value(array($ocl)); + $ocl = $ocl[0]; + } + + // escaping of dn-value + $val = self::escape_dn_value(array($val)); + $val = str_replace('/', '\/', $val[0]); + + $dn[$pos] = $ocl.'='.$val; + } + } + } + + if ($options['reverse']) $dn = array_reverse($dn); + return implode($options['separator'], $dn); + } + + /** + * Escapes the given VALUES according to RFC 2254 so that they can be safely used in LDAP filters. + * + * Any control characters with an ACII code < 32 as well as the characters with special meaning in + * LDAP filters "*", "(", ")", and "\" (the backslash) are converted into the representation of a + * backslash followed by two hex digits representing the hexadecimal value of the character. + * + * @param array $values Array of values to escape + * + * @static + * @return array Array $values, but escaped + */ + public static function escape_filter_value($values = array()) + { + // Parameter validation + if (!is_array($values)) { + $values = array($values); + } + + foreach ($values as $key => $val) { + // Escaping of filter meta characters + $val = str_replace('\\', '\5c', $val); + $val = str_replace('*', '\2a', $val); + $val = str_replace('(', '\28', $val); + $val = str_replace(')', '\29', $val); + + // ASCII < 32 escaping + $val = self::asc2hex32($val); + + if (null === $val) $val = '\0'; // apply escaped "null" if string is empty + + $values[$key] = $val; + } + + return $values; + } + + /** + * Undoes the conversion done by {@link escape_filter_value()}. + * + * Converts any sequences of a backslash followed by two hex digits into the corresponding character. + * + * @param array $values Array of values to escape + * + * @static + * @return array Array $values, but unescaped + */ + public static function unescape_filter_value($values = array()) + { + // Parameter validation + if (!is_array($values)) { + $values = array($values); + } + + foreach ($values as $key => $value) { + // Translate hex code into ascii + $values[$key] = self::hex2asc($value); + } + + return $values; + } + + /** + * Converts all ASCII chars < 32 to "\HEX" + * + * @param string $string String to convert + * + * @static + * @return string + */ + public static function asc2hex32($string) + { + for ($i = 0; $i < strlen($string); $i++) { + $char = substr($string, $i, 1); + if (ord($char) < 32) { + $hex = dechex(ord($char)); + if (strlen($hex) == 1) $hex = '0'.$hex; + $string = str_replace($char, '\\'.$hex, $string); + } + } + return $string; + } + + /** + * Converts all Hex expressions ("\HEX") to their original ASCII characters + * + * @param string $string String to convert + * + * @static + * @author beni@php.net, heavily based on work from DavidSmith@byu.net + * @return string + */ + public static function hex2asc($string) + { + $string = preg_replace("/\\\([0-9A-Fa-f]{2})/e", "''.chr(hexdec('\\1')).''", $string); + return $string; + } + + /** + * Split an multivalued RDN value into an Array + * + * A RDN can contain multiple values, spearated by a plus sign. + * This function returns each separate ocl=value pair of the RDN part. + * + * If no multivalued RDN is detected, an array containing only + * the original rdn part is returned. + * + * For example, the multivalued RDN 'OU=Sales+CN=J. Smith' is exploded to: + * array([0] => 'OU=Sales', [1] => 'CN=J. Smith') + * + * The method trys to be smart if it encounters unescaped "+" characters, but may fail, + * so ensure escaped "+"es in attr names and attr values. + * + * [BUG] If you have a multivalued RDN with unescaped plus characters + * and there is a unescaped plus sign at the end of an value followed by an + * attribute name containing an unescaped plus, then you will get wrong splitting: + * $rdn = 'OU=Sales+C+N=J. Smith'; + * returns: + * array('OU=Sales+C', 'N=J. Smith'); + * The "C+" is treaten as value of the first pair instead as attr name of the second pair. + * To prevent this, escape correctly. + * + * @param string $rdn Part of an (multivalued) escaped RDN (eg. ou=foo OR ou=foo+cn=bar) + * + * @static + * @return array Array with the components of the multivalued RDN or Error + */ + public static function split_rdn_multival($rdn) + { + $rdns = preg_split('/(? $dn_value) { + $dn_value = $dn[$key]; // refresh value (foreach caches!) + // if the dn_value is not in attr=value format, then we had an + // unescaped separator character inside the attr name or the value. + // We assume, that it was the attribute value. + // [TODO] To solve this, we might ask the schema. Keep in mind, that UTIL class + // must remain independent from the other classes or connections. + if (!preg_match('/.+(? -- cgit v1.2.3-54-g00ecf From abe4be5438180f5e4f7618f60112023e5ccd788e Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Tue, 23 Mar 2010 22:42:30 -0400 Subject: Use $param instead of hardcoded 'attach' name. --- lib/mediafile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mediafile.php b/lib/mediafile.php index 10d90d008..1c96c42d7 100644 --- a/lib/mediafile.php +++ b/lib/mediafile.php @@ -171,7 +171,7 @@ class MediaFile return; } - if (!MediaFile::respectsQuota($user, $_FILES['attach']['size'])) { + if (!MediaFile::respectsQuota($user, $_FILES[$param]['size'])) { // Should never actually get here -- cgit v1.2.3-54-g00ecf From a3da5b24c9fc602e147304333ac059d0aae13de7 Mon Sep 17 00:00:00 2001 From: Julien C Date: Sun, 7 Feb 2010 18:29:42 +0100 Subject: Misc small fixes, plus a new hook in tag.php --- EVENTS.txt | 2 +- actions/tag.php | 13 +++++++++---- plugins/RSSCloud/RSSCloudPlugin.php | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/EVENTS.txt b/EVENTS.txt index 2da6f3da6..cf9c6123f 100644 --- a/EVENTS.txt +++ b/EVENTS.txt @@ -141,7 +141,7 @@ StartLogout: Before logging out EndLogout: After logging out - $action: the logout action -ArgsInitialized: After the argument array has been initialized +ArgsInitialize: After the argument array has been initialized - $args: associative array of arguments, can be modified StartAddressData: Allows the site owner to provide additional information about themselves for contact (e.g., tagline, email, location) diff --git a/actions/tag.php b/actions/tag.php index ee9617b66..72668a0c9 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -102,12 +102,17 @@ class TagAction extends Action function showContent() { - $nl = new NoticeList($this->notice, $this); + if(Event::handle('StartTagShowContent', array($this))) { + + $nl = new NoticeList($this->notice, $this); - $cnt = $nl->show(); + $cnt = $nl->show(); - $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE, - $this->page, 'tag', array('tag' => $this->tag)); + $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE, + $this->page, 'tag', array('tag' => $this->tag)); + + Event::handle('EndTagShowContent', array($this)) + } } function isReadOnly($args) diff --git a/plugins/RSSCloud/RSSCloudPlugin.php b/plugins/RSSCloud/RSSCloudPlugin.php index 9f444c8bb..001106ace 100644 --- a/plugins/RSSCloud/RSSCloudPlugin.php +++ b/plugins/RSSCloud/RSSCloudPlugin.php @@ -105,7 +105,7 @@ class RSSCloudPlugin extends Plugin * @return boolean hook return */ - function onRouterInitialized(&$m) + function onRouterInitialized($m) { $m->connect('/main/rsscloud/request_notify', array('action' => 'RSSCloudRequestNotify')); -- cgit v1.2.3-54-g00ecf From 7b1b6045e61973b8835e7253d6b532a752535297 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 24 Mar 2010 00:00:55 -0700 Subject: Look for the first object in the Activity --- plugins/OStatus/actions/usersalmon.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/OStatus/actions/usersalmon.php b/plugins/OStatus/actions/usersalmon.php index ecdcfa193..6c360c49f 100644 --- a/plugins/OStatus/actions/usersalmon.php +++ b/plugins/OStatus/actions/usersalmon.php @@ -92,7 +92,7 @@ class UsersalmonAction extends SalmonAction throw new ClientException("Not to anyone in reply to anything!"); } - $existing = Notice::staticGet('uri', $this->act->object->id); + $existing = Notice::staticGet('uri', $this->act->objects[0]->id); if (!empty($existing)) { common_log(LOG_ERR, "Not saving notice '{$existing->uri}'; already exists."); @@ -143,7 +143,7 @@ class UsersalmonAction extends SalmonAction function handleFavorite() { - $notice = $this->getNotice($this->act->object); + $notice = $this->getNotice($this->act->objects[0]); $profile = $this->ensureProfile()->localProfile(); $old = Fave::pkeyGet(array('user_id' => $profile->id, @@ -164,7 +164,7 @@ class UsersalmonAction extends SalmonAction */ function handleUnfavorite() { - $notice = $this->getNotice($this->act->object); + $notice = $this->getNotice($this->act->objects[0]); $profile = $this->ensureProfile()->localProfile(); $fave = Fave::pkeyGet(array('user_id' => $profile->id, -- cgit v1.2.3-54-g00ecf From 647b3a1f6bff2f0c8f02ea65939ebde088742b16 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 24 Mar 2010 14:50:12 +0100 Subject: Moved print inside base stylesheet using media rules. One less HTTP GET. --- lib/action.php | 3 +-- theme/base/css/display.css | 32 ++++++++++++++++++++++++++++++++ theme/biz/css/base.css | 32 ++++++++++++++++++++++++++++++++ theme/biz/css/display.css | 3 ++- theme/cloudy/css/display.css | 30 ++++++++++++++++++++++++++++++ theme/default/css/display.css | 4 +++- theme/h4ck3r/css/base.css | 32 ++++++++++++++++++++++++++++++++ theme/h4ck3r/css/display.css | 5 ++++- theme/identica/css/display.css | 4 +++- theme/pigeonthoughts/css/base.css | 32 ++++++++++++++++++++++++++++++++ theme/pigeonthoughts/css/display.css | 4 +++- 11 files changed, 174 insertions(+), 7 deletions(-) diff --git a/lib/action.php b/lib/action.php index 491d7d481..09113a598 100644 --- a/lib/action.php +++ b/lib/action.php @@ -198,8 +198,7 @@ class Action extends HTMLOutputter // lawsuit if (Event::handle('StartShowStatusNetStyles', array($this)) && Event::handle('StartShowLaconicaStyles', array($this))) { - $this->cssLink('css/display.css',null,'screen, projection, tv'); - $this->cssLink('css/print.css','base','print'); + $this->cssLink('css/display.css',null, 'screen, projection, tv, print'); Event::handle('EndShowStatusNetStyles', array($this)); Event::handle('EndShowLaconicaStyles', array($this)); } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index d58684efb..36f0533b1 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -7,6 +7,7 @@ * @link http://status.net/ */ +@media screen, projection, tv { * { margin:0; padding:0; } img { display:block; border:0; } a abbr { cursor: pointer; border-bottom:0; } @@ -1688,3 +1689,34 @@ width:auto; #bookmarklet #wrap { min-width:0; } + +}/*end of @media screen, projection, tv*/ + + +@media print { +a:after { background-color:#FFFFFF; } +a:not([href^="#"]):after { content:" <"attr(href)"> "; } +img { border:none; } +p { orphans: 2; widows: 1; } + +#site_nav_global_primary, +#site_nav_local_views, +#form_notice, +.pagination, +#site_nav_global_secondary, +.entity_actions, +.notice-options, +#aside_primary, +.form_subscription_edit .submit { +display:none; +} +.timestamp dt, .timestamp dd, +.device dt, .device dd { +display:inline; +} +.profiles li, +.notices li { +margin-bottom:18px; +} + +}/*end of @media print*/ diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 2c2ab33a0..43b8e4656 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -7,6 +7,7 @@ * @link http://status.net/ */ +@media screen, projection, tv { * { margin:0; padding:0; } img { display:block; border:0; } a abbr { cursor: pointer; border-bottom:0; } @@ -1358,3 +1359,34 @@ display:none; .guide { clear:both; } + +}/*end of @media screen, projection, tv*/ + + +@media print { +a:after { background-color:#FFFFFF; } +a:not([href^="#"]):after { content:" <"attr(href)"> "; } +img { border:none; } +p { orphans: 2; widows: 1; } + +#site_nav_global_primary, +#site_nav_local_views, +#form_notice, +.pagination, +#site_nav_global_secondary, +.entity_actions, +.notice-options, +#aside_primary, +.form_subscription_edit .submit { +display:none; +} +.timestamp dt, .timestamp dd, +.device dt, .device dd { +display:inline; +} +.profiles li, +.notices li { +margin-bottom:18px; +} + +}/*end of @media print*/ diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css index 3e97444f1..cafb152dc 100644 --- a/theme/biz/css/display.css +++ b/theme/biz/css/display.css @@ -7,8 +7,9 @@ * @link http://status.net/ */ -@import url(base.css); +@import url(base.css) screen, projection, tv, print; +@media screen, projection, tv { html { background-color:#144A6E; } diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css index 5bc32e6d9..d9e9f3ce2 100644 --- a/theme/cloudy/css/display.css +++ b/theme/cloudy/css/display.css @@ -7,6 +7,7 @@ * @link http://status.net/ */ +@media screen, projection, tv { * { margin:0; padding:0; } img { display:block; border:0; } a abbr { cursor: pointer; border-bottom:0; } @@ -2099,4 +2100,33 @@ border-left-color:#FFFFFF; #footer { background-color:#FFFFFF; } +}/*end of @media screen, projection, tv*/ + +@media print { +a:after { background-color:#FFFFFF; } +a:not([href^="#"]):after { content:" <"attr(href)"> "; } +img { border:none; } +p { orphans: 2; widows: 1; } + +#site_nav_global_primary, +#site_nav_local_views, +#form_notice, +.pagination, +#site_nav_global_secondary, +.entity_actions, +.notice-options, +#aside_primary, +.form_subscription_edit .submit { +display:none; +} +.timestamp dt, .timestamp dd, +.device dt, .device dd { +display:inline; +} +.profiles li, +.notices li { +margin-bottom:18px; +} + +}/*end of @media print*/ diff --git a/theme/default/css/display.css b/theme/default/css/display.css index d7f15cc46..7ccd234cd 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -7,8 +7,9 @@ * @link http://status.net/ */ -@import url(../../base/css/display.css); +@import url(../../base/css/display.css) screen, projection, tv, print; +@media screen, projection, tv { body, a:active { background-color:#CEE1E9; @@ -516,3 +517,4 @@ background-position:90% 47%; background-position:10% 47%; } +}/*end of @media screen, projection, tv*/ diff --git a/theme/h4ck3r/css/base.css b/theme/h4ck3r/css/base.css index 18ea742a5..0302653fd 100644 --- a/theme/h4ck3r/css/base.css +++ b/theme/h4ck3r/css/base.css @@ -7,6 +7,7 @@ * @link http://status.net/ */ +@media screen, projection, tv { * { margin:0; padding:0; } img { display:block; border:0; } a abbr { cursor: pointer; border-bottom:0; } @@ -1137,3 +1138,34 @@ display:none; .guide { clear:both; } + +}/*end of @media screen, projection, tv*/ + + +@media print { +a:after { background-color:#FFFFFF; } +a:not([href^="#"]):after { content:" <"attr(href)"> "; } +img { border:none; } +p { orphans: 2; widows: 1; } + +#site_nav_global_primary, +#site_nav_local_views, +#form_notice, +.pagination, +#site_nav_global_secondary, +.entity_actions, +.notice-options, +#aside_primary, +.form_subscription_edit .submit { +display:none; +} +.timestamp dt, .timestamp dd, +.device dt, .device dd { +display:inline; +} +.profiles li, +.notices li { +margin-bottom:18px; +} + +}/*end of @media print*/ diff --git a/theme/h4ck3r/css/display.css b/theme/h4ck3r/css/display.css index 58b3f242a..7112765ab 100644 --- a/theme/h4ck3r/css/display.css +++ b/theme/h4ck3r/css/display.css @@ -7,8 +7,9 @@ * @link http://status.net/ */ -@import url(base.css); +@import url(base.css) screen, projection, tv, print; +@media screen, projection, tv { html, body, a:active { @@ -234,3 +235,5 @@ background-position:10% 45%; background-image:url(../../base/images/icons/twotone/green/arrow-right.gif); background-position:90% 45%; } + +}/*end of @media screen, projection, tv*/ diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index d9f39e780..3972657a7 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -7,8 +7,9 @@ * @link http://status.net/ */ -@import url(../../base/css/display.css); +@import url(../../base/css/display.css) screen, projection, tv, print; +@media screen, projection, tv { body, a:active { background-color:#F0F2F5; @@ -515,3 +516,4 @@ background-position:90% 47%; background-position:10% 47%; } +}/*end of @media screen, projection, tv*/ diff --git a/theme/pigeonthoughts/css/base.css b/theme/pigeonthoughts/css/base.css index 2814260bd..bd12e6eaa 100644 --- a/theme/pigeonthoughts/css/base.css +++ b/theme/pigeonthoughts/css/base.css @@ -7,6 +7,7 @@ * @link http://status.net/ */ +@media screen, projection, tv { * { margin:0; padding:0; } img { display:block; border:0; } a abbr { cursor: pointer; border-bottom:0; } @@ -1383,3 +1384,34 @@ display:none; .guide { clear:both; } + +}/*end of @media screen, projection, tv*/ + + +@media print { +a:after { background-color:#FFFFFF; } +a:not([href^="#"]):after { content:" <"attr(href)"> "; } +img { border:none; } +p { orphans: 2; widows: 1; } + +#site_nav_global_primary, +#site_nav_local_views, +#form_notice, +.pagination, +#site_nav_global_secondary, +.entity_actions, +.notice-options, +#aside_primary, +.form_subscription_edit .submit { +display:none; +} +.timestamp dt, .timestamp dd, +.device dt, .device dd { +display:inline; +} +.profiles li, +.notices li { +margin-bottom:18px; +} + +}/*end of @media print*/ diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css index dfeb01b48..de5164ea8 100644 --- a/theme/pigeonthoughts/css/display.css +++ b/theme/pigeonthoughts/css/display.css @@ -7,8 +7,9 @@ * @link http://status.net/ */ -@import url(base.css); +@import url(base.css) screen, projection, tv, print; +@media screen, projection, tv { html { background:url(../images/illustrations/illu_pigeons-01.png) no-repeat 0 100%; } @@ -496,3 +497,4 @@ background-position:90% 47%; background-position:10% 47%; } +}/*end of @media screen, projection, tv*/ -- cgit v1.2.3-54-g00ecf From 5808f86584a64d6dbd12e070b268f40c043917e4 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 24 Mar 2010 15:13:38 +0100 Subject: Removed print stylesheet --- theme/base/css/print.css | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 theme/base/css/print.css diff --git a/theme/base/css/print.css b/theme/base/css/print.css deleted file mode 100644 index 094d07fed..000000000 --- a/theme/base/css/print.css +++ /dev/null @@ -1,36 +0,0 @@ -/** theme: base - * - * @package StatusNet - * @author Sarven Capadisli - * @copyright 2009 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -a:after { background-color:#fff; } -a:not([href^="#"]):after { content:" ( "attr(href)" ) "; } - -img { border:none; } -p { orphans: 2; widows: 1; } - -#site_nav_global_primary, -#site_nav_local_views, -#form_notice, -.pagination, -#site_nav_global_secondary, -.entity_actions, -.notice-options, -#aside_primary, -.form_subscription_edit .submit { -display:none; -} - -.timestamp dt, .timestamp dd, -.device dt, .device dd { -display:inline; -} - -.profiles li, -.notices li { -margin-bottom:18px; -} -- cgit v1.2.3-54-g00ecf From 10410907a0a6f1af9fb18cb3341db792baa49cf3 Mon Sep 17 00:00:00 2001 From: James Walker Date: Wed, 24 Mar 2010 14:27:35 -0400 Subject: A bit safer checking in the keypair parsing --- plugins/OStatus/lib/magicenvelope.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php index 9266cab5c..799b5e307 100644 --- a/plugins/OStatus/lib/magicenvelope.php +++ b/plugins/OStatus/lib/magicenvelope.php @@ -59,12 +59,21 @@ class MagicEnvelope } if ($xrd->links) { if ($link = Discovery::getService($xrd->links, Magicsig::PUBLICKEYREL)) { - list($type, $keypair) = explode(',', $link['href']); - if (empty($keypair)) { + $keypair = false; + $parts = explode(',', $link['href']); + if (count($parts) == 2) { + $keypair = $parts[1]; + } else { // Backwards compatibility check for separator bug in 0.9.0 - list($type, $keypair) = explode(';', $link['href']); + $parts = explode(';', $link['href']); + if (count($parts) == 2) { + $keypair = $parts[1]; + } + } + + if ($keypair) { + return $keypair; } - return $keypair; } } throw new Exception('Unable to locate signer public key'); -- cgit v1.2.3-54-g00ecf From c4273f0ef32f65267ddf43dc5dc6977659a0697e Mon Sep 17 00:00:00 2001 From: James Walker Date: Wed, 24 Mar 2010 15:15:20 -0400 Subject: Check for 0.9.0 bad keys from old Crypt_RSA library --- plugins/OStatus/classes/Magicsig.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php index 87c684c93..1a9541495 100644 --- a/plugins/OStatus/classes/Magicsig.php +++ b/plugins/OStatus/classes/Magicsig.php @@ -50,7 +50,15 @@ class Magicsig extends Memcached_DataObject { $obj = parent::staticGet(__CLASS__, $k, $v); if (!empty($obj)) { - return Magicsig::fromString($obj->keypair); + $obj = Magicsig::fromString($obj->keypair); + + // Double check keys: Crypt_RSA did not + // consistently generate good keypairs. + // We've also moved to 1024 bit keys. + if (strlen($obj->publicKey->modulus->toBits()) != 1024) { + $obj->delete(); + return false; + } } return $obj; -- cgit v1.2.3-54-g00ecf From cfca789b34eeac6c531c4c7aac622ed2e2510390 Mon Sep 17 00:00:00 2001 From: James Walker Date: Wed, 24 Mar 2010 15:18:41 -0400 Subject: Updated Math_Biginteger from upstream - removing safe* workarounds --- plugins/OStatus/classes/Magicsig.php | 8 ++++---- plugins/OStatus/extlib/Math/BigInteger.php | 8 ++++---- plugins/OStatus/lib/safecrypt_rsa.php | 18 ------------------ plugins/OStatus/lib/safemath_biginteger.php | 20 -------------------- 4 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 plugins/OStatus/lib/safecrypt_rsa.php delete mode 100644 plugins/OStatus/lib/safemath_biginteger.php diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php index 1a9541495..c7dd17c26 100644 --- a/plugins/OStatus/classes/Magicsig.php +++ b/plugins/OStatus/classes/Magicsig.php @@ -108,16 +108,16 @@ class Magicsig extends Memcached_DataObject public function generate($user_id) { - $rsa = new SafeCrypt_RSA(); + $rsa = new Crypt_RSA(); $keypair = $rsa->createKey(); $rsa->loadKey($keypair['privatekey']); - $this->privateKey = new SafeCrypt_RSA(); + $this->privateKey = new Crypt_RSA(); $this->privateKey->loadKey($keypair['privatekey']); - $this->publicKey = new SafeCrypt_RSA(); + $this->publicKey = new Crypt_RSA(); $this->publicKey->loadKey($keypair['publickey']); $this->user_id = $user_id; @@ -169,7 +169,7 @@ class Magicsig extends Memcached_DataObject { common_log(LOG_DEBUG, "Adding ".$type." key: (".$mod .', '. $exp .")"); - $rsa = new SafeCrypt_RSA(); + $rsa = new Crypt_RSA(); $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1; $rsa->setHash('sha256'); $rsa->modulus = new Math_BigInteger(base64_url_decode($mod), 256); diff --git a/plugins/OStatus/extlib/Math/BigInteger.php b/plugins/OStatus/extlib/Math/BigInteger.php index 9733351d4..4373805f9 100644 --- a/plugins/OStatus/extlib/Math/BigInteger.php +++ b/plugins/OStatus/extlib/Math/BigInteger.php @@ -67,7 +67,7 @@ * @author Jim Wigginton * @copyright MMVI Jim Wigginton * @license http://www.gnu.org/licenses/lgpl.txt - * @version $Id: BigInteger.php,v 1.31 2010/03/01 17:28:19 terrafrost Exp $ + * @version $Id: BigInteger.php,v 1.33 2010/03/22 22:32:03 terrafrost Exp $ * @link http://pear.php.net/package/Math_BigInteger */ @@ -294,7 +294,7 @@ class Math_BigInteger { $this->value = array(); } - if ($x === 0) { + if (empty($x)) { return; } @@ -718,7 +718,7 @@ class Math_BigInteger { * * Will be called, automatically, when serialize() is called on a Math_BigInteger object. * - * @see __wakeup + * @see __wakeup() * @access public */ function __sleep() @@ -740,7 +740,7 @@ class Math_BigInteger { * * Will be called, automatically, when unserialize() is called on a Math_BigInteger object. * - * @see __sleep + * @see __sleep() * @access public */ function __wakeup() diff --git a/plugins/OStatus/lib/safecrypt_rsa.php b/plugins/OStatus/lib/safecrypt_rsa.php deleted file mode 100644 index f3aa2c928..000000000 --- a/plugins/OStatus/lib/safecrypt_rsa.php +++ /dev/null @@ -1,18 +0,0 @@ -zero = new SafeMath_BigInteger(); - } -} - diff --git a/plugins/OStatus/lib/safemath_biginteger.php b/plugins/OStatus/lib/safemath_biginteger.php deleted file mode 100644 index c05e24d1e..000000000 --- a/plugins/OStatus/lib/safemath_biginteger.php +++ /dev/null @@ -1,20 +0,0 @@ -hex == '') { - $this->hex = '0'; - } - parent::__wakeup(); - } -} - -- cgit v1.2.3-54-g00ecf From 9e0b9857f435bf45d353bc88eb2462d483bcc46b Mon Sep 17 00:00:00 2001 From: James Walker Date: Wed, 24 Mar 2010 15:26:03 -0400 Subject: Make sure we're requiring the library --- plugins/OStatus/classes/Magicsig.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php index c7dd17c26..864fef628 100644 --- a/plugins/OStatus/classes/Magicsig.php +++ b/plugins/OStatus/classes/Magicsig.php @@ -27,6 +27,8 @@ * @link http://status.net/ */ +require_once 'Crypt/RSA.php'; + class Magicsig extends Memcached_DataObject { -- cgit v1.2.3-54-g00ecf From e7ae36b52a8192021f3a48f1a3929bbeee877ccd Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 24 Mar 2010 20:50:07 +0100 Subject: Updated tag list output in subscriptions list. Matches userprofile. --- lib/subscriptionlist.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php index e1207774f..fc8f33f2e 100644 --- a/lib/subscriptionlist.php +++ b/lib/subscriptionlist.php @@ -113,12 +113,13 @@ class SubscriptionListItem extends ProfileListItem $this->out->elementStart('ul', 'tags xoxo'); foreach ($tags as $tag) { $this->out->elementStart('li'); - $this->out->element('span', 'mark_hash', '#'); - $this->out->element('a', array('rel' => 'tag', - 'href' => common_local_url($this->action->trimmed('action'), - array('nickname' => $this->owner->nickname, - 'tag' => $tag))), - $tag); + // Avoid space by using raw output. + $pt = '#'; + $this->out->raw($pt); $this->out->elementEnd('li'); } $this->out->elementEnd('ul'); -- cgit v1.2.3-54-g00ecf From 09ff213d1c6b8dc42f28b9c637431bafa54146ec Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 24 Mar 2010 20:58:13 +0100 Subject: Using hCard label instead of location. Matches userprofile. --- lib/profilelist.php | 2 +- theme/base/css/display.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/profilelist.php b/lib/profilelist.php index d970e605a..3e5513895 100644 --- a/lib/profilelist.php +++ b/lib/profilelist.php @@ -213,7 +213,7 @@ class ProfileListItem extends Widget { if (!empty($this->profile->location)) { $this->out->text(' '); - $this->out->elementStart('span', 'location'); + $this->out->elementStart('span', 'label'); $this->out->raw($this->highlight($this->profile->location)); $this->out->elementEnd('span'); } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 36f0533b1..b0ab02bce 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -926,7 +926,7 @@ display:inline; } .profile .entity_profile .fn, -.profile .entity_profile .location { +.profile .entity_profile .label { margin-left:11px; margin-bottom:4px; width:auto; -- cgit v1.2.3-54-g00ecf From 9fe12be41eec8132fcfa6da2dc5fad926a932286 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 24 Mar 2010 21:34:53 +0100 Subject: Using unique @for, @id pair for jabber and sms options in subscriptions --- actions/subscriptions.php | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/actions/subscriptions.php b/actions/subscriptions.php index ba6171ef4..7b10b3425 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -196,12 +196,30 @@ class SubscriptionsListItem extends SubscriptionListItem $this->out->hidden('token', common_session_token()); $this->out->hidden('profile', $this->profile->id); if (common_config('xmpp', 'enabled')) { - $this->out->checkbox('jabber', _('Jabber'), $sub->jabber); + $attrs = array('name' => 'jabber', + 'type' => 'checkbox', + 'class' => 'checkbox', + 'id' => 'jabber-'.$this->profile->id); + if ($sub->jabber) { + $attrs['checked'] = 'checked'; + } + + $this->out->element('input', $attrs); + $this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _('Jabber')); } else { $this->out->hidden('jabber', $sub->jabber); } if (common_config('sms', 'enabled')) { - $this->out->checkbox('sms', _('SMS'), $sub->sms); + $attrs = array('name' => 'sms', + 'type' => 'checkbox', + 'class' => 'checkbox', + 'id' => 'sms-'.$this->profile->id); + if ($sub->sms) { + $attrs['checked'] = 'checked'; + } + + $this->out->element('input', $attrs); + $this->out->element('label', array('for' => 'sms-'.$this->profile->id), _('SMS')); } else { $this->out->hidden('sms', $sub->sms); } -- cgit v1.2.3-54-g00ecf From a954fd65ba00328cd1a76e620113d2f639340aaf Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 24 Mar 2010 13:36:57 -0700 Subject: Fix for API group methods, caused failure or output corruption when pulling up local groups by name in api/statusnet/groups/is_member.json/xml --- lib/apiaction.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/apiaction.php b/lib/apiaction.php index e6aaf9316..9fc1a0779 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -1273,7 +1273,7 @@ class ApiAction extends Action if (empty($local)) { return null; } else { - return User_group::staticGet('id', $local->id); + return User_group::staticGet('id', $local->group_id); } } -- cgit v1.2.3-54-g00ecf From fd608c0de03294eaecb22ab11a0c6d8945c11f38 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 24 Mar 2010 13:36:57 -0700 Subject: Fix for API group methods, caused failure or output corruption when pulling up local groups by name in api/statusnet/groups/is_member.json/xml --- lib/apiaction.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/apiaction.php b/lib/apiaction.php index e4a1df3d1..5cedfaefe 100644 --- a/lib/apiaction.php +++ b/lib/apiaction.php @@ -1239,7 +1239,7 @@ class ApiAction extends Action if (empty($local)) { return null; } else { - return User_group::staticGet('id', $local->id); + return User_group::staticGet('id', $local->group_id); } } -- cgit v1.2.3-54-g00ecf From 2c50d4aa4487e5317e5b71909691acc3345d4a9e Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 24 Mar 2010 22:40:59 +0100 Subject: location -> label class for cloudy --- theme/cloudy/css/display.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css index d9e9f3ce2..d1b9d198d 100644 --- a/theme/cloudy/css/display.css +++ b/theme/cloudy/css/display.css @@ -873,7 +873,7 @@ display:inline; } .profile .entity_profile .fn, -.profile .entity_profile .location { +.profile .entity_profile .label { margin-left:11px; margin-bottom:4px; width:auto; -- cgit v1.2.3-54-g00ecf From 97e83112d249cd2fbb281da59c80d43e0fe33818 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 24 Mar 2010 23:31:30 +0100 Subject: A lot of updates to keep the themes current (at least in functionality) --- theme/biz/css/base.css | 134 +++++++++++++++++-- theme/biz/css/display.css | 12 +- theme/cloudy/css/display.css | 35 +++-- theme/h4ck3r/css/base.css | 249 ++++++++++++++++++++++++++++++----- theme/h4ck3r/css/display.css | 9 +- theme/pigeonthoughts/css/base.css | 83 ++++++++---- theme/pigeonthoughts/css/display.css | 22 +++- 7 files changed, 461 insertions(+), 83 deletions(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 43b8e4656..3650988f3 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -849,7 +849,8 @@ margin-right:11px; /* NOTICE */ .notice, -.profile { +.profile, +.application { position:relative; padding-top:11px; padding-bottom:11px; @@ -862,10 +863,15 @@ border-top-style:dotted; .notices li { list-style-type:none; } -.notices li.hover { -border-radius:4px; --moz-border-radius:4px; --webkit-border-radius:4px; +.notices .notices { +margin-top:7px; +margin-left:2%; +width:98%; +float:left; +} +.mark-top { +border-top-width:1px; +border-top-style:solid; } /* NOTICES */ @@ -996,25 +1002,22 @@ text-transform:lowercase; .dialogbox { position:absolute; -top:-4px; -right:29px; +top:-1px; +right:-1px; z-index:9; -min-width:199px; float:none; -background-color:#FFF; padding:11px; border-radius:7px; -moz-border-radius:7px; -webkit-border-radius:7px; border-style:solid; border-width:1px; -border-color:#DDDDDD; --moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); } .dialogbox legend { display:block !important; margin-right:18px; +margin-bottom:18px; } .dialogbox button.close { @@ -1023,11 +1026,22 @@ right:3px; top:3px; } +.dialogbox .form_guide { +font-weight:normal; +padding:0; +} + .dialogbox .submit_dialogbox { font-weight:bold; text-indent:0; min-width:46px; } +.dialogbox input { +padding-left:4px; +} +.dialogbox fieldset { +margin-bottom:0; +} #wrap form.processing input.submit, .entity_actions a.processing, @@ -1103,6 +1117,104 @@ width:16px; height:16px; } +.notice .attachment { +position:relative; +padding-left:16px; +} +.notice .attachment.more { +text-indent:-9999px; +width:16px; +height:16px; +display:inline-block; +overflow:hidden; +vertical-align:middle; +margin-left:4px; +} + +#attachments .attachment, +.notice .attachment.more { +padding-left:0; +} +.notice .attachment img { +position:absolute; +top:18px; +left:0; +z-index:99; +} +#shownotice .notice .attachment img { +position:static; +} + +#attachments { +clear:both; +float:left; +width:100%; +margin-top:18px; +} +#attachments dt { +font-weight:bold; +font-size:1.3em; +margin-bottom:4px; +} + +#attachments ol li { +margin-bottom:18px; +list-style-type:decimal; +float:left; +clear:both; +} + +#jOverlayContent, +#jOverlayContent #content, +#jOverlayContent #content_inner { +width: auto !important; +margin-bottom:0; +} +#jOverlayContent #content { +padding:11px; +min-height:auto; +} +#jOverlayContent .entry-title { +display:block; +margin-bottom:11px; +} +#jOverlayContent button { +position:absolute; +top:0; +right:0; +} +#jOverlayContent h1 { +max-width:425px; +} +#jOverlayContent #content { +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +} +#jOverlayLoading { +top:5%; +left:40%; +} +#attachment_view img { +max-width:480px; +max-height:480px; +} +#attachment_view #oembed_info { +margin-top:11px; +} +#attachment_view #oembed_info dt, +#attachment_view #oembed_info dd { +float:left; +} +#attachment_view #oembed_info dt { +clear:left; +margin-right:11px; +font-weight:bold; +} +#attachment_view #oembed_info dt:after { +content: ":"; +} + #usergroups #new_group { float: left; margin-right: 2em; diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css index cafb152dc..b2143cce3 100644 --- a/theme/biz/css/display.css +++ b/theme/biz/css/display.css @@ -242,7 +242,9 @@ border-color:#FFFFFF; #content, #site_nav_local_views .current a, .entity_send-a-message .form_notice, -.entity_moderation:hover ul { +.entity_moderation:hover ul, +.entity_role:hover ul, +.dialogbox { background-color:#FFFFFF; } @@ -359,6 +361,9 @@ background-position: 5px -1973px; .notice .attachment { background-position:0 -394px; } +.notice .attachment.more { +background-position:0 -2770px; +} #attachments .attachment { background:none; } @@ -381,14 +386,19 @@ background-position:0 -1582px; background-position:0 -1648px; } +.notices .attachment.more, .notices div.entry-content, .notices div.notice-options { opacity:0.4; } +.notices li:hover .attachment.more, .notices li:hover div.entry-content, .notices li:hover div.notice-options { opacity:1; } +.opaque { +opacity:1 !important; +} div.notice-options a, div.notice-options input { font-family:sans-serif; diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css index d1b9d198d..5c3d8b5f7 100644 --- a/theme/cloudy/css/display.css +++ b/theme/cloudy/css/display.css @@ -901,7 +901,8 @@ margin-right:11px; /* NOTICE */ .notice, -.profile { +.profile, +.application { position:relative; padding-top:11px; padding-bottom:11px; @@ -1032,25 +1033,22 @@ left:0; .dialogbox { position:absolute; -top:-4px; -right:29px; +top:-1px; +right:-1px; z-index:9; -min-width:199px; float:none; -background-color:#FFF; padding:11px; border-radius:7px; -moz-border-radius:7px; -webkit-border-radius:7px; border-style:solid; border-width:1px; -border-color:#DDDDDD; --moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); } .dialogbox legend { display:block !important; margin-right:18px; +margin-bottom:18px; } .dialogbox button.close { @@ -1059,9 +1057,21 @@ right:3px; top:3px; } +.dialogbox .form_guide { +font-weight:normal; +padding:0; +} + .dialogbox .submit_dialogbox { -text-indent:0; font-weight:bold; +text-indent:0; +min-width:46px; +} +.dialogbox input { +padding-left:4px; +} +.dialogbox fieldset { +margin-bottom:0; } .notice-options { @@ -1808,7 +1818,9 @@ border-color:#FFFFFF; #content, #site_nav_local_views .current a, .entity_send-a-message .form_notice, -.entity_moderation:hover ul { +.entity_moderation:hover ul, +.entity_role:hover ul, +.dialogbox { background-color:#FFFFFF; } @@ -1940,6 +1952,9 @@ background-position: 0 -1714px; .notice .attachment { background-position:0 -394px; } +.notice .attachment.more { +background-position:0 -2770px; +} #attachments .attachment { background:none; } @@ -1962,10 +1977,12 @@ background-position:0 -1582px; background-position:0 -1648px; } +.notices .attachment.more, .notices div.entry-content, .notices div.notice-options { opacity:0.4; } +.notices li:hover .attachment.more, .notices li:hover div.entry-content, .notices li:hover div.notice-options { opacity:1; diff --git a/theme/h4ck3r/css/base.css b/theme/h4ck3r/css/base.css index 0302653fd..4c0e74218 100644 --- a/theme/h4ck3r/css/base.css +++ b/theme/h4ck3r/css/base.css @@ -701,7 +701,8 @@ margin-right:11px; /* NOTICE */ .notice, -.profile { +.profile, +.application { position:relative; padding-top:11px; padding-bottom:11px; @@ -709,11 +710,21 @@ clear:both; float:left; width:100%; border-top-width:1px; -border-top-style:dashed; +border-top-style:dotted; } .notices li { list-style-type:none; } +.notices .notices { +margin-top:7px; +margin-left:2%; +width:98%; +float:left; +} +.mark-top { +border-top-width:1px; +border-top-style:solid; +} /* NOTICES */ @@ -813,74 +824,248 @@ text-transform:lowercase; } -.notice-options { -padding-left:2%; +.notice .notice-options a, +.notice .notice-options input { float:left; -width:50%; +font-size:1.025em; +} + +.notice div.entry-content .timestamp { +display:inline-block; +} + +.entry-content .repeat { +display:block; +} +.entry-content .repeat .photo { +float:none; +margin-right:1px; +position:relative; +top:4px; +left:0; +} + +.dialogbox { +position:absolute; +top:-1px; +right:-1px; +z-index:9; +float:none; +padding:11px; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +border-style:solid; +border-width:1px; +} + +.dialogbox legend { +display:block !important; +margin-right:18px; +margin-bottom:18px; +} + +.dialogbox button.close { +position:absolute; +right:3px; +top:3px; +} + +.dialogbox .form_guide { +font-weight:normal; +padding:0; +} + +.dialogbox .submit_dialogbox { +font-weight:bold; +text-indent:0; +min-width:46px; +} +.dialogbox input { +padding-left:4px; +} +.dialogbox fieldset { +margin-bottom:0; +} + +#wrap form.processing input.submit, +.entity_actions a.processing, +.dialogbox.processing .submit_dialogbox { +cursor:wait; +outline:none; +text-indent:-9999px; +} + +.form_repeat.dialogbox { +top:-4px; +right:29px; +min-width:199px; +} + +.notice-options { position:relative; font-size:0.95em; -width:12.5%; +width:113px; float:right; +margin-top:3px; +margin-right:4px; } .notice-options a { float:left; } -.notice-options .notice_delete, .notice-options .notice_reply, +.notice-options .form_repeat, .notice-options .form_favor, -.notice-options .form_disfavor { -position:absolute; -top:0; +.notice-options .form_disfavor, +.notice-options .repeated { +float:left; +margin-left:14.2%; } .notice-options .form_favor, .notice-options .form_disfavor { -left:0; -} -.notice-options .notice_reply { -left:29px; -} -.notice-options .notice_delete { -right:0; -} -.notice-options .notice_reply dt { -display:none; +margin-left:0; } - .notice-options input, -.notice-options a { +.notice-options a, +.notice-options .repeated { text-indent:-9999px; outline:none; } - -.notice-options .notice_reply a, .notice-options input.submit { display:block; border:0; } -.notice-options .notice_reply a, -.notice-options .notice_delete a { +.notice-options .notice_reply, +.notice-options .notice_delete { text-decoration:none; -padding-left:16px; } - +.notice .notice-options .notice_delete { +float:right; +} .notice-options form input.submit { width:16px; -padding:2px 0; +height:16px; +padding:0; +border-radius:0; +-moz-border-radius:0; +-webkit-border-radius:0; } - -.notice-options .notice_delete dt, +.notice-options .form_repeat legend, .notice-options .form_favor legend, .notice-options .form_disfavor legend { display:none; } -.notice-options .notice_delete fieldset, +.notice-options .form_repeat fieldset, .notice-options .form_favor fieldset, .notice-options .form_disfavor fieldset { border:0; padding:0; } +.notice-options a, +.notice-options .repeated { +width:16px; +height:16px; +} + + +.notice .attachment { +position:relative; +padding-left:16px; +} +.notice .attachment.more { +text-indent:-9999px; +width:16px; +height:16px; +display:inline-block; +overflow:hidden; +vertical-align:middle; +margin-left:4px; +} + +#attachments .attachment, +.notice .attachment.more { +padding-left:0; +} +.notice .attachment img { +position:absolute; +top:18px; +left:0; +z-index:99; +} +#shownotice .notice .attachment img { +position:static; +} + +#attachments { +clear:both; +float:left; +width:100%; +margin-top:18px; +} +#attachments dt { +font-weight:bold; +font-size:1.3em; +margin-bottom:4px; +} + +#attachments ol li { +margin-bottom:18px; +list-style-type:decimal; +float:left; +clear:both; +} +#jOverlayContent, +#jOverlayContent #content, +#jOverlayContent #content_inner { +width: auto !important; +margin-bottom:0; +} +#jOverlayContent #content { +padding:11px; +min-height:auto; +} +#jOverlayContent .entry-title { +display:block; +margin-bottom:11px; +} +#jOverlayContent button { +position:absolute; +top:0; +right:0; +} +#jOverlayContent h1 { +max-width:425px; +} +#jOverlayContent #content { +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +} +#jOverlayLoading { +top:5%; +left:40%; +} +#attachment_view img { +max-width:480px; +max-height:480px; +} +#attachment_view #oembed_info { +margin-top:11px; +} +#attachment_view #oembed_info dt, +#attachment_view #oembed_info dd { +float:left; +} +#attachment_view #oembed_info dt { +clear:left; +margin-right:11px; +font-weight:bold; +} +#attachment_view #oembed_info dt:after { +content: ":"; +} #usergroups #new_group { float: left; diff --git a/theme/h4ck3r/css/display.css b/theme/h4ck3r/css/display.css index 7112765ab..276659dce 100644 --- a/theme/h4ck3r/css/display.css +++ b/theme/h4ck3r/css/display.css @@ -200,14 +200,19 @@ background:transparent url(../../base/images/icons/twotone/green/disfavourite.gi background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%; } +.notices .attachment.more, .notices div.entry-content, .notices div.notice-options { opacity:0.4; } -.notices li.hover div.entry-content, -.notices li.hover div.notice-options { +.notices li:hover .attachment.more, +.notices li:hover div.entry-content, +.notices li:hover div.notice-options { opacity:1; } +.opaque { +opacity:1 !important; +} div.entry-content { color:#ccc; } diff --git a/theme/pigeonthoughts/css/base.css b/theme/pigeonthoughts/css/base.css index bd12e6eaa..bc2e24dc5 100644 --- a/theme/pigeonthoughts/css/base.css +++ b/theme/pigeonthoughts/css/base.css @@ -792,25 +792,30 @@ margin-right:11px; /* NOTICE */ .notice, -.profile { +.profile, +.application { position:relative; -padding:11px 2%; +padding-top:11px; +padding-bottom:11px; clear:both; float:left; -width:95.7%; -border-width:1px; -border-style:solid; -margin-bottom:11px; +width:100%; +border-top-width:1px; +border-top-style:dotted; } .notices li { list-style-type:none; } .notices .notices { margin-top:7px; -margin-left:5%; -width:95%; +margin-left:2%; +width:98%; float:left; } +.mark-top { +border-top-width:1px; +border-top-style:solid; +} #aside_primary .notice, #aside_primary .profile { @@ -970,36 +975,38 @@ outline:none; text-indent:-9999px; } +.form_repeat.dialogbox { +top:-4px; +right:29px; +min-width:199px; +} + .notice-options { position:relative; font-size:0.95em; -width:90px; +width:113px; float:right; -margin-right:11px; +margin-top:3px; +margin-right:4px; } - .notice-options a { float:left; } -.notice-options .notice_delete, .notice-options .notice_reply, +.notice-options .form_repeat, .notice-options .form_favor, -.notice-options .form_disfavor { -position:absolute; -top:0; +.notice-options .form_disfavor, +.notice-options .repeated { +float:left; +margin-left:14.2%; } .notice-options .form_favor, .notice-options .form_disfavor { -left:0; -} -.notice-options .notice_reply { -left:29px; -} -.notice-options .notice_delete { -right:0; +margin-left:0; } .notice-options input, -.notice-options a { +.notice-options a, +.notice-options .repeated { text-indent:-9999px; outline:none; } @@ -1010,27 +1017,51 @@ border:0; .notice-options .notice_reply, .notice-options .notice_delete { text-decoration:none; -padding-left:16px; +} +.notice .notice-options .notice_delete { +float:right; } .notice-options form input.submit { width:16px; -padding:2px 0; +height:16px; +padding:0; +border-radius:0; +-moz-border-radius:0; +-webkit-border-radius:0; } +.notice-options .form_repeat legend, .notice-options .form_favor legend, .notice-options .form_disfavor legend { display:none; } +.notice-options .form_repeat fieldset, .notice-options .form_favor fieldset, .notice-options .form_disfavor fieldset { border:0; padding:0; } +.notice-options a, +.notice-options .repeated { +width:16px; +height:16px; +} .notice .attachment { position:relative; padding-left:16px; } -#attachments .attachment { +.notice .attachment.more { +text-indent:-9999px; +width:16px; +height:16px; +display:inline-block; +overflow:hidden; +vertical-align:middle; +margin-left:4px; +} + +#attachments .attachment, +.notice .attachment.more { padding-left:0; } .notice .attachment img { diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css index de5164ea8..62fa8817a 100644 --- a/theme/pigeonthoughts/css/display.css +++ b/theme/pigeonthoughts/css/display.css @@ -141,7 +141,6 @@ background-color:transparent; color:#000000; } - .aside .section { border-color:#FFFFFF; background-color:#FFFFFF; @@ -173,6 +172,11 @@ color:#7F1114; color:#FFFFFF; } +.aside .section .dialogbox { +color:#000000; +} + + .section .profile { border-top-color:#87B4C8; @@ -254,6 +258,13 @@ background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47 background-image:none; } +.entity_send-a-message .form_notice, +.entity_moderation:hover ul, +.entity_role:hover ul, +.dialogbox { +background-color:#FFFFFF; +} + #content, #site_nav_local_views a { border-color:#FFFFFF; @@ -414,6 +425,9 @@ background-position: 0 -1714px; .notice .attachment { background-position:0 -394px; } +.notice .attachment.more { +background-position:0 -2770px; +} #attachments .attachment { background:none; } @@ -436,15 +450,19 @@ background-position:0 -1582px; background-position:0 -1648px; } - +.notices .attachment.more, .notices div.entry-content, .notices div.notice-options { opacity:0.4; } +.notices li:hover .attachment.more, .notices li:hover div.entry-content, .notices li:hover div.notice-options { opacity:1; } +.opaque { +opacity:1 !important; +} div.entry-content { color:#333333; } -- cgit v1.2.3-54-g00ecf From 1089c0e23c9b7be7128ee220959ce598db9a3cfe Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 25 Mar 2010 15:08:00 +0100 Subject: Updated biz theme to use realtime icons from core --- theme/biz/css/base.css | 2 +- theme/biz/css/display.css | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css index 3650988f3..f5efdb49c 100644 --- a/theme/biz/css/base.css +++ b/theme/biz/css/base.css @@ -1,7 +1,7 @@ /** theme: biz base * * @package StatusNet - * @author Sarven Capadisli + * @author Sarven Capadisli * @copyright 2009 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css index b2143cce3..ea09ef4c0 100644 --- a/theme/biz/css/display.css +++ b/theme/biz/css/display.css @@ -206,15 +206,26 @@ button.close, .form_user_unsubscribe input.submit, .form_group_join input.submit, .form_user_subscribe input.submit, +.form_remote_authorize input.submit, .entity_subscribe a, .entity_moderation p, .entity_sandbox input.submit, .entity_silence input.submit, .entity_delete input.submit, +.entity_role p, +.entity_role_administrator input.submit, +.entity_role_moderator input.submit, .notice-options .repeated, .form_notice label[for=notice_data-geo], button.minimize, -.form_reset_key input.submit { +.form_reset_key input.submit, +.entity_clear input.submit, +.entity_flag input.submit, +.entity_flag p, +.entity_subscribe input.submit, +#realtime_play, +#realtime_pause, +#realtime_popup { background-image:url(../../base/images/icons/icons-01.gif); background-repeat:no-repeat; background-color:transparent; @@ -355,6 +366,28 @@ background-position: 5px -1511px; .form_reset_key input.submit { background-position: 5px -1973px; } +.entity_clear input.submit { +background-position: 5px -2039px; +} +.entity_flag input.submit, +.entity_flag p { +background-position: 5px -2105px; +} +.entity_subscribe input.accept { +background-position: 5px -2171px; +} +.entity_subscribe input.reject { +background-position: 5px -2237px; +} +#realtime_play { +background-position: 0 -2308px; +} +#realtime_pause { +background-position: 0 -2374px; +} +#realtime_popup { +background-position: 0 -1714px; +} /* NOTICES */ -- cgit v1.2.3-54-g00ecf From 518551bf70429d10d5c7ce905a0e482bceffad18 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 25 Mar 2010 17:33:59 +0100 Subject: Fix for processing indicator for aside --- theme/cloudy/css/display.css | 3 ++- theme/default/css/display.css | 2 +- theme/identica/css/display.css | 2 +- theme/pigeonthoughts/css/display.css | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css index 5c3d8b5f7..caea5cf44 100644 --- a/theme/cloudy/css/display.css +++ b/theme/cloudy/css/display.css @@ -1663,7 +1663,8 @@ background-color:transparent; } #wrap form.processing input.submit, -.entity_actions a.processing { +#core a.processing, +.dialogbox.processing .submit_dialogbox { background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; cursor:wait; text-indent:-9999px; diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 7ccd234cd..5e3748cb7 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -214,7 +214,7 @@ background-color:transparent; } #wrap form.processing input.submit, -#content a.processing, +#core a.processing, .dialogbox.processing .submit_dialogbox { background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 3972657a7..440dd8be2 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -215,7 +215,7 @@ background-color:transparent; } #wrap form.processing input.submit, -#content a.processing, +#core a.processing, .dialogbox.processing .submit_dialogbox { background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; } diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css index 62fa8817a..e584683fc 100644 --- a/theme/pigeonthoughts/css/display.css +++ b/theme/pigeonthoughts/css/display.css @@ -250,7 +250,7 @@ background-color:transparent; #wrap form.processing input.submit, -.entity_actions a.processing, +#core a.processing, .dialogbox.processing .submit_dialogbox { background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; } -- cgit v1.2.3-54-g00ecf From 7f1b852c97ff1e14eef7b42dfef42f372e22ea72 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 25 Mar 2010 17:47:04 +0100 Subject: If indenting is disabled on the output, this fixes the entity_tags crop --- theme/base/css/display.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index b0ab02bce..f48bdf55e 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -858,6 +858,9 @@ display:inline; display:inline; margin-right:7px; } +.entity_tags li:before { +content:'\0009'; +} .aside .section { margin-bottom:29px; -- cgit v1.2.3-54-g00ecf From 6e644f77a43ea7028e0aafb2d83059d0f19db701 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 25 Mar 2010 13:49:12 -0400 Subject: Store blacklist patterns in their own tables We were bumping into limits on the config format in the Blacklist plugin. So, added new tables for nickname and homepage blacklists, and changed the plugin to use those instead of config file (actually, still uses config file in addition, for compatibility). --- plugins/Blacklist/BlacklistPlugin.php | 61 ++++++++-- plugins/Blacklist/Homepage_blacklist.php | 189 ++++++++++++++++++++++++++++++ plugins/Blacklist/Nickname_blacklist.php | 180 ++++++++++++++++++++++++++++ plugins/Blacklist/blacklistadminpanel.php | 40 +++---- 4 files changed, 437 insertions(+), 33 deletions(-) create mode 100644 plugins/Blacklist/Homepage_blacklist.php create mode 100644 plugins/Blacklist/Nickname_blacklist.php diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php index fb8f7306f..a7d0942da 100644 --- a/plugins/Blacklist/BlacklistPlugin.php +++ b/plugins/Blacklist/BlacklistPlugin.php @@ -62,13 +62,56 @@ class BlacklistPlugin extends Plugin { $confNicknames = $this->_configArray('blacklist', 'nicknames'); + $dbNicknames = Nickname_blacklist::getPatterns(); + $this->_nicknamePatterns = array_merge($this->nicknames, - $confNicknames); + $confNicknames, + $dbNicknames); $confURLs = $this->_configArray('blacklist', 'urls'); + $dbURLs = Homepage_blacklist::getPatterns(); + $this->_urlPatterns = array_merge($this->urls, - $confURLs); + $confURLs, + $dbURLs); + } + + /** + * Database schema setup + * + * @return boolean hook value + */ + + function onCheckSchema() + { + $schema = Schema::get(); + + // For storing blacklist patterns for nicknames + + $schema->ensureTable('nickname_blacklist', + array(new ColumnDef('pattern', + 'varchar', + 255, + false, + 'PRI'), + new ColumnDef('created', + 'datetime', + null, + false))); + + $schema->ensureTable('homepage_blacklist', + array(new ColumnDef('pattern', + 'varchar', + 255, + false, + 'PRI'), + new ColumnDef('created', + 'datetime', + null, + false))); + + return true; } /** @@ -280,6 +323,10 @@ class BlacklistPlugin extends Plugin { switch (strtolower($cls)) { + case 'nickname_blacklist': + case 'homepage_blacklist': + include_once INSTALLDIR.'/plugins/Blacklist/'.ucfirst($cls).'.php'; + return false; case 'blacklistadminpanelaction': $base = strtolower(mb_substr($cls, 0, -6)); include_once INSTALLDIR.'/plugins/Blacklist/'.$base.'.php'; @@ -391,20 +438,14 @@ class BlacklistPlugin extends Plugin function onEndDeleteUser($action, $user) { - common_debug("Action args: " . print_r($action->args, true)); - if ($action->boolean('blacklisthomepage')) { $pattern = $action->trimmed('blacklisthomepagepattern'); - $confURLs = $this->_configArray('blacklist', 'urls'); - $confURLs[] = $pattern; - Config::save('blacklist', 'urls', implode("\r\n", $confURLs)); + Homepage_blacklist::ensurePattern($pattern); } if ($action->boolean('blacklistnickname')) { $pattern = $action->trimmed('blacklistnicknamepattern'); - $confNicknames = $this->_configArray('blacklist', 'nicknames'); - $confNicknames[] = $pattern; - Config::save('blacklist', 'nicknames', implode("\r\n", $confNicknames)); + Nickname_blacklist::ensurePattern($pattern); } return true; diff --git a/plugins/Blacklist/Homepage_blacklist.php b/plugins/Blacklist/Homepage_blacklist.php new file mode 100644 index 000000000..32080667e --- /dev/null +++ b/plugins/Blacklist/Homepage_blacklist.php @@ -0,0 +1,189 @@ + + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + * + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2009, StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/classes/Memcached_DataObject.php'; + +/** + * Data class for Homepage blacklist + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + * + * @see DB_DataObject + */ + +class Homepage_blacklist extends Memcached_DataObject +{ + public $__table = 'homepage_blacklist'; // table name + public $pattern; // string pattern + public $created; // datetime + + /** + * Get an instance by key + * + * This is a utility method to get a single instance with a given key value. + * + * @param string $k Key to use to lookup (usually 'user_id' for this class) + * @param mixed $v Value to lookup + * + * @return Homepage_blacklist object found, or null for no hits + * + */ + + function staticGet($k, $v=null) + { + return Memcached_DataObject::staticGet('Homepage_blacklist', $k, $v); + } + + /** + * return table definition for DB_DataObject + * + * DB_DataObject needs to know something about the table to manipulate + * instances. This method provides all the DB_DataObject needs to know. + * + * @return array array of column definitions + */ + + function table() + { + return array('pattern' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, + 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL); + } + + /** + * return key definitions for DB_DataObject + * + * DB_DataObject needs to know about keys that the table has; this function + * defines them. + * + * @return array key definitions + */ + + function keys() + { + return array('pattern' => 'K'); + } + + /** + * return key definitions for Memcached_DataObject + * + * Our caching system uses the same key definitions, but uses a different + * method to get them. + * + * @return array key definitions + */ + + function keyTypes() + { + return $this->keys(); + } + + /** + * Return a list of patterns to check + * + * @return array string patterns to check + */ + + static function getPatterns() + { + $patterns = self::cacheGet('homepage_blacklist:patterns'); + + if ($patterns === false) { + + $patterns = array(); + + $nb = new Homepage_blacklist(); + + $nb->find(); + + while ($nb->fetch()) { + $patterns[] = $nb->pattern; + } + + self::cacheSet('homepage_blacklist:patterns', $patterns); + } + + return $patterns; + } + + /** + * Save new list of patterns + * + * @return array of patterns to check + */ + + static function saveNew($newPatterns) + { + $oldPatterns = self::getPatterns(); + + // Delete stuff that's old that not in new + + $toDelete = array_diff($oldPatterns, $newPatterns); + + // Insert stuff that's in new and not in old + + $toInsert = array_diff($newPatterns, $oldPatterns); + + foreach ($toDelete as $pattern) { + $nb = Homepage_blacklist::staticGet('pattern', $pattern); + if (!empty($nb)) { + $nb->delete(); + } + } + + foreach ($toInsert as $pattern) { + $nb = new Homepage_blacklist(); + $nb->pattern = $pattern; + $nb->created = common_sql_now(); + $nb->insert(); + } + + self::blow('homepage_blacklist:patterns'); + } + + static function ensurePattern($pattern) + { + $hb = Homepage_blacklist::staticGet('pattern', $pattern); + + if (empty($nb)) { + $hb = new Homepage_blacklist(); + $hb->pattern = $pattern; + $hb->created = common_sql_now(); + $hb->insert(); + self::blow('homepage_blacklist:patterns'); + } + } +} diff --git a/plugins/Blacklist/Nickname_blacklist.php b/plugins/Blacklist/Nickname_blacklist.php new file mode 100644 index 000000000..981063144 --- /dev/null +++ b/plugins/Blacklist/Nickname_blacklist.php @@ -0,0 +1,180 @@ + + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + * + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2009, StatusNet, Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +if (!defined('STATUSNET')) { + exit(1); +} + +require_once INSTALLDIR . '/classes/Memcached_DataObject.php'; + +/** + * Data class for Nickname blacklist + * + * @category Action + * @package StatusNet + * @author Evan Prodromou + * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 + * @link http://status.net/ + * + * @see DB_DataObject + */ + +class Nickname_blacklist extends Memcached_DataObject +{ + public $__table = 'nickname_blacklist'; // table name + public $pattern; // string pattern + public $created; // datetime + + /** + * Get an instance by key + * + * This is a utility method to get a single instance with a given key value. + * + * @param string $k Key to use to lookup + * @param mixed $v Value to lookup + * + * @return Nickname_blacklist object found, or null for no hits + * + */ + + function staticGet($k, $v=null) + { + return Memcached_DataObject::staticGet('Nickname_blacklist', $k, $v); + } + + /** + * return table definition for DB_DataObject + * + * @return array array of column definitions + */ + + function table() + { + return array('pattern' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, + 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL); + } + + /** + * return key definitions for DB_DataObject + * + * @return array key definitions + */ + + function keys() + { + return array('pattern' => 'K'); + } + + /** + * return key definitions for Memcached_DataObject + * + * @return array key definitions + */ + + function keyTypes() + { + return $this->keys(); + } + + /** + * Return a list of patterns to check + * + * @return array string patterns to check + */ + + static function getPatterns() + { + $patterns = self::cacheGet('nickname_blacklist:patterns'); + + if ($patterns === false) { + + $patterns = array(); + + $nb = new Nickname_blacklist(); + + $nb->find(); + + while ($nb->fetch()) { + $patterns[] = $nb->pattern; + } + + self::cacheSet('nickname_blacklist:patterns', $patterns); + } + + return $patterns; + } + + /** + * Save new list of patterns + * + * @return array of patterns to check + */ + + static function saveNew($newPatterns) + { + $oldPatterns = self::getPatterns(); + + // Delete stuff that's old that not in new + + $toDelete = array_diff($oldPatterns, $newPatterns); + + // Insert stuff that's in new and not in old + + $toInsert = array_diff($newPatterns, $oldPatterns); + + foreach ($toDelete as $pattern) { + $nb = Nickname_blacklist::staticGet('pattern', $pattern); + if (!empty($nb)) { + $nb->delete(); + } + } + + foreach ($toInsert as $pattern) { + $nb = new Nickname_blacklist(); + $nb->pattern = $pattern; + $nb->created = common_sql_now(); + $nb->insert(); + } + + self::blow('nickname_blacklist:patterns'); + } + + static function ensurePattern($pattern) + { + $nb = Nickname_blacklist::staticGet('pattern', $pattern); + + if (empty($nb)) { + $nb = new Nickname_blacklist(); + $nb->pattern = $pattern; + $nb->created = common_sql_now(); + $nb->insert(); + self::blow('nickname_blacklist:patterns'); + } + } +} diff --git a/plugins/Blacklist/blacklistadminpanel.php b/plugins/Blacklist/blacklistadminpanel.php index 98d07080d..b996aba8d 100644 --- a/plugins/Blacklist/blacklistadminpanel.php +++ b/plugins/Blacklist/blacklistadminpanel.php @@ -88,35 +88,24 @@ class BlacklistadminpanelAction extends AdminPanelAction function saveSettings() { - static $settings = array( - 'blacklist' => array('nicknames', 'urls'), - ); + $nickPatterns = array(); - $values = array(); + $rawNickPatterns = explode("\n", $this->trimmed('blacklist-nicknames')); - foreach ($settings as $section => $parts) { - foreach ($parts as $setting) { - $values[$section][$setting] = $this->trimmed("$section-$setting"); - } + foreach ($rawNickPatterns as $raw) { + $nickPatterns[] = trim($raw); } - // This throws an exception on validation errors + Nickname_blacklist::saveNew($nickPatterns); - $this->validate($values); + $rawUrlPatterns = explode("\n", $this->trimmed('blacklist-urls')); + $urlPatterns = array(); - // assert(all values are valid); - - $config = new Config(); - - $config->query('BEGIN'); - - foreach ($settings as $section => $parts) { - foreach ($parts as $setting) { - Config::save($section, $setting, $values[$section][$setting]); - } + foreach ($rawUrlPatterns as $raw) { + $urlPatterns[] = trim($raw); } - $config->query('COMMIT'); + Homepage_blacklist::saveNew($urlPatterns); return; } @@ -191,14 +180,19 @@ class BlacklistAdminPanelForm extends Form $this->out->elementStart('ul', 'form_data'); $this->out->elementStart('li'); + + $nickPatterns = Nickname_blacklist::getPatterns(); + $this->out->textarea('blacklist-nicknames', _m('Nicknames'), - common_config('blacklist', 'nicknames'), + implode("\r\n", $nickPatterns), _('Patterns of nicknames to block, one per line')); $this->out->elementEnd('li'); + $urlPatterns = Homepage_blacklist::getPatterns(); + $this->out->elementStart('li'); $this->out->textarea('blacklist-urls', _m('URLs'), - common_config('blacklist', 'urls'), + implode("\r\n", $urlPatterns), _('Patterns of URLs to block, one per line')); $this->out->elementEnd('li'); -- cgit v1.2.3-54-g00ecf From 38fac1d46364933b2d0a0a33a02c0b4b78e376b4 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 25 Mar 2010 12:21:02 -0700 Subject: Clarify RewriteBase comment in htaccess.sample --- htaccess.sample | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htaccess.sample b/htaccess.sample index 18a868698..1b7701609 100644 --- a/htaccess.sample +++ b/htaccess.sample @@ -2,6 +2,8 @@ RewriteEngine On # NOTE: change this to your actual StatusNet path; may be "/". + # http://example.com/ => / + # http://example.com/mublog/ => /mublog/ RewriteBase /mublog/ -- cgit v1.2.3-54-g00ecf From cd9017408e3a970d5d12433b9b81266817e0cc6f Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 25 Mar 2010 12:48:31 -0700 Subject: And clarify a little more --- htaccess.sample | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/htaccess.sample b/htaccess.sample index 1b7701609..fa09b30f6 100644 --- a/htaccess.sample +++ b/htaccess.sample @@ -1,14 +1,17 @@ RewriteEngine On - # NOTE: change this to your actual StatusNet path; may be "/". - # http://example.com/ => / - # http://example.com/mublog/ => /mublog/ - + # NOTE: change this to your actual StatusNet base URL path, + # minus the domain part: + # + # http://example.com/ => / + # http://example.com/mublog/ => /mublog/ + # RewriteBase /mublog/ ## Uncomment these if having trouble with API authentication ## when PHP is running in CGI or FastCGI mode. + # #RewriteCond %{HTTP:Authorization} ^(.*) #RewriteRule ^(.*) - [E=HTTP_AUTHORIZATION:%1] -- cgit v1.2.3-54-g00ecf From 321093886fd708696c28118893443aa598c6b97f Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 13 Mar 2010 16:48:21 -0500 Subject: Assigned an identifier for the representative user and group profile --- actions/showgroup.php | 3 ++- lib/userprofile.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/actions/showgroup.php b/actions/showgroup.php index 5704b13d1..a0d05ba37 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -221,7 +221,8 @@ class ShowgroupAction extends GroupDesignAction function showGroupProfile() { - $this->elementStart('div', 'entity_profile vcard author'); + $this->elementStart('div', array('id' => 'i', + 'class' => 'entity_profile vcard author')); $this->element('h2', null, _('Group profile')); diff --git a/lib/userprofile.php b/lib/userprofile.php index 2c3b1ea45..ca060842b 100644 --- a/lib/userprofile.php +++ b/lib/userprofile.php @@ -71,7 +71,8 @@ class UserProfile extends Widget { if (Event::handle('StartProfilePageProfileSection', array(&$this->out, $this->profile))) { - $this->out->elementStart('div', 'entity_profile vcard author'); + $this->out->elementStart('div', array('id' => 'i', + 'class' => 'entity_profile vcard author')); $this->out->element('h2', null, _('User profile')); if (Event::handle('StartProfilePageProfileElements', array(&$this->out, $this->profile))) { -- cgit v1.2.3-54-g00ecf From 9ea48298d507ca286e4d7f0dc44291438062782e Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 14 Mar 2010 14:06:14 -0400 Subject: Updated plugin to open external links on a new window that are not attachments --- plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php b/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php index ebb0189e0..6756f1993 100644 --- a/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php +++ b/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php @@ -45,7 +45,7 @@ class OpenExternalLinkTargetPlugin extends Plugin { function onEndShowScripts($action) { - $action->inlineScript('$("a[rel~=external]").click(function(){ window.open(this.href); return false; });'); + $action->inlineScript('$("a[rel~=external]:not([class~=attachment])").live("click", function(){ window.open(this.href); return false; });'); return true; } -- cgit v1.2.3-54-g00ecf From 53bed00f9028523ba003956ed88f9549ec203e3b Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 14 Mar 2010 14:11:21 -0400 Subject: Added rel=external to geo location link --- lib/noticelist.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/noticelist.php b/lib/noticelist.php index 811b7e4f1..0d4cd4dd9 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -443,7 +443,8 @@ class NoticeListItem extends Widget $name); } else { $xstr = new XMLStringer(false); - $xstr->elementStart('a', array('href' => $url)); + $xstr->elementStart('a', array('href' => $url, + 'rel' => 'external')); $xstr->element('abbr', array('class' => 'geo', 'title' => $latlon), $name); -- cgit v1.2.3-54-g00ecf From 3c5586d4bd2b00a2c3a140830fcc7b3e15898242 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 14 Mar 2010 15:01:24 -0400 Subject: Using rel=external instead of class=external for jOverlay title link --- lib/attachmentlist.php | 6 ++---- theme/base/css/display.css | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php index fe38281af..b503bfb45 100644 --- a/lib/attachmentlist.php +++ b/lib/attachmentlist.php @@ -248,9 +248,7 @@ class Attachment extends AttachmentListItem $this->out->elementStart('div', array('id' => 'attachment_view', 'class' => 'hentry')); $this->out->elementStart('div', 'entry-title'); - $this->out->elementStart('a', $this->linkAttr()); - $this->out->element('span', null, $this->linkTitle()); - $this->out->elementEnd('a'); + $this->out->element('a', $this->linkAttr(), $this->linkTitle()); $this->out->elementEnd('div'); $this->out->elementStart('div', 'entry-content'); @@ -296,7 +294,7 @@ class Attachment extends AttachmentListItem } function linkAttr() { - return array('class' => 'external', 'href' => $this->attachment->url); + return array('rel' => 'external', 'href' => $this->attachment->url); } function linkTitle() { diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 782d3dc71..a2e4cdf2a 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1326,7 +1326,7 @@ margin-bottom:0; padding:11px; min-height:auto; } -#jOverlayContent .external span { +#jOverlayContent .entry-title { display:block; margin-bottom:11px; } -- cgit v1.2.3-54-g00ecf From 7f6fdb528c7e089984bc6ca121508469d423483c Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 25 Mar 2010 16:35:22 -0400 Subject: remove debugging calls --- plugins/OpenID/finishopenidlogin.php | 1 - plugins/OpenID/openid.php | 6 +----- plugins/OpenID/openidtrust.php | 5 ++--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php index 438a728d8..1f9bde0f1 100644 --- a/plugins/OpenID/finishopenidlogin.php +++ b/plugins/OpenID/finishopenidlogin.php @@ -48,7 +48,6 @@ class FinishopenidloginAction extends Action } else if ($this->arg('connect')) { $this->connectUser(); } else { - common_debug(print_r($this->args, true), __FILE__); $this->showForm(_m('Something weird happened.'), $this->trimmed('newname')); } diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php index 9e02c7a88..d49941aed 100644 --- a/plugins/OpenID/openid.php +++ b/plugins/OpenID/openid.php @@ -94,7 +94,6 @@ function oid_link_user($id, $canonical, $display) if (!$oid->insert()) { $err = PEAR::getStaticProperty('DB_DataObject','lastError'); - common_debug('DB error ' . $err->code . ': ' . $err->message, __FILE__); return false; } @@ -119,13 +118,10 @@ function oid_check_immediate($openid_url, $backto=null) unset($args['action']); $backto = common_local_url($action, $args); } - common_debug('going back to "' . $backto . '"', __FILE__); common_ensure_session(); $_SESSION['openid_immediate_backto'] = $backto; - common_debug('passed-in variable is "' . $backto . '"', __FILE__); - common_debug('session variable is "' . $_SESSION['openid_immediate_backto'] . '"', __FILE__); oid_authenticate($openid_url, 'finishimmediate', @@ -281,7 +277,7 @@ class AutosubmitAction extends Action { $this->raw($this->form_html); } - + function showScripts() { parent::showScripts(); diff --git a/plugins/OpenID/openidtrust.php b/plugins/OpenID/openidtrust.php index fa7ea36e2..ed6ca73a4 100644 --- a/plugins/OpenID/openidtrust.php +++ b/plugins/OpenID/openidtrust.php @@ -71,7 +71,7 @@ class OpenidtrustAction extends Action } return true; } - + function handle($args) { parent::handle($args); @@ -96,7 +96,6 @@ class OpenidtrustAction extends Action $user_openid_trustroot->created = DB_DataObject_Cast::dateTime(); if (!$user_openid_trustroot->insert()) { $err = PEAR::getStaticProperty('DB_DataObject','lastError'); - common_debug('DB error ' . $err->code . ': ' . $err->message, __FILE__); } common_redirect($this->allowUrl, $code=302); }else{ @@ -135,7 +134,7 @@ class OpenidtrustAction extends Action $this->elementStart('fieldset'); $this->submit('allow', _m('Continue')); $this->submit('deny', _m('Cancel')); - + $this->elementEnd('fieldset'); $this->elementEnd('form'); } -- cgit v1.2.3-54-g00ecf From 56deca63d0d73b965bc7dba11ef025a7c1ad3234 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 16 Mar 2010 19:34:20 +0100 Subject: Removed dangling stylesheet --- theme/base/css/thickbox.css | 163 -------------------------------------------- 1 file changed, 163 deletions(-) delete mode 100644 theme/base/css/thickbox.css diff --git a/theme/base/css/thickbox.css b/theme/base/css/thickbox.css deleted file mode 100644 index d24b9bedf..000000000 --- a/theme/base/css/thickbox.css +++ /dev/null @@ -1,163 +0,0 @@ -/* ----------------------------------------------------------------------------------------------------------------*/ -/* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/ -/* ----------------------------------------------------------------------------------------------------------------*/ -*{padding: 0; margin: 0;} - -/* ----------------------------------------------------------------------------------------------------------------*/ -/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/ -/* ----------------------------------------------------------------------------------------------------------------*/ -#TB_window { - font: 12px Arial, Helvetica, sans-serif; - color: #333333; -} - -#TB_secondLine { - font: 10px Arial, Helvetica, sans-serif; - color:#666666; -} - -#TB_window a:link {color: #666666;} -#TB_window a:visited {color: #666666;} -#TB_window a:hover {color: #000;} -#TB_window a:active {color: #666666;} -#TB_window a:focus{color: #666666;} - -/* ----------------------------------------------------------------------------------------------------------------*/ -/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/ -/* ----------------------------------------------------------------------------------------------------------------*/ -#TB_overlay { - position: fixed; - z-index:100; - top: 0px; - left: 0px; - height:100%; - width:100%; -} - -.TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;} -.TB_overlayBG { - background-color:#000; - filter:alpha(opacity=75); - -moz-opacity: 0.75; - opacity: 0.75; -} - -* html #TB_overlay { /* ie6 hack */ - position: absolute; - height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); -} - -#TB_window { - position: fixed; - background: #ffffff; - z-index: 102; - color:#000000; - display:none; - border: 4px solid #525252; - text-align:left; - top:50%; - left:50%; -} - -* html #TB_window { /* ie6 hack */ -position: absolute; -margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); -} - -#TB_window img#TB_Image { - display:block; - margin: 15px 0 0 15px; - border-right: 1px solid #ccc; - border-bottom: 1px solid #ccc; - border-top: 1px solid #666; - border-left: 1px solid #666; -} - -#TB_caption{ - height:25px; - padding:7px 30px 10px 25px; - float:left; -} - -#TB_closeWindow{ - height:25px; - padding:11px 25px 10px 0; - float:right; -} - -#TB_closeAjaxWindow{ - padding:7px 10px 5px 0; - margin-bottom:1px; - text-align:right; - float:right; -} - -#TB_ajaxWindowTitle{ - float:left; - padding:7px 0 5px 10px; - margin-bottom:1px; -} - -#TB_title{ - background-color:#e8e8e8; - height:27px; -} - -#TB_ajaxContent{ - clear:both; - padding:2px 15px 15px 15px; - overflow:auto; - text-align:left; - line-height:1.4em; -} - -#TB_ajaxContent.TB_modal{ - padding:15px; -} - -#TB_ajaxContent p{ - padding:5px 0px 5px 0px; -} - -#TB_load{ - position: fixed; - display:none; - height:13px; - width:208px; - z-index:103; - top: 50%; - left: 50%; - margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */ -} - -* html #TB_load { /* ie6 hack */ -position: absolute; -margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); -} - -#TB_HideSelect{ - z-index:99; - position:fixed; - top: 0; - left: 0; - background-color:#fff; - border:none; - filter:alpha(opacity=0); - -moz-opacity: 0; - opacity: 0; - height:100%; - width:100%; -} - -* html #TB_HideSelect { /* ie6 hack */ - position: absolute; - height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); -} - -#TB_iframeContent{ - clear:both; - border:none; - margin-bottom:-1px; - margin-top:1px; - _margin-bottom:1px; -} -- cgit v1.2.3-54-g00ecf From f4339ddb7d5ab6ae7a2ab78562990da1fcc2a8bd Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 16 Mar 2010 20:53:49 +0100 Subject: Added extra condition to focusing on notice form on page load. If the window location contains a fragument identifier, it will skip focus and do what the UA does natively. --- js/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/util.js b/js/util.js index 3efda0d7b..2e0f6e57b 100644 --- a/js/util.js +++ b/js/util.js @@ -86,7 +86,7 @@ var SN = { // StatusNet $('#'+form_id+' #'+SN.C.S.NoticeTextCount).text(jQuery.data(form[0], 'ElementData').MaxLength); } - if ($('body')[0].id != 'conversation') { + if ($('body')[0].id != 'conversation' && window.location.hash.length === 0) { $('#'+form_id+' textarea').focus(); } }, -- cgit v1.2.3-54-g00ecf From 7fc8b6af4ae9a784b797d4f7aef49c820bb10bdf Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 16 Mar 2010 21:02:56 +0100 Subject: Removed unnecessary form_id. Using jQuery .find() instead of constructing the selector. --- js/util.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/js/util.js b/js/util.js index 2e0f6e57b..f82ca992c 100644 --- a/js/util.js +++ b/js/util.js @@ -61,10 +61,8 @@ var SN = { // StatusNet U: { // Utils FormNoticeEnhancements: function(form) { - form_id = form.attr('id'); - if (jQuery.data(form[0], 'ElementData') === undefined) { - MaxLength = $('#'+form_id+' #'+SN.C.S.NoticeTextCount).text(); + MaxLength = form.find('#'+SN.C.S.NoticeTextCount).text(); if (typeof(MaxLength) == 'undefined') { MaxLength = SN.C.I.MaxLength; } @@ -72,7 +70,7 @@ var SN = { // StatusNet SN.U.Counter(form); - NDT = $('#'+form_id+' #'+SN.C.S.NoticeDataText); + NDT = form.find('#'+SN.C.S.NoticeDataText); NDT.bind('keyup', function(e) { SN.U.Counter(form); @@ -83,11 +81,11 @@ var SN = { // StatusNet }); } else { - $('#'+form_id+' #'+SN.C.S.NoticeTextCount).text(jQuery.data(form[0], 'ElementData').MaxLength); + form.find('#'+SN.C.S.NoticeTextCount).text(jQuery.data(form[0], 'ElementData').MaxLength); } if ($('body')[0].id != 'conversation' && window.location.hash.length === 0) { - $('#'+form_id+' textarea').focus(); + form.find('textarea').focus(); } }, @@ -105,7 +103,6 @@ var SN = { // StatusNet Counter: function(form) { SN.C.I.FormNoticeCurrent = form; - form_id = form.attr('id'); var MaxLength = jQuery.data(form[0], 'ElementData').MaxLength; @@ -113,8 +110,8 @@ var SN = { // StatusNet return; } - var remaining = MaxLength - $('#'+form_id+' #'+SN.C.S.NoticeDataText).val().length; - var counter = $('#'+form_id+' #'+SN.C.S.NoticeTextCount); + var remaining = MaxLength - form.find('#'+SN.C.S.NoticeDataText).val().length; + var counter = form.find('#'+SN.C.S.NoticeTextCount); if (remaining.toString() != counter.text()) { if (!SN.C.I.CounterBlackout || remaining === 0) { @@ -174,7 +171,6 @@ var SN = { // StatusNet FormNoticeXHR: function(form) { SN.C.I.NoticeDataGeo = {}; - form_id = form.attr('id'); form.append(''); form.ajaxForm({ dataType: 'xml', -- cgit v1.2.3-54-g00ecf From 9c63ae6e443e7b23f64e31617a1762393473509a Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 25 Mar 2010 16:58:05 -0400 Subject: add whitelist and blacklist for openid URLs --- plugins/OpenID/finishopenidlogin.php | 3 +++ plugins/OpenID/openid.php | 29 +++++++++++++++++++++++++++++ plugins/OpenID/openidlogin.php | 2 ++ 3 files changed, 34 insertions(+) diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php index 1f9bde0f1..f3a483300 100644 --- a/plugins/OpenID/finishopenidlogin.php +++ b/plugins/OpenID/finishopenidlogin.php @@ -158,6 +158,9 @@ class FinishopenidloginAction extends Action $canonical = ($response->endpoint->canonicalID) ? $response->endpoint->canonicalID : $response->getDisplayIdentifier(); + oid_assert_allowed($display); + oid_assert_allowed($canonical); + $sreg_resp = Auth_OpenID_SRegResponse::fromSuccessResponse($response); if ($sreg_resp) { diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php index d49941aed..152438917 100644 --- a/plugins/OpenID/openid.php +++ b/plugins/OpenID/openid.php @@ -257,6 +257,35 @@ function oid_update_user(&$user, &$sreg) return true; } +function oid_assert_allowed($url) +{ + $blacklist = common_config('openid', 'blacklist'); + $whitelist = common_config('openid', 'whitelist'); + + if (empty($blacklist)) { + $blacklist = array(); + } + + if (empty($whitelist)) { + $whitelist = array(); + } + + foreach ($blacklist as $pattern) { + if (preg_match("/$pattern/", $url)) { + common_log(LOG_INFO, "Matched OpenID blacklist pattern {$pattern} with {$url}"); + foreach ($whitelist as $exception) { + if (preg_match("/$exception/", $url)) { + common_log(LOG_INFO, "Matched OpenID whitelist pattern {$exception} with {$url}"); + return; + } + } + throw new ClientException(_m("Unauthorized URL used for OpenID login."), 403); + } + } + + return; +} + class AutosubmitAction extends Action { var $form_html = null; diff --git a/plugins/OpenID/openidlogin.php b/plugins/OpenID/openidlogin.php index 9ba55911c..2a743672c 100644 --- a/plugins/OpenID/openidlogin.php +++ b/plugins/OpenID/openidlogin.php @@ -31,6 +31,8 @@ class OpenidloginAction extends Action } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { $openid_url = $this->trimmed('openid_url'); + oid_assert_allowed($openid_url); + # CSRF protection $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { -- cgit v1.2.3-54-g00ecf From c11064a5398db824f2623c5763b3fdfdf8ae3c39 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 25 Mar 2010 14:15:54 -0700 Subject: Updated 'more' anchor for attachments to do an XHR GET Conflicts: lib/attachmentlist.php plugins/OStatus/classes/Ostatus_profile.php Merge tried to delete things that it seems it shouldn't, very confusing order. Hope rest of the cherry-picking isn't a problem. --- js/util.js | 110 +++++++++++++++------------- lib/attachmentlist.php | 53 ++++++++++++++ plugins/OStatus/classes/Ostatus_profile.php | 18 ++++- theme/base/css/display.css | 9 ++- theme/default/css/display.css | 3 +- theme/identica/css/display.css | 3 +- 6 files changed, 141 insertions(+), 55 deletions(-) diff --git a/js/util.js b/js/util.js index f82ca992c..79fd40deb 100644 --- a/js/util.js +++ b/js/util.js @@ -399,58 +399,70 @@ var SN = { // StatusNet return; } - $.fn.jOverlay.options = { - method : 'GET', - data : '', - url : '', - color : '#000', - opacity : '0.6', - zIndex : 9999, - center : false, - imgLoading : $('address .url')[0].href+'theme/base/images/illustrations/illu_progress_loading-01.gif', - bgClickToClose : true, - success : function() { - $('#jOverlayContent').append(''); - $('#jOverlayContent button').click($.closeOverlay); - }, - timeout : 0, - autoHide : true, - css : {'max-width':'542px', 'top':'5%', 'left':'32.5%'} - }; - - notice.find('a.attachment').click(function() { - var attachId = ($(this).attr('id').substring('attachment'.length + 1)); - if (attachId) { - $().jOverlay({url: $('address .url')[0].href+'attachment/' + attachId + '/ajax'}); - return false; - } - }); + var attachment_more = notice.find('.attachment.more'); + if (attachment_more.length > 0) { + attachment_more.click(function() { + $.get($(this).attr('href')+'/ajax', null, function(data) { + notice.find('.entry-title .entry-content').html($(data).find('#attachment_view .entry-content').html()); + }); - if ($('#shownotice').length == 0) { - var t; - notice.find('a.thumbnail').hover( - function() { - var anchor = $(this); - $('a.thumbnail').children('img').hide(); - anchor.closest(".entry-title").addClass('ov'); - - if (anchor.children('img').length === 0) { - t = setTimeout(function() { - $.get($('address .url')[0].href+'attachment/' + (anchor.attr('id').substring('attachment'.length + 1)) + '/thumbnail', null, function(data) { - anchor.append(data); - }); - }, 500); - } - else { - anchor.children('img').show(); - } + return false; + }); + } + else { + $.fn.jOverlay.options = { + method : 'GET', + data : '', + url : '', + color : '#000', + opacity : '0.6', + zIndex : 9999, + center : false, + imgLoading : $('address .url')[0].href+'theme/base/images/illustrations/illu_progress_loading-01.gif', + bgClickToClose : true, + success : function() { + $('#jOverlayContent').append(''); + $('#jOverlayContent button').click($.closeOverlay); }, - function() { - clearTimeout(t); - $('a.thumbnail').children('img').hide(); - $(this).closest('.entry-title').removeClass('ov'); + timeout : 0, + autoHide : true, + css : {'max-width':'542px', 'top':'5%', 'left':'32.5%'} + }; + + notice.find('a.attachment').click(function() { + var attachId = ($(this).attr('id').substring('attachment'.length + 1)); + if (attachId) { + $().jOverlay({url: $('address .url')[0].href+'attachment/' + attachId + '/ajax'}); + return false; } - ); + }); + + if ($('#shownotice').length == 0) { + var t; + notice.find('a.thumbnail').hover( + function() { + var anchor = $(this); + $('a.thumbnail').children('img').hide(); + anchor.closest(".entry-title").addClass('ov'); + + if (anchor.children('img').length === 0) { + t = setTimeout(function() { + $.get($('address .url')[0].href+'attachment/' + (anchor.attr('id').substring('attachment'.length + 1)) + '/thumbnail', null, function(data) { + anchor.append(data); + }); + }, 500); + } + else { + anchor.children('img').show(); + } + }, + function() { + clearTimeout(t); + $('a.thumbnail').children('img').hide(); + $(this).closest('.entry-title').removeClass('ov'); + } + ); + } } }, diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php index b503bfb45..c6261dea5 100644 --- a/lib/attachmentlist.php +++ b/lib/attachmentlist.php @@ -359,6 +359,59 @@ class Attachment extends AttachmentListItem } } + protected function showHtmlFile(File $attachment) + { + $body = $this->scrubHtmlFile($attachment); + if ($body) { + $this->out->raw($body); + } + } + + /** + * @return mixed false on failure, HTML fragment string on success + */ + protected function scrubHtmlFile(File $attachment) + { + $path = File::path($attachment->filename); + if (!file_exists($path) || !is_readable($path)) { + common_log(LOG_ERR, "Missing local HTML attachment $path"); + return false; + } + $raw = file_get_contents($path); + + // Normalize... + $dom = new DOMDocument(); + if(!$dom->loadHTML($raw)) { + common_log(LOG_ERR, "Bad HTML in local HTML attachment $path"); + return false; + } + + // Remove