From 5d88e6435f5b6725c09480a7d7cd4a8a80a62202 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 13 Jan 2010 21:07:01 +0000 Subject: [PATCH 1/4] Changed to margin instead of list position in order to avoid text wrapping from the bullet point --- theme/base/css/display.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index cdacb9a629..e89661637e 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1502,7 +1502,7 @@ width:auto; .system_notice ul, .instructions ul { -list-style-position:inside; +margin-left:1em; } .instructions p, .instructions ul { From 21444929bdc72a52144b160468ec2d8b2681a534 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Wed, 13 Jan 2010 23:09:23 +0100 Subject: [PATCH 2/4] Localisation updates for !StatusNet from !translatewiki.net !sntrans --- locale/ar/LC_MESSAGES/statusnet.po | 222 ++++++------ locale/arz/LC_MESSAGES/statusnet.po | 222 ++++++------ locale/bg/LC_MESSAGES/statusnet.po | 231 +++++++------ locale/ca/LC_MESSAGES/statusnet.po | 304 ++++++++-------- locale/cs/LC_MESSAGES/statusnet.po | 210 ++++++----- locale/de/LC_MESSAGES/statusnet.po | 235 +++++++------ locale/el/LC_MESSAGES/statusnet.po | 208 ++++++----- locale/en_GB/LC_MESSAGES/statusnet.po | 236 +++++++------ locale/es/LC_MESSAGES/statusnet.po | 244 +++++++------ locale/fa/LC_MESSAGES/statusnet.po | 230 +++++++------ locale/fi/LC_MESSAGES/statusnet.po | 224 ++++++------ locale/fr/LC_MESSAGES/statusnet.po | 310 +++++++++-------- locale/ga/LC_MESSAGES/statusnet.po | 218 ++++++------ locale/he/LC_MESSAGES/statusnet.po | 210 ++++++----- locale/hsb/LC_MESSAGES/statusnet.po | 224 ++++++------ locale/ia/LC_MESSAGES/statusnet.po | 229 ++++++------ locale/is/LC_MESSAGES/statusnet.po | 224 ++++++------ locale/it/LC_MESSAGES/statusnet.po | 286 +++++++-------- locale/ja/LC_MESSAGES/statusnet.po | 478 +++++++++++++------------- locale/ko/LC_MESSAGES/statusnet.po | 224 ++++++------ locale/mk/LC_MESSAGES/statusnet.po | 309 +++++++++-------- locale/nb/LC_MESSAGES/statusnet.po | 209 ++++++----- locale/nl/LC_MESSAGES/statusnet.po | 315 ++++++++--------- locale/nn/LC_MESSAGES/statusnet.po | 224 ++++++------ locale/pl/LC_MESSAGES/statusnet.po | 281 +++++++-------- locale/pt/LC_MESSAGES/statusnet.po | 287 ++++++++-------- locale/pt_BR/LC_MESSAGES/statusnet.po | 252 +++++++------- locale/ru/LC_MESSAGES/statusnet.po | 270 ++++++++------- locale/statusnet.po | 201 ++++++----- locale/sv/LC_MESSAGES/statusnet.po | 252 +++++++------- locale/te/LC_MESSAGES/statusnet.po | 280 +++++++-------- locale/tr/LC_MESSAGES/statusnet.po | 210 ++++++----- locale/uk/LC_MESSAGES/statusnet.po | 300 ++++++++-------- locale/vi/LC_MESSAGES/statusnet.po | 209 ++++++----- locale/zh_CN/LC_MESSAGES/statusnet.po | 219 ++++++------ locale/zh_TW/LC_MESSAGES/statusnet.po | 210 ++++++----- 36 files changed, 4772 insertions(+), 4225 deletions(-) diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po index 7f80c9be38..4e63e3e330 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:26:04+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:04:40+0000\n" "Language-Team: Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ar\n" "X-Message-Group: out-statusnet\n" @@ -45,10 +45,10 @@ msgstr "لا صفحة كهذه" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "لا مستخدم كهذا." @@ -379,7 +379,7 @@ msgstr "" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "تعذّر إنشاء المجموعة." @@ -388,7 +388,7 @@ msgstr "تعذّر إنشاء المجموعة." msgid "You are not a member of this group." msgstr "" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "تعذّر إنشاء المجموعة." @@ -678,7 +678,7 @@ msgstr "فشل حفظ معلومات المنع." #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "لا مجموعة كهذه." @@ -1616,7 +1616,7 @@ msgstr "دعوة مستخدمين جدد" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1657,7 +1657,7 @@ msgstr "رسالة شخصية" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "أرسل" @@ -1701,7 +1701,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s انضم إلى مجموعة %s" @@ -1710,15 +1710,11 @@ msgstr "%s انضم إلى مجموعة %s" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "لست عضوا في تلك المجموعة." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s انضم إلى مجموعة %s" @@ -1815,12 +1811,12 @@ msgstr "استخدم هذا النموذج لإنشاء مجموعة جديدة. msgid "New message" msgstr "رسالة جديدة" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "لا محتوى!" @@ -1828,7 +1824,7 @@ msgstr "لا محتوى!" msgid "No recipient specified." msgstr "لا مستلم حُدّد." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -3820,8 +3816,23 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "ملف المجموعة الشخصي" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "تعذر تحديث المجموعة." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "ملف المجموعة الشخصي" + #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" msgstr "لم يمكن إنشاء توكن الولوج ل%s" @@ -3837,49 +3848,49 @@ msgstr "تعذّر إدراج الرسالة." msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "مشكلة في حفظ الإشعار. طويل جدًا." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "مشكلة في حفظ الإشعار. مستخدم غير معروف." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "مشكلة أثناء حفظ الإشعار." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تي @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "أهلا بكم في %1$s يا @%2$s!" @@ -4207,14 +4218,13 @@ msgstr "" "المشتركون: %2$s\n" "الإشعارات: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 msgid "User has no last notice" msgstr "ليس للمستخدم إشعار أخير" @@ -4227,145 +4237,144 @@ msgstr "" msgid "You are already a member of that group" msgstr "لست عضوا في تلك المجموعة." -#: lib/command.php:234 +#: lib/command.php:231 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "تعذّر إنشاء المجموعة." -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%s انضم إلى مجموعة %s" -#: lib/command.php:284 +#: lib/command.php:275 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "تعذّر إنشاء المجموعة." -#: lib/command.php:289 +#: lib/command.php:280 #, fuzzy, php-format msgid "%s left group %s" msgstr "%s انضم إلى مجموعة %s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "الاسم الكامل: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "الموقع: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "الصفحة الرئيسية: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "عن: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, fuzzy, php-format msgid "Direct message to %s sent" msgstr "رسالة مباشرة %s" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "لا يمكنك تكرار ملحوظتك الخاصة." -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" -msgstr "كرر بالفعل هذه الملاحظة." +msgstr "كرر بالفعل هذا الإشعار" -#: lib/command.php:435 -#, fuzzy, php-format +#: lib/command.php:426 +#, php-format msgid "Notice from %s repeated" msgstr "الإشعار من %s مكرر" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "خطأ تكرار الإشعار." -#: lib/command.php:491 +#: lib/command.php:482 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Reply to %s sent" msgstr "رُد على رسالة %s" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "خطأ أثناء حفظ الإشعار." -#: lib/command.php:556 +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "مُشترك ب%s" -#: lib/command.php:584 +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "لست مُشتركًا بأي أحد." -#: lib/command.php:679 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "لست مشتركًا بأحد." @@ -4375,11 +4384,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "لا أحد مشترك بك." -#: lib/command.php:701 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "لا أحد مشترك بك." @@ -4389,11 +4398,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "لست عضوًا في أي مجموعة." -#: lib/command.php:723 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "لست عضوًا في أي مجموعة." @@ -4403,7 +4412,7 @@ msgstr[3] "أنت عضو في هذه المجموعات:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4444,19 +4453,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "" -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "اذهب إلى المُثبّت." @@ -4654,11 +4663,16 @@ msgstr "ميجابايت" msgid "kB" msgstr "كيلوبايت" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "لغة غير معروفة \"%s\"" + #: lib/joinform.php:114 msgid "Join" msgstr "انضم" @@ -4961,15 +4975,21 @@ msgstr "أرفق ملفًا" msgid "Share my location" msgstr "لم يمكن حفظ تفضيلات الموقع." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "لم يمكن حفظ تفضيلات الموقع." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5228,23 +5248,23 @@ msgstr "مُشترك أصلا!" msgid "User has blocked you." msgstr "لقد منعك المستخدم." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "تعذّر الاشتراك." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "غير مشترك!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "لم يمكن حذف اشتراك ذاتي." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "تعذّر حذف الاشتراك." @@ -5318,47 +5338,47 @@ msgstr "رسالة" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "قبل لحظات قليلة" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "قبل دقيقة تقريبًا" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "قبل ساعة تقريبًا" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "قبل يوم تقريبا" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "قبل شهر تقريبًا" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "قبل سنة تقريبًا" diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po index 2c8fc18d1f..fbdc010631 100644 --- a/locale/arz/LC_MESSAGES/statusnet.po +++ b/locale/arz/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:26:08+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:04:44+0000\n" "Language-Team: Egyptian Spoken Arabic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: arz\n" "X-Message-Group: out-statusnet\n" @@ -44,10 +44,10 @@ msgstr "لا صفحه كهذه" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "لا مستخدم كهذا." @@ -378,7 +378,7 @@ msgstr "" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "تعذّر إنشاء المجموعه." @@ -387,7 +387,7 @@ msgstr "تعذّر إنشاء المجموعه." msgid "You are not a member of this group." msgstr "" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "تعذّر إنشاء المجموعه." @@ -677,7 +677,7 @@ msgstr "فشل حفظ معلومات المنع." #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "لا مجموعه كهذه." @@ -1615,7 +1615,7 @@ msgstr "دعوه مستخدمين جدد" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1656,7 +1656,7 @@ msgstr "رساله شخصية" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "أرسل" @@ -1700,7 +1700,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s انضم إلى مجموعه %s" @@ -1709,15 +1709,11 @@ msgstr "%s انضم إلى مجموعه %s" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "لست عضوا فى تلك المجموعه." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s انضم إلى مجموعه %s" @@ -1814,12 +1810,12 @@ msgstr "استخدم هذا النموذج لإنشاء مجموعه جديده. msgid "New message" msgstr "رساله جديدة" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "لا محتوى!" @@ -1827,7 +1823,7 @@ msgstr "لا محتوى!" msgid "No recipient specified." msgstr "لا مستلم حُدّد." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -3819,8 +3815,23 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "ملف المجموعه الشخصي" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "تعذر تحديث المجموعه." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "ملف المجموعه الشخصي" + #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" msgstr "لم يمكن إنشاء توكن الولوج ل%s" @@ -3836,49 +3847,49 @@ msgstr "تعذّر إدراج الرساله." msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "مشكله فى حفظ الإشعار. طويل جدًا." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "مشكله فى حفظ الإشعار. مستخدم غير معروف." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "مشكله أثناء حفظ الإشعار." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "آر تى @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "أهلا بكم فى %1$s يا @%2$s!" @@ -4206,14 +4217,13 @@ msgstr "" "المشتركون: %2$s\n" "الإشعارات: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 msgid "User has no last notice" msgstr "ليس للمستخدم إشعار أخير" @@ -4226,145 +4236,144 @@ msgstr "" msgid "You are already a member of that group" msgstr "لست عضوا فى تلك المجموعه." -#: lib/command.php:234 +#: lib/command.php:231 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "تعذّر إنشاء المجموعه." -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%s انضم إلى مجموعه %s" -#: lib/command.php:284 +#: lib/command.php:275 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "تعذّر إنشاء المجموعه." -#: lib/command.php:289 +#: lib/command.php:280 #, fuzzy, php-format msgid "%s left group %s" msgstr "%s انضم إلى مجموعه %s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "الاسم الكامل: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "الموقع: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "الصفحه الرئيسية: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "عن: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, fuzzy, php-format msgid "Direct message to %s sent" msgstr "رساله مباشره %s" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "لا يمكنك تكرار ملحوظتك الخاصه." -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" -msgstr "كرر بالفعل هذه الملاحظه." +msgstr "كرر بالفعل هذا الإشعار" -#: lib/command.php:435 -#, fuzzy, php-format +#: lib/command.php:426 +#, php-format msgid "Notice from %s repeated" msgstr "الإشعار من %s مكرر" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "خطأ تكرار الإشعار." -#: lib/command.php:491 +#: lib/command.php:482 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Reply to %s sent" msgstr "رُد على رساله %s" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "خطأ أثناء حفظ الإشعار." -#: lib/command.php:556 +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "مُشترك ب%s" -#: lib/command.php:584 +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "لست مُشتركًا بأى أحد." -#: lib/command.php:679 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "لست مشتركًا بأحد." @@ -4374,11 +4383,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "لا أحد مشترك بك." -#: lib/command.php:701 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "لا أحد مشترك بك." @@ -4388,11 +4397,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "لست عضوًا فى أى مجموعه." -#: lib/command.php:723 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "لست عضوًا فى أى مجموعه." @@ -4402,7 +4411,7 @@ msgstr[3] "أنت عضو فى هذه المجموعات:" msgstr[4] "" msgstr[5] "" -#: lib/command.php:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4443,19 +4452,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "" -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "اذهب إلى المُثبّت." @@ -4653,11 +4662,16 @@ msgstr "ميجابايت" msgid "kB" msgstr "كيلوبايت" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "لغه غير معروفه \"%s\"" + #: lib/joinform.php:114 msgid "Join" msgstr "انضم" @@ -4960,15 +4974,21 @@ msgstr "أرفق ملفًا" msgid "Share my location" msgstr "لم يمكن حفظ تفضيلات الموقع." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "لم يمكن حفظ تفضيلات الموقع." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5227,23 +5247,23 @@ msgstr "مُشترك أصلا!" msgid "User has blocked you." msgstr "لقد منعك المستخدم." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "تعذّر الاشتراك." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "غير مشترك!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "لم يمكن حذف اشتراك ذاتى." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "تعذّر حذف الاشتراك." @@ -5317,47 +5337,47 @@ msgstr "رسالة" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "قبل لحظات قليلة" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "قبل دقيقه تقريبًا" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "قبل ساعه تقريبًا" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "قبل يوم تقريبا" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "قبل شهر تقريبًا" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "قبل سنه تقريبًا" diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po index db950916be..7fe8ac423c 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:26:12+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:04:47+0000\n" "Language-Team: Bulgarian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: bg\n" "X-Message-Group: out-statusnet\n" @@ -44,10 +44,10 @@ msgstr "Няма такака страница." #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Няма такъв потребител" @@ -385,7 +385,7 @@ msgstr "Вече членувате в тази група." msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Грешка при проследяване — потребителят не е намерен." @@ -394,7 +394,7 @@ msgstr "Грешка при проследяване — потребителя msgid "You are not a member of this group." msgstr "Не членувате в тази група." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Грешка при проследяване — потребителят не е намерен." @@ -686,7 +686,7 @@ msgstr "Грешка при записване данните за блокир #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "Няма такава група" @@ -1665,7 +1665,7 @@ msgstr "Покани за нови потребители" msgid "You are already subscribed to these users:" msgstr "Вече сте абонирани за следните потребители:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1710,7 +1710,7 @@ msgstr "Лично съобщение" msgid "Optionally add a personal message to the invitation." msgstr "Може да добавите и лично съобщение към поканата." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Прати" @@ -1780,7 +1780,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "За да се присъедините към група, трябва да сте влезли." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s се присъедини към групата %s" @@ -1789,16 +1789,11 @@ msgstr "%s се присъедини към групата %s" msgid "You must be logged in to leave a group." msgstr "За напуснете група, трябва да сте влезли." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Не членувате в тази група." -#: actions/leavegroup.php:119 lib/command.php:278 -#, fuzzy -msgid "Could not find membership record." -msgstr "Грешка при обновяване записа на потребител." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s напусна групата %s" @@ -1900,12 +1895,12 @@ msgstr "Използвайте тази бланка за създаване н msgid "New message" msgstr "Ново съобщение" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Не може да изпращате съобщения до този потребител." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Няма съдържание!" @@ -1913,7 +1908,7 @@ msgstr "Няма съдържание!" msgid "No recipient specified." msgstr "Не е указан получател." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -3970,6 +3965,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Профил на групата" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Грешка при обновяване на групата." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Профил на групата" + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -3988,28 +3998,28 @@ msgstr "Грешка при вмъкване на съобщението." msgid "Could not update message with new URI." msgstr "Грешка при обновяване на бележката с нов URL-адрес." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Проблем при записване на бележката." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Грешка при записване на бележката. Непознат потребител." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте " "отново след няколко минути." -#: classes/Notice.php:241 +#: classes/Notice.php:240 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4018,25 +4028,25 @@ msgstr "" "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте " "отново след няколко минути." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Забранено ви е да публикувате бележки в този сайт." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Проблем при записване на бележката." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Грешка в базата от данни — отговор при вмъкването: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добре дошли в %1$s, @%2$s!" @@ -4358,7 +4368,7 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" msgstr "Изпратено е побутване на %s" @@ -4373,14 +4383,13 @@ msgstr "" "Абонати: %2$s\n" "Бележки: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 msgid "User has no last notice" msgstr "Потребителят няма последна бележка" @@ -4389,179 +4398,174 @@ msgid "Notice marked as fave." msgstr "Бележката е отбелязана като любима." #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" msgstr "Вече членувате в тази група." -#: lib/command.php:234 +#: lib/command.php:231 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "Грешка при проследяване — потребителят не е намерен." -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%s се присъедини към групата %s" -#: lib/command.php:284 +#: lib/command.php:275 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "Грешка при проследяване — потребителят не е намерен." -#: lib/command.php:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%s напусна групата %s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Пълно име: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Местоположение: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Домашна страница: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Относно: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" "Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d." -#: lib/command.php:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "Прякото съобщение до %s е изпратено." -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Грешка при изпращане на прякото съобщение" -#: lib/command.php:422 -#, fuzzy +#: lib/command.php:413 msgid "Cannot repeat your own notice" -msgstr "Не можете да повтаряте собствени бележки." +msgstr "Не можете да повтаряте собствена бележка" -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" msgstr "Вече сте повторили тази бележка." -#: lib/command.php:435 -#, fuzzy, php-format +#: lib/command.php:426 +#, php-format msgid "Notice from %s repeated" msgstr "Бележката от %s е повторена" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Грешка при повтаряне на бележката." -#: lib/command.php:491 +#: lib/command.php:482 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d." -#: lib/command.php:500 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Reply to %s sent" msgstr "Отговорът до %s е изпратен" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Грешка при записване на бележката." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "Уточнете името на потребителя, за когото се абонирате." -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Абонирани сте за %s." -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "Уточнете името на потребителя, от когото се отписвате." -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Отписани сте от %s." -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Командата все още не се поддържа." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Уведомлението е изключено." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Грешка при изключване на уведомлението." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Уведомлението е включено." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Грешка при включване на уведомлението." -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "Не сте абонирани за никого." -#: lib/command.php:679 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Вече сте абонирани за следните потребители:" msgstr[1] "Вече сте абонирани за следните потребители:" -#: lib/command.php:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "Никой не е абониран за вас." -#: lib/command.php:701 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Грешка при абониране на друг потребител за вас." msgstr[1] "Грешка при абониране на друг потребител за вас." -#: lib/command.php:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "Не членувате в нито една група." -#: lib/command.php:723 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Не членувате в тази група." msgstr[1] "Не членувате в тази група." -#: lib/command.php:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4602,19 +4606,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Не е открит файл с настройки. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 #, fuzzy msgid "Go to the installer." msgstr "Влизане в сайта" @@ -4818,11 +4822,16 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Непознат език \"%s\"" + #: lib/joinform.php:114 msgid "Join" msgstr "Присъединяване" @@ -5137,15 +5146,21 @@ msgstr "Прикрепяне на файл" msgid "Share my location" msgstr "Грешка при запазване етикетите." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Грешка при запазване етикетите." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5412,25 +5427,25 @@ msgstr "" msgid "User has blocked you." msgstr "Потребителят ви е блокирал." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Грешка при абониране." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Грешка при абониране на друг потребител за вас." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Не сте абонирани!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Грешка при изтриване на абонамента." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Грешка при изтриване на абонамента." @@ -5506,47 +5521,47 @@ msgstr "Съобщение" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "преди няколко секунди" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "преди около минута" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "преди около %d минути" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "преди около час" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "преди около %d часа" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "преди около ден" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "преди около %d дни" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "преди около месец" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "преди около %d месеца" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "преди около година" diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po index eb6a6a3af8..8ad8d18eca 100644 --- a/locale/ca/LC_MESSAGES/statusnet.po +++ b/locale/ca/LC_MESSAGES/statusnet.po @@ -9,12 +9,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:26:17+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:04:50+0000\n" "Language-Team: Catalan\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ca\n" "X-Message-Group: out-statusnet\n" @@ -44,10 +44,10 @@ msgstr "No existeix la pàgina." #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "No existeix aquest usuari." @@ -391,9 +391,9 @@ msgstr "Ja sou membre del grup." #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 msgid "You have been blocked from that group by the admin." -msgstr "" +msgstr "L'administrador us ha blocat del grup." -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "No s'ha pogut afegir l'usuari %s al grup %s." @@ -402,7 +402,7 @@ msgstr "No s'ha pogut afegir l'usuari %s al grup %s." msgid "You are not a member of this group." msgstr "No sou un membre del grup." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "No s'ha pogut suprimir l'usuari %s del grup %s." @@ -525,9 +525,9 @@ msgid "Repeated to %s" msgstr "Respostes a %s" #: actions/apitimelineretweetsofme.php:112 -#, fuzzy, php-format +#, php-format msgid "Repeats of %s" -msgstr "Respostes a %s" +msgstr "Repeticions de %s" #: actions/apitimelinetag.php:102 actions/tag.php:66 #, php-format @@ -535,9 +535,9 @@ msgid "Notices tagged with %s" msgstr "Aviso etiquetats amb %s" #: actions/apitimelinetag.php:108 actions/tagrss.php:64 -#, fuzzy, php-format +#, php-format msgid "Updates tagged with %1$s on %2$s!" -msgstr "Actualitzacions de %1$s a %2$s!" +msgstr "Actualitzacions etiquetades amb %1$s el %2$s!" #: actions/apiusershow.php:96 msgid "Not found." @@ -699,7 +699,7 @@ msgstr "Error al guardar la informació del block." #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "No s'ha trobat el grup." @@ -719,9 +719,8 @@ msgid "A list of the users blocked from joining this group." msgstr "La llista dels usuaris d'aquest grup." #: actions/blockedfromgroup.php:281 -#, fuzzy msgid "Unblock user from group" -msgstr "Ha fallat el desbloqueig d'usuari." +msgstr "Desbloca l'usuari del grup" #: actions/blockedfromgroup.php:313 lib/unblockform.php:69 msgid "Unblock" @@ -1377,7 +1376,7 @@ msgstr "Bloca l'usuari del grup" #: actions/groupblock.php:196 msgid "Database error blocking user from group." -msgstr "" +msgstr "S'ha produït un error en la base de dades en blocar l'usuari del grup." #: actions/groupbyid.php:74 actions/userbyid.php:70 #, fuzzy @@ -1544,9 +1543,8 @@ msgid "Error removing the block." msgstr "S'ha produït un error en suprimir el bloc." #: actions/imsettings.php:59 -#, fuzzy msgid "IM settings" -msgstr "Configuració de missatgeria instantània" +msgstr "Paràmetres de missatgeria instantània" #: actions/imsettings.php:70 #, php-format @@ -1576,7 +1574,6 @@ msgstr "" "llista d'amics?)" #: actions/imsettings.php:124 -#, fuzzy msgid "IM address" msgstr "Adreça de missatgeria instantània" @@ -1680,7 +1677,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:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1726,7 +1723,7 @@ msgstr "Missatge personal" msgid "Optionally add a personal message to the invitation." msgstr "Opcionalment pots afegir un missatge a la invitació." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Envia" @@ -1796,24 +1793,20 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Has d'haver entrat per participar en un grup." -#: actions/joingroup.php:135 -#, fuzzy, php-format +#: actions/joingroup.php:131 +#, php-format msgid "%1$s joined group %2$s" -msgstr "%s s'ha pogut afegir al grup %s" +msgstr "%1$s s'ha unit al grup %2$s" #: actions/leavegroup.php:60 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:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "No ets membre d'aquest grup." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "No s'han trobat registres dels membres." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s ha abandonat el grup %s" @@ -1918,12 +1911,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:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 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:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Cap contingut!" @@ -1931,7 +1924,7 @@ msgstr "Cap contingut!" msgid "No recipient specified." msgstr "No has especificat el destinatari." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 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ò." @@ -1971,9 +1964,9 @@ msgid "Text search" msgstr "Cerca de text" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "Cerca resultats de «%s» a %s" +msgstr "Cerca els resultats de «%s» a %s" #: actions/noticesearch.php:121 #, php-format @@ -2469,9 +2462,8 @@ msgid "Couldn't update user for autosubscribe." msgstr "No es pot actualitzar l'usuari per autosubscriure." #: actions/profilesettings.php:359 -#, fuzzy msgid "Couldn't save location prefs." -msgstr "No s'han pogut guardar les etiquetes." +msgstr "No s'han pogut desar les preferències d'ubicació." #: actions/profilesettings.php:371 msgid "Couldn't save profile." @@ -2488,7 +2480,7 @@ msgstr "Configuració guardada." #: actions/public.php:83 #, php-format msgid "Beyond the page limit (%s)" -msgstr "" +msgstr "Més enllà del límit de la pàgina (%s)" #: actions/public.php:92 msgid "Could not retrieve public stream." @@ -2521,6 +2513,8 @@ msgid "" "This is the public timeline for %%site.name%% but no one has posted anything " "yet." msgstr "" +"Aquesta és la línia temporal pública de %%site.name%%, però ningú no hi ha " +"enviat res encara." #: actions/public.php:182 msgid "Be the first to post!" @@ -3278,7 +3272,7 @@ msgstr "" #: actions/siteadminpanel.php:262 msgid "Text used for credits link in footer of each page" -msgstr "" +msgstr "El text que s'utilitza a l'enllaç dels crèdits al peu de cada pàgina" #: actions/siteadminpanel.php:266 msgid "Brought by URL" @@ -3318,7 +3312,7 @@ msgstr "Servidor" #: actions/siteadminpanel.php:306 msgid "Site's server hostname." -msgstr "" +msgstr "Servidor central del lloc." #: actions/siteadminpanel.php:310 msgid "Fancy URLs" @@ -3339,6 +3333,8 @@ msgstr "Privat" #: actions/siteadminpanel.php:323 msgid "Prohibit anonymous users (not logged in) from viewing site?" msgstr "" +"Voleu prohibir als usuaris anònims (que no han iniciat cap sessió) " +"visualitzar el lloc?" #: actions/siteadminpanel.php:327 msgid "Invite only" @@ -3358,7 +3354,7 @@ msgstr "Inhabilita els nous registres." #: actions/siteadminpanel.php:341 msgid "Snapshots" -msgstr "" +msgstr "Instantànies" #: actions/siteadminpanel.php:344 msgid "Randomly during Web hit" @@ -3366,11 +3362,11 @@ msgstr "" #: actions/siteadminpanel.php:345 msgid "In a scheduled job" -msgstr "" +msgstr "En una tasca planificada" #: actions/siteadminpanel.php:347 msgid "Data snapshots" -msgstr "" +msgstr "Instantànies de dades" #: actions/siteadminpanel.php:348 msgid "When to send statistical data to status.net servers" @@ -3390,7 +3386,7 @@ msgstr "" #: actions/siteadminpanel.php:360 msgid "Snapshots will be sent to this URL" -msgstr "" +msgstr "Les instantànies s'enviaran a aquest URL" #: actions/siteadminpanel.php:367 msgid "Limits" @@ -3415,9 +3411,8 @@ msgstr "" "de nou." #: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 -#, fuzzy msgid "Save site settings" -msgstr "Configuració de l'avatar" +msgstr "Desa els paràmetres del lloc" #: actions/smssettings.php:58 #, fuzzy @@ -3570,7 +3565,7 @@ msgstr "" #: actions/subscribers.php:110 #, php-format msgid "%s has no subscribers. Want to be the first?" -msgstr "" +msgstr "%s no té subscriptors. Voleu ser-ne el primer?" #: actions/subscribers.php:114 #, php-format @@ -3578,6 +3573,8 @@ msgid "" "%s has no subscribers. Why not [register an account](%%%%action.register%%%" "%) and be the first?" msgstr "" +"%s no té subscriptors. Per què no us [registreu](%%%%action.register%%%%) i " +"en sou el primer?" #: actions/subscriptions.php:52 #, php-format @@ -3585,9 +3582,9 @@ msgid "%s subscriptions" msgstr "%s subscripcions" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "%s subscripcions, pàgina %d" +msgstr "%1$s subscripcions, pàgina %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3701,9 +3698,8 @@ msgid "User is not sandboxed." msgstr "Un usuari t'ha bloquejat." #: actions/unsilence.php:72 -#, fuzzy msgid "User is not silenced." -msgstr "L'usuari no té perfil." +msgstr "L'usuari no està silenciat." #: actions/unsubscribe.php:77 msgid "No profile id in request." @@ -3748,11 +3744,11 @@ msgstr "Perfil" #: actions/useradminpanel.php:222 msgid "Bio Limit" -msgstr "" +msgstr "Límit de la biografia" #: actions/useradminpanel.php:223 msgid "Maximum length of a profile bio in characters." -msgstr "" +msgstr "Límit màxim de la biografia d'un perfil (en caràcters)." #: actions/useradminpanel.php:231 msgid "New users" @@ -3804,7 +3800,7 @@ msgstr "Depuració de la sessió" #: actions/useradminpanel.php:278 msgid "Turn on debugging output for sessions." -msgstr "" +msgstr "Activa la sortida de depuració per a les sessions." #: actions/userauthorization.php:105 msgid "Authorize subscription" @@ -3959,7 +3955,7 @@ msgstr "S'ha suprimit l'estat." #: actions/version.php:161 msgid "Contributors" -msgstr "" +msgstr "Col·laboració" #: actions/version.php:168 msgid "" @@ -3986,12 +3982,11 @@ msgstr "" #: actions/version.php:189 msgid "Plugins" -msgstr "" +msgstr "Connectors" #: actions/version.php:195 -#, fuzzy msgid "Name" -msgstr "Sobrenom" +msgstr "Nom" #: actions/version.php:196 lib/action.php:741 #, fuzzy @@ -4024,15 +4019,29 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Perfil del grup" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "No s'ha pogut actualitzar el grup." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Perfil del grup" + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" msgstr "No s'han pogut crear els àlies." #: classes/Message.php:45 -#, fuzzy msgid "You are banned from sending direct messages." -msgstr "Error al enviar el missatge directe." +msgstr "Se us ha bandejat enviar missatges directes." #: classes/Message.php:61 msgid "Could not insert message." @@ -4042,28 +4051,28 @@ msgstr "No s'ha pogut inserir el missatge." msgid "Could not update message with new URI." msgstr "No s'ha pogut inserir el missatge amb la nova URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Hashtag de l'error de la base de dades:%s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problema en guardar l'avís." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Problema al guardar la notificació. Usuari desconegut." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Masses notificacions massa ràpid; pren un respir i publica de nou en uns " "minuts." -#: classes/Notice.php:241 +#: classes/Notice.php:240 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4072,25 +4081,25 @@ msgstr "" "Masses notificacions massa ràpid; pren un respir i publica de nou en uns " "minuts." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Ha estat bandejat de publicar notificacions en aquest lloc." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problema en guardar l'avís." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Error de BD en inserir resposta: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Us donem la benvinguda a %1$s, @%2$s!" @@ -4419,14 +4428,13 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: 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" @@ -4435,181 +4443,178 @@ msgid "Notice marked as fave." msgstr "Nota marcada com a favorita." #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" msgstr "Ja sou membre del grup." -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, 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:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%s s'ha pogut afegir al grup %s" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, 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:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%s ha abandonat el grup %s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Nom complet: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Localització: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Pàgina web: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Sobre tu: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, 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:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "Missatge directe per a %s enviat" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Error al enviar el missatge directe." -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "No es poden posar en on les notificacions." -#: lib/command.php:427 +#: lib/command.php:418 #, fuzzy msgid "Already repeated that notice" msgstr "Eliminar aquesta nota" -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Notificació publicada" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Problema en guardar l'avís." -#: lib/command.php:491 +#: lib/command.php:482 #, 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:500 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Reply to %s sent" msgstr "S'ha enviat la resposta a %s" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "Problema en guardar l'avís." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 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:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Subscrit a %s" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 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:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Has deixat d'estar subscrit a %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Comanda encara no implementada." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notificacions off." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "No es poden posar en off les notificacions." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notificacions on." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "No es poden posar en on les notificacions." -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "No estàs subscrit a aquest perfil." -#: lib/command.php:679 +#: lib/command.php:670 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:699 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "No pots subscriure a un altre a tu mateix." -#: lib/command.php:701 +#: lib/command.php:692 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:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "No sou membre de cap grup." -#: lib/command.php:723 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "No sou un membre del grup." msgstr[1] "No sou un membre del grup." -#: lib/command.php:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4650,19 +4655,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "No s'ha trobat cap fitxer de configuració. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 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:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Vés a l'instal·lador." @@ -4864,11 +4869,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Llengua desconeguda «%s»" + #: lib/joinform.php:114 msgid "Join" msgstr "Inici de sessió" @@ -5187,15 +5197,21 @@ msgstr "Adjunta un fitxer" msgid "Share my location" msgstr "Comparteix la vostra ubicació" -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Comparteix la vostra ubicació" -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5461,25 +5477,25 @@ msgstr "Ja hi esteu subscrit!" msgid "User has blocked you." msgstr "Un usuari t'ha bloquejat." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "No pots subscriure." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "No pots subscriure a un altre a tu mateix." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "No estàs subscrit!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "No s'ha pogut eliminar la subscripció." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "No s'ha pogut eliminar la subscripció." @@ -5554,47 +5570,47 @@ msgstr "Missatge" msgid "Moderate" msgstr "Modera" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "fa pocs segons" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "fa un minut" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "fa %d minuts" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "fa una hora" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "fa %d hores" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "fa un dia" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "fa %d dies" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "fa un mes" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "fa %d mesos" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "fa un any" diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po index 53b0f3b4c8..6d4ee65b64 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:26:21+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:04:54+0000\n" "Language-Team: Czech\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: cs\n" "X-Message-Group: out-statusnet\n" @@ -45,10 +45,10 @@ msgstr "Žádné takové oznámení." #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Žádný takový uživatel." @@ -389,7 +389,7 @@ msgstr "Již jste přihlášen" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Nelze přesměrovat na server: %s" @@ -399,7 +399,7 @@ msgstr "Nelze přesměrovat na server: %s" msgid "You are not a member of this group." msgstr "Neodeslal jste nám profil" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Nelze vytvořit OpenID z: %s" @@ -699,7 +699,7 @@ msgstr "" #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 #, fuzzy msgid "No such group." msgstr "Žádné takové oznámení." @@ -1688,7 +1688,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1729,7 +1729,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Odeslat" @@ -1773,7 +1773,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -1782,16 +1782,12 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 #, fuzzy msgid "You are not a member of that group." msgstr "Neodeslal jste nám profil" -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%1 statusů na %2" @@ -1892,12 +1888,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Žádný obsah!" @@ -1905,7 +1901,7 @@ msgstr "Žádný obsah!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -3979,6 +3975,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Žádné takové oznámení." + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Nelze aktualizovat uživatele" + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Žádné takové oznámení." + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -3996,51 +4007,51 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:230 +#: classes/Notice.php:229 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problém při ukládání sdělení" -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Chyba v DB při vkládání odpovědi: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4360,7 +4371,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" msgstr "Nelze aktualizovat uživatele" @@ -4381,13 +4392,13 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 +#: 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." @@ -4401,179 +4412,179 @@ msgstr "" msgid "You are already a member of that group" msgstr "Již jste přihlášen" -#: lib/command.php:234 +#: lib/command.php:231 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "Nelze přesměrovat na server: %s" -#: lib/command.php:239 +#: lib/command.php:236 #, fuzzy, php-format msgid "%s joined group %s" msgstr "%1 statusů na %2" -#: lib/command.php:284 +#: lib/command.php:275 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "Nelze vytvořit OpenID z: %s" -#: lib/command.php:289 +#: lib/command.php:280 #, fuzzy, php-format msgid "%s left group %s" msgstr "%1 statusů na %2" -#: lib/command.php:318 +#: lib/command.php:309 #, fuzzy, php-format msgid "Fullname: %s" msgstr "Celé jméno" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí." -#: lib/command.php:427 +#: lib/command.php:418 #, fuzzy msgid "Already repeated that notice" msgstr "Odstranit toto oznámení" -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Sdělení" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Problém při ukládání sdělení" -#: lib/command.php:491 +#: lib/command.php:482 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Odpovědi na %s" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "Problém při ukládání sdělení" -#: lib/command.php:556 +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Neodeslal jste nám profil" -#: lib/command.php:679 +#: lib/command.php:670 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:699 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Vzdálený odběr" -#: lib/command.php:701 +#: lib/command.php:692 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:721 +#: lib/command.php:712 #, fuzzy msgid "You are not a member of any groups." msgstr "Neodeslal jste nám profil" -#: lib/command.php:723 +#: lib/command.php:714 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:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4614,20 +4625,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "Žádný potvrzující kód." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4833,11 +4844,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "Přidat se" @@ -5152,15 +5168,21 @@ msgstr "" msgid "Share my location" msgstr "Nelze uložit profil" -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Nelze uložit profil" -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5433,25 +5455,25 @@ msgstr "" msgid "User has blocked you." msgstr "Uživatel nemá profil." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Nepřihlášen!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Nelze smazat odebírání" -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Nelze smazat odebírání" @@ -5528,47 +5550,47 @@ msgstr "Zpráva" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "před pár sekundami" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "asi před minutou" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "asi před %d minutami" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "asi před hodinou" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "asi před %d hodinami" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "asi přede dnem" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "před %d dny" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "asi před měsícem" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "asi před %d mesíci" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "asi před rokem" diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po index 152836338c..d8572b2447 100644 --- a/locale/de/LC_MESSAGES/statusnet.po +++ b/locale/de/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:26:26+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:04:57+0000\n" "Language-Team: German\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: out-statusnet\n" @@ -47,10 +47,10 @@ msgstr "Seite nicht vorhanden" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Unbekannter Benutzer." @@ -394,7 +394,7 @@ msgstr "Du bist bereits Mitglied dieser Gruppe" msgid "You have been blocked from that group by the admin." msgstr "Der Admin dieser Gruppe hat dich gesperrt." -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen." @@ -403,7 +403,7 @@ msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen." msgid "You are not a member of this group." msgstr "Du bist kein Mitglied dieser Gruppe." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Konnte Benutzer %s nicht aus der Gruppe %s entfernen." @@ -698,7 +698,7 @@ msgstr "Konnte Blockierungsdaten nicht speichern." #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "Keine derartige Gruppe." @@ -1673,7 +1673,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:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1723,7 +1723,7 @@ msgstr "" "Wenn du möchtest kannst du zu der Einladung eine persönliche Nachricht " "anfügen." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Senden" @@ -1792,7 +1792,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Du musst angemeldet sein, um Mitglied einer Gruppe zu werden." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s ist der Gruppe %s beigetreten" @@ -1801,15 +1801,11 @@ msgstr "%s ist der Gruppe %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:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Du bist kein Mitglied dieser Gruppe." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Konnte Mitgliedseintrag nicht finden." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s hat die Gruppe %s verlassen" @@ -1911,12 +1907,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:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 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:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Kein Inhalt!" @@ -1924,7 +1920,7 @@ msgstr "Kein Inhalt!" msgid "No recipient specified." msgstr "Kein Empfänger angegeben." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -4041,6 +4037,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Gruppenprofil" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Konnte Gruppe nicht aktualisieren." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Gruppenprofil" + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -4059,27 +4070,27 @@ msgstr "Konnte Nachricht nicht einfügen." msgid "Could not update message with new URI." msgstr "Konnte Nachricht nicht mit neuer URI versehen." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Datenbankfehler beim Einfügen des Hashtags: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Problem bei Speichern der Nachricht. Sie ist zu lang." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in " "ein paar Minuten ab." -#: classes/Notice.php:241 +#: classes/Notice.php:240 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4088,26 +4099,26 @@ msgstr "" "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in " "ein paar Minuten ab." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" "Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problem bei Speichern der Nachricht." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Datenbankfehler beim Einfügen der Antwort: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Herzlich willkommen bei %1$s, @%2$s!" @@ -4420,7 +4431,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "Leider ist dieser Befehl noch nicht implementiert." #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden." @@ -4441,14 +4452,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy +#: 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:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: 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" @@ -4457,179 +4466,174 @@ msgid "Notice marked as fave." msgstr "Nachricht als Favorit markiert." #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" msgstr "Du bist bereits Mitglied dieser Gruppe" -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, php-format msgid "Could not join user %s to group %s" -msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen." +msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen" -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%s ist der Gruppe %s beigetreten" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, php-format msgid "Could not remove user %s to group %s" msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen" -#: lib/command.php:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%s hat die Gruppe %s verlassen" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Vollständiger Name: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Standort: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Homepage: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Über: %s" -#: lib/command.php:358 -#, fuzzy, php-format +#: lib/command.php:349 +#, 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:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "Direkte Nachricht an %s abgeschickt" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Fehler beim Senden der Nachricht" -#: lib/command.php:422 -#, fuzzy +#: lib/command.php:413 msgid "Cannot repeat your own notice" msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen." -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" msgstr "Nachricht bereits wiederholt" -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Nachricht hinzugefügt" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Problem beim Speichern der Nachricht." -#: lib/command.php:491 +#: lib/command.php:482 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "Nachricht zu lange - maximal 140 Zeichen erlaubt, du hast %s gesendet" -#: lib/command.php:500 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Reply to %s sent" msgstr "Antwort an %s gesendet" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Problem beim Speichern der Nachricht." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 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:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "%s abonniert" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 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:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "%s nicht mehr abonniert" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Befehl noch nicht implementiert." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Benachrichtigung deaktiviert." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Konnte Benachrichtigung nicht deaktivieren." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Benachrichtigung aktiviert." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Konnte Benachrichtigung nicht aktivieren." -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Du hast dieses Profil nicht abonniert." -#: lib/command.php:679 +#: lib/command.php:670 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:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "Niemand hat Dich abonniert." -#: lib/command.php:701 +#: lib/command.php:692 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:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "Du bist in keiner Gruppe Mitglied." -#: lib/command.php:723 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Du bist kein Mitglied dieser Gruppe." msgstr[1] "Du bist kein Mitglied dieser Gruppe." -#: lib/command.php:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4670,19 +4674,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Keine Konfigurationsdatei gefunden." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "Ich habe an folgenden Stellen nach Konfigurationsdateien gesucht: " -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 #, fuzzy msgid "Go to the installer." msgstr "Auf der Seite anmelden" @@ -4890,11 +4894,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Unbekannte Sprache „%s“" + #: lib/joinform.php:114 msgid "Join" msgstr "Beitreten" @@ -5265,15 +5274,21 @@ msgstr "" msgid "Share my location" msgstr "Konnte Tags nicht speichern." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Konnte Tags nicht speichern." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5545,25 +5560,25 @@ msgstr "Bereits abonniert!" msgid "User has blocked you." msgstr "Dieser Benutzer hat dich blockiert." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Konnte nicht abbonieren." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Die Gegenseite konnte Dich nicht abonnieren." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Nicht abonniert!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Konnte Abonnement nicht löschen." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Konnte Abonnement nicht löschen." @@ -5639,47 +5654,47 @@ msgstr "Nachricht" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "vor wenigen Sekunden" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "vor einer Minute" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "vor %d Minuten" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "vor einer Stunde" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "vor %d Stunden" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "vor einem Tag" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "vor %d Tagen" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "vor einem Monat" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "vor %d Monaten" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "vor einem Jahr" diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po index ea2ad34fa4..2f9257945b 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:26:31+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:00+0000\n" "Language-Team: Greek\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: el\n" "X-Message-Group: out-statusnet\n" @@ -44,10 +44,10 @@ msgstr "Δεν υπάρχει τέτοιο σελίδα." #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Κανένας τέτοιος χρήστης." @@ -384,7 +384,7 @@ msgstr "" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" @@ -393,7 +393,7 @@ msgstr "Αδύνατη η αποθήκευση των νέων πληροφορ msgid "You are not a member of this group." msgstr "" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Αδύνατη η αποθήκευση του προφίλ." @@ -688,7 +688,7 @@ msgstr "" #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 #, fuzzy msgid "No such group." msgstr "Αδύνατη η αποθήκευση του προφίλ." @@ -1655,7 +1655,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1696,7 +1696,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "" @@ -1740,7 +1740,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -1749,15 +1749,11 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "" -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, php-format msgid "%1$s left group %2$s" msgstr "" @@ -1859,12 +1855,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "" @@ -1872,7 +1868,7 @@ msgstr "" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -3913,6 +3909,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Αδύνατη η αποθήκευση του προφίλ." + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Αδύνατη η αποθήκευση του προφίλ." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Αδύνατη η αποθήκευση του προφίλ." + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -3930,49 +3941,49 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4299,12 +4310,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 msgid "User has no last notice" msgstr "" @@ -4317,173 +4328,173 @@ msgstr "" msgid "You are already a member of that group" msgstr "Ομάδες με τα περισσότερα μέλη" -#: lib/command.php:234 +#: lib/command.php:231 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ" -#: lib/command.php:239 +#: lib/command.php:236 #, fuzzy, php-format msgid "%s joined group %s" msgstr "ομάδες των χρηστών %s" -#: lib/command.php:284 +#: lib/command.php:275 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: lib/command.php:289 +#: lib/command.php:280 #, fuzzy, php-format msgid "%s left group %s" msgstr "ομάδες των χρηστών %s" -#: lib/command.php:318 +#: lib/command.php:309 #, fuzzy, php-format msgid "Fullname: %s" msgstr "Ονοματεπώνυμο" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: lib/command.php:427 +#: lib/command.php:418 #, fuzzy msgid "Already repeated that notice" msgstr "Αδυναμία διαγραφής αυτού του μηνύματος." -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Ρυθμίσεις OpenID" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "" -#: lib/command.php:491 +#: lib/command.php:482 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 +#: lib/command.php:491 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "" -#: lib/command.php:556 +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:679 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:699 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:701 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/command.php:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "Δεν είστε μέλος καμίας ομάδας." -#: lib/command.php:723 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Ομάδες με τα περισσότερα μέλη" msgstr[1] "Ομάδες με τα περισσότερα μέλη" -#: lib/command.php:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4524,20 +4535,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "Ο κωδικός επιβεβαίωσης δεν βρέθηκε." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4737,11 +4748,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "Συμμετοχή" @@ -5046,15 +5062,21 @@ msgstr "" msgid "Share my location" msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Αδύνατη η αποθήκευση του προφίλ." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5318,25 +5340,25 @@ msgstr "" msgid "User has blocked you." msgstr "" -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Απέτυχε η συνδρομή." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Απέτυχε η συνδρομή." -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Απέτυχε η διαγραφή συνδρομής." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Απέτυχε η διαγραφή συνδρομής." @@ -5412,47 +5434,47 @@ msgstr "Μήνυμα" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "" diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 61965f97cf..407007fbf9 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:26:35+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:04+0000\n" "Language-Team: British English\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: en-gb\n" "X-Message-Group: out-statusnet\n" @@ -45,10 +45,10 @@ msgstr "No such page" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "No such user." @@ -392,7 +392,7 @@ msgstr "You are already a member of that group." msgid "You have been blocked from that group by the admin." msgstr "You have been blocked from that group by the admin." -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Could not join user %s to group %s." @@ -401,7 +401,7 @@ msgstr "Could not join user %s to group %s." msgid "You are not a member of this group." msgstr "You are not a member of this group." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Could not remove user %s to group %s." @@ -694,7 +694,7 @@ msgstr "Failed to save block information." #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "No such group." @@ -1683,7 +1683,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:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1728,7 +1728,7 @@ msgstr "Personal message" msgid "Optionally add a personal message to the invitation." msgstr "Optionally add a personal message to the invitation." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Send" @@ -1798,7 +1798,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "You must be logged in to join a group." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s joined group %s" @@ -1807,15 +1807,11 @@ msgstr "%s joined group %s" msgid "You must be logged in to leave a group." msgstr "You must be logged in to leave a group." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "You are not a member of that group." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Could not find membership record." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s left group %s" @@ -1917,12 +1913,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:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 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:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "No content!" @@ -1930,7 +1926,7 @@ msgstr "No content!" msgid "No recipient specified." msgstr "No recipient specified." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -4025,6 +4021,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Group profile" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Could not update group." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Group profile" + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -4043,27 +4054,27 @@ msgstr "Could not insert message." msgid "Could not update message with new URI." msgstr "Could not update message with new URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "DB error inserting hashtag: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Problem saving notice." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Problem saving notice. Unknown user." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Too many notices too fast; take a breather and post again in a few minutes." -#: classes/Notice.php:241 +#: classes/Notice.php:240 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4071,25 +4082,25 @@ msgid "" msgstr "" "Too many notices too fast; take a breather and post again in a few minutes." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "You are banned from posting notices on this site." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problem saving notice." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "DB error inserting reply: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Welcome to %1$s, @%2$s!" @@ -4402,7 +4413,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "Sorry, this command is not yet implemented." #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" msgstr "Could not find a user with nickname %s" @@ -4411,7 +4422,7 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" msgstr "Nudge sent to %s" @@ -4423,14 +4434,13 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy msgid "Notice with that id does not exist" msgstr "No profile with that id." -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: 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" @@ -4439,181 +4449,176 @@ msgid "Notice marked as fave." msgstr "Notice marked as fave." #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" msgstr "You are already a member of that group." -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, php-format msgid "Could not join user %s to group %s" msgstr "Could not join user %s to group %s." -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%s joined group %s" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, php-format msgid "Could not remove user %s to group %s" msgstr "Could not remove user %s to group %s" -#: lib/command.php:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%s left group %s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Fullname: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Location: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Homepage: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "About: %s" -#: lib/command.php:358 -#, fuzzy, php-format +#: lib/command.php:349 +#, 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:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "Direct message to %s sent" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Error sending direct message." -#: lib/command.php:422 -#, fuzzy +#: lib/command.php:413 msgid "Cannot repeat your own notice" msgstr "Cannot repeat your own notice." -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" msgstr "Already repeated that notice." -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Notice posted" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Error saving notice." -#: lib/command.php:491 -#, fuzzy, php-format +#: lib/command.php:482 +#, 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:500 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Reply to %s sent" msgstr "Reply to %s sent" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Error saving notice." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "Specify the name of the user to subscribe to" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Subscribed to %s" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "Specify the name of the user to unsubscribe from" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Unsubscribed from %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Command not yet implemented." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notification off." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Can't turn off notification." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notification on." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Can't turn on notification." -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "You are not subscribed to that profile." -#: lib/command.php:679 +#: lib/command.php:670 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:699 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Could not subscribe other to you." -#: lib/command.php:701 +#: lib/command.php:692 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:721 +#: lib/command.php:712 #, fuzzy msgid "You are not a member of any groups." msgstr "You are not a member of that group." -#: lib/command.php:723 +#: lib/command.php:714 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:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4654,19 +4659,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "No configuration file found" -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Go to the installer." @@ -4867,11 +4872,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "Join" @@ -5195,15 +5205,21 @@ msgstr "" msgid "Share my location" msgstr "Couldn't save tags." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Couldn't save tags." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5469,25 +5485,25 @@ msgstr "" msgid "User has blocked you." msgstr "User has blocked you." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Could not subscribe." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Could not subscribe other to you." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Not subscribed!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Couldn't delete subscription." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Couldn't delete subscription." @@ -5561,47 +5577,47 @@ msgstr "Message" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "a few seconds ago" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "about a minute ago" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "about %d minutes ago" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "about an hour ago" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "about %d hours ago" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "about a day ago" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "about %d days ago" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "about a month ago" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "about %d months ago" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "about a year ago" diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po index acc7f4a309..76343bf66e 100644 --- a/locale/es/LC_MESSAGES/statusnet.po +++ b/locale/es/LC_MESSAGES/statusnet.po @@ -3,6 +3,7 @@ # Author@translatewiki.net: Brion # Author@translatewiki.net: Crazymadlover # Author@translatewiki.net: McDutchie +# Author@translatewiki.net: Peter17 # Author@translatewiki.net: Translationista # -- # This file is distributed under the same license as the StatusNet package. @@ -11,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:26:39+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:07+0000\n" "Language-Team: Spanish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: es\n" "X-Message-Group: out-statusnet\n" @@ -46,10 +47,10 @@ msgstr "No existe tal página" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "No existe ese usuario." @@ -61,19 +62,19 @@ msgid "%s and friends" msgstr "%s y amigos" #: actions/all.php:99 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 1.0)" -msgstr "Feed de los amigos de %s" +msgstr "Feed de los amigos de %s (RSS 1.0)" #: actions/all.php:107 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (RSS 2.0)" -msgstr "Feed de los amigos de %s" +msgstr "Feed de los amigos de %s (RSS 2.0)" #: actions/all.php:115 -#, fuzzy, php-format +#, php-format msgid "Feed for friends of %s (Atom)" -msgstr "Feed de los amigos de %s" +msgstr "Feed de los amigos de %s (Atom)" #: actions/all.php:127 #, php-format @@ -262,18 +263,16 @@ msgid "No status found with that ID." msgstr "No se encontró estado para ese ID" #: actions/apifavoritecreate.php:119 -#, fuzzy msgid "This status is already a favorite." -msgstr "¡Este status ya está en favoritos!" +msgstr "Este status ya está en favoritos." #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." msgstr "No se pudo crear favorito." #: actions/apifavoritedestroy.php:122 -#, fuzzy msgid "That status is not a favorite." -msgstr "¡Este status no es un favorito!" +msgstr "Este status no es un favorito." #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -293,9 +292,8 @@ msgid "Could not unfollow user: User not found." msgstr "No se pudo dejar de seguir al usuario. Usuario no encontrado" #: actions/apifriendshipsdestroy.php:120 -#, fuzzy msgid "You cannot unfollow yourself." -msgstr "¡No puedes dejar de seguirte a ti mismo!" +msgstr "No puedes dejar de seguirte a ti mismo." #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -390,7 +388,7 @@ msgstr "Ya eres miembro de ese grupo" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "No se puede unir usuario %s a grupo %s" @@ -399,7 +397,7 @@ msgstr "No se puede unir usuario %s a grupo %s" msgid "You are not a member of this group." msgstr "No eres miembro de este grupo." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "No se pudo eliminar a usuario %s de grupo %s" @@ -697,7 +695,7 @@ msgstr "No se guardó información de bloqueo." #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "No existe ese grupo." @@ -1690,7 +1688,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:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1735,7 +1733,7 @@ msgstr "Mensaje Personal" msgid "Optionally add a personal message to the invitation." msgstr "Opcionalmente añada un mensaje personalizado a su invitación." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Enviar" @@ -1805,7 +1803,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Debes estar conectado para unirte a un grupo." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s se unió a grupo %s" @@ -1814,17 +1812,12 @@ msgstr "%s se unió a grupo %s" msgid "You must be logged in to leave a group." msgstr "Debes estar conectado para dejar un grupo." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 #, fuzzy msgid "You are not a member of that group." msgstr "No eres miembro de ese grupo" -#: actions/leavegroup.php:119 lib/command.php:278 -#, fuzzy -msgid "Could not find membership record." -msgstr "No se pudo encontrar registro de miembro" - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s dejó grupo %s" @@ -1929,12 +1922,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:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 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:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "¡Ningún contenido!" @@ -1942,7 +1935,7 @@ msgstr "¡Ningún contenido!" msgid "No recipient specified." msgstr "No se especificó receptor." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 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." @@ -4076,6 +4069,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Perfil de grupo" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "No se pudo actualizar el grupo." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Perfil de grupo" + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -4094,29 +4102,29 @@ msgstr "No se pudo insertar mensaje." msgid "Could not update message with new URI." msgstr "No se pudo actualizar mensaje con nuevo URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Error de la BD al insertar la etiqueta clave: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Hubo un problema al guardar el aviso." -#: classes/Notice.php:230 +#: classes/Notice.php:229 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Hubo problemas al guardar el aviso. Usuario desconocido." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiados avisos demasiado rápido; para y publicar nuevamente en unos " "minutos." -#: classes/Notice.php:241 +#: classes/Notice.php:240 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4125,25 +4133,25 @@ msgstr "" "Demasiados avisos demasiado rápido; para y publicar nuevamente en unos " "minutos." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Tienes prohibido publicar avisos en este sitio." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Hubo un problema al guardar el aviso." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Error de BD al insertar respuesta: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Bienvenido a %1$s, @%2$s!" @@ -4466,7 +4474,7 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "" #: lib/command.php:99 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" msgstr "zumbido enviado a %s" @@ -4478,14 +4486,13 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy msgid "Notice with that id does not exist" msgstr "Ningún perfil con ese ID." -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: 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" @@ -4498,175 +4505,173 @@ msgstr "Aviso marcado como favorito." msgid "You are already a member of that group" msgstr "Ya eres miembro de ese grupo" -#: lib/command.php:234 +#: lib/command.php:231 #, 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:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%s se unió a grupo %s" -#: lib/command.php:284 +#: lib/command.php:275 #, 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:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%s dejó grupo %s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Nombre completo: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Lugar: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Página de inicio: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, 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:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "Se envió mensaje directo a %s" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Error al enviar mensaje directo." -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "No se puede activar notificación." -#: lib/command.php:427 +#: lib/command.php:418 #, fuzzy msgid "Already repeated that notice" msgstr "Borrar este aviso" -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Aviso publicado" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Hubo un problema al guardar el aviso." -#: lib/command.php:491 +#: lib/command.php:482 #, 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:500 +#: lib/command.php:491 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Responder este aviso." -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "Hubo un problema al guardar el aviso." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "Especificar el nombre del usuario a suscribir" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Suscrito a %s" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "Especificar el nombre del usuario para desuscribirse de" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Desuscrito de %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Todavía no se implementa comando." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notificación no activa." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "No se puede desactivar notificación." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notificación activada." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "No se puede activar notificación." -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "No estás suscrito a nadie." -#: lib/command.php:679 +#: lib/command.php:670 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:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "Nadie está suscrito a ti." -#: lib/command.php:701 +#: lib/command.php:692 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:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "No eres miembro de ningún grupo" -#: lib/command.php:723 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "No eres miembro de este grupo." msgstr[1] "No eres miembro de este grupo." -#: lib/command.php:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4707,19 +4712,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Ningún archivo de configuración encontrado. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Ir al instalador." @@ -4922,11 +4927,16 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "Unirse" @@ -5247,15 +5257,21 @@ msgstr "" msgid "Share my location" msgstr "No se pudo guardar tags." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "No se pudo guardar tags." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5525,25 +5541,25 @@ msgstr "" msgid "User has blocked you." msgstr "El usuario te ha bloqueado." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "No se pudo suscribir." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "No se pudo suscribir otro a ti." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "¡No estás suscrito!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "No se pudo eliminar la suscripción." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "No se pudo eliminar la suscripción." @@ -5619,47 +5635,47 @@ msgstr "Mensaje" msgid "Moderate" msgstr "Moderar" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "hace unos segundos" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "hace un minuto" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "hace %d minutos" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "hace una hora" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "hace %d horas" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "hace un día" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "hace %d días" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "hace un mes" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "hace %d meses" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "hace un año" diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po index 4cd62b0f66..bd97b86b58 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:26:49+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:13+0000\n" "Last-Translator: Ahmad Sufi Mahmudi\n" "Language-Team: Persian\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "X-Language-Code: fa\n" "X-Message-Group: out-statusnet\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" #: actions/all.php:63 actions/public.php:97 actions/replies.php:92 @@ -47,10 +47,10 @@ msgstr "چنین صفحه‌ای وجود ندارد" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "چنین کاربری وجود ندارد." @@ -388,7 +388,7 @@ msgstr "شما از پیش یک عضو این گروه هستید." msgid "You have been blocked from that group by the admin." msgstr "دسترسی شما به گروه توسط مدیر آن محدود شده است." -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "عضویت %s در گروه %s نا موفق بود." @@ -397,7 +397,7 @@ msgstr "عضویت %s در گروه %s نا موفق بود." msgid "You are not a member of this group." msgstr "شما یک عضو این گروه نیستید." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "خارج شدن %s از گروه %s نا موفق بود" @@ -692,7 +692,7 @@ msgstr "" #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "چنین گروهی وجود ندارد." @@ -1661,7 +1661,7 @@ msgstr "دعوت کردن کاربران تازه" msgid "You are already subscribed to these users:" msgstr "هم اکنون شما این کاربران را دنبال می‌کنید: " -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1705,7 +1705,7 @@ msgstr "پیام خصوصی" msgid "Optionally add a personal message to the invitation." msgstr "اگر دوست دارید می‌توانید یک پیام به همراه دعوت نامه ارسال کنید." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "فرستادن" @@ -1749,7 +1749,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "برای پیوستن به یک گروه، باید وارد شده باشید." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "ملحق شدن به گروه" @@ -1758,15 +1758,11 @@ msgstr "ملحق شدن به گروه" msgid "You must be logged in to leave a group." msgstr "برای ترک یک گروه، شما باید وارد شده باشید." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "شما یک کاربر این گروه نیستید." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "عضویت ثبت شده پیدا نشد." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s گروه %s را ترک کرد." @@ -1867,12 +1863,12 @@ msgstr "از این فرم برای ساختن یک گروه جدید استفا msgid "New message" msgstr "پیام جدید" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "شما نمی توانید به این کاربر پیام بفرستید." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "بدون محتوا!" @@ -1880,7 +1876,7 @@ msgstr "بدون محتوا!" msgid "No recipient specified." msgstr "هیچ گیرنده ای مشخص نشده" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "یک پیام را به خودتان نفرستید؛ در عوض آن را آهسته برای خود بگویید." @@ -3893,6 +3889,19 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +msgid "Group join failed." +msgstr "" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد." + +#: classes/Group_member.php:60 +msgid "Group leave failed." +msgstr "" + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -3910,27 +3919,27 @@ msgstr "پیغام نمی تواند درج گردد" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "مشکل در ذخیره کردن پیام. بسیار طولانی." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "مشکل در ذخیره کردن پیام. کاربر نا شناخته." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "تعداد خیلی زیاد آگهی و بسیار سریع؛ استراحت کنید و مجددا دقایقی دیگر ارسال " "کنید." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -3938,25 +3947,25 @@ msgstr "" "تعداد زیاد پیام های دو نسخه ای و بسرعت؛ استراحت کنید و دقایقی دیگر مجددا " "ارسال کنید." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "شما از فرستادن پست در این سایت مردود شدید ." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "مشکل در ذخیره کردن آگهی." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "خوش امدید به %1$s , @%2$s!" @@ -4255,7 +4264,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "متاسفانه این دستور هنوز اجرا نشده." #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" msgstr "پیدا نشد %s کاریری یا نام مستعار" @@ -4279,14 +4288,12 @@ msgstr "" "مشترک : %2$s\n" "خبر : %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy +#: 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:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 msgid "User has no last notice" msgstr "کاربر آگهی آخر ندارد" @@ -4295,177 +4302,173 @@ msgid "Notice marked as fave." msgstr "" #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" msgstr "شما از پیش یک عضو این گروه هستید." -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, php-format msgid "Could not join user %s to group %s" msgstr "عضویت %s در گروه %s نا موفق بود." -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "ملحق شدن به گروه" -#: lib/command.php:284 +#: lib/command.php:275 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "خارج شدن %s از گروه %s نا موفق بود" -#: lib/command.php:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%s گروه %s را ترک کرد." -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "نام کامل : %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "موقعیت : %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "صفحه خانگی : %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "درباره ی : %s" -#: lib/command.php:358 -#, fuzzy, php-format +#: lib/command.php:349 +#, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" "پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d " "تا فرستادید" -#: lib/command.php:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "پیام مستقیم به %s فرستاده شد." -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "خطا در فرستادن پیام مستقیم." -#: lib/command.php:422 -#, fuzzy +#: lib/command.php:413 msgid "Cannot repeat your own notice" -msgstr "نمی توانید خبر خود را تکرار کنید." +msgstr "نمی توان آگهی خودتان را تکرار کرد" -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" -msgstr "ابن خبر قبلا فرستاده شده" +msgstr "آن آگهی قبلا تکرار شده است." -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "آگهی تکرار شد" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "خطا هنگام تکرار آگهی." -#: lib/command.php:491 +#: lib/command.php:482 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" "پیغام بسیار طولانی است - بیشترین اندازه امکان پذیر %d کاراکتر است , شما %d " "تا فرستادید" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "به این آگهی جواب دهید" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "خطا هنگام ذخیره ی آگهی" -#: lib/command.php:556 +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "دستور هنوز اجرا نشده" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "ناتوان در خاموش کردن آگاه سازی." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "آگاه سازی فعال است." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "ناتوان در روشن کردن آگاه سازی." -#: lib/command.php:650 -#, fuzzy +#: lib/command.php:641 msgid "Login command is disabled" msgstr "فرمان ورود از کار افتاده است" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "شما توسط هیچ کس تصویب نشده اید ." -#: lib/command.php:679 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "هم اکنون شما این کاربران را دنبال می‌کنید: " -#: lib/command.php:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "هیچکس شما را تایید نکرده ." -#: lib/command.php:701 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "هیچکس شما را تایید نکرده ." -#: lib/command.php:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "شما در هیچ گروهی عضو نیستید ." -#: lib/command.php:723 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "شما یک عضو این گروه نیستید." -#: lib/command.php:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4506,19 +4509,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "" -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "شما ممکن است بخواهید نصاب را اجرا کنید تا این را تعمیر کند." -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "برو به نصاب." @@ -4717,11 +4720,16 @@ msgstr "مگابایت" msgid "kB" msgstr "کیلوبایت" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "مشارکت کردن" @@ -5031,15 +5039,21 @@ msgstr "یک فایل ضمیمه کنید" msgid "Share my location" msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5298,23 +5312,23 @@ msgstr "قبلا تایید شده !" msgid "User has blocked you." msgstr "" -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "تایید نشده!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "" -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "" @@ -5388,47 +5402,47 @@ msgstr "پیام" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "چند ثانیه پیش" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "حدود یک دقیقه پیش" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "حدود %d دقیقه پیش" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "حدود یک ساعت پیش" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "حدود %d ساعت پیش" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "حدود یک روز پیش" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "حدود %d روز پیش" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "حدود یک ماه پیش" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "حدود %d ماه پیش" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "حدود یک سال پیش" diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po index 5bbcb949f9..e54b94b718 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:26:45+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:10+0000\n" "Language-Team: Finnish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fi\n" "X-Message-Group: out-statusnet\n" @@ -45,10 +45,10 @@ msgstr "Sivua ei ole." #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Käyttäjää ei ole." @@ -396,7 +396,7 @@ msgstr "Sinä kuulut jo tähän ryhmään." 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." -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s." @@ -405,7 +405,7 @@ msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s." msgid "You are not a member of this group." msgstr "Sinä et kuulu tähän ryhmään." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s" @@ -701,7 +701,7 @@ msgstr "Käyttäjän estotiedon tallennus epäonnistui." #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "Tuota ryhmää ei ole." @@ -1686,7 +1686,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:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1733,7 +1733,7 @@ msgstr "Henkilökohtainen viesti" msgid "Optionally add a personal message to the invitation." msgstr "Voit myös lisätä oman viestisi kutsuun" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Lähetä" @@ -1802,7 +1802,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Sinun pitää olla kirjautunut sisään, jos haluat liittyä ryhmään." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s liittyi ryhmään %s" @@ -1811,15 +1811,11 @@ 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:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Sinä et kuulu tähän ryhmään." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Ei löydetty käyttäjän jäsenyystietoja." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s erosi ryhmästä %s" @@ -1924,12 +1920,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:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 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:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Ei sisältöä!" @@ -1937,7 +1933,7 @@ msgstr "Ei sisältöä!" msgid "No recipient specified." msgstr "Vastaanottajaa ei ole määritelty." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 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." @@ -4060,6 +4056,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Ryhmän profiili" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Ei voitu päivittää ryhmää." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Ryhmän profiili" + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -4078,28 +4089,28 @@ msgstr "Viestin tallennus ei onnistunut." msgid "Could not update message with new URI." msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Tietokantavirhe tallennettaessa risutagiä: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka " "päivityksien lähettämista muutaman minuutin päästä." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4107,25 +4118,25 @@ msgstr "" "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka " "päivityksien lähettämista muutaman minuutin päästä." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Päivityksesi tähän palveluun on estetty." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Ongelma päivityksen tallentamisessa." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Tietokantavirhe tallennettaessa vastausta: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Viesti käyttäjälle %1$s, %2$s" @@ -4463,14 +4474,13 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: 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ä" @@ -4479,182 +4489,179 @@ msgid "Notice marked as fave." msgstr "Päivitys on merkitty suosikiksi." #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" msgstr "Sinä kuulut jo tähän ryhmään." -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, 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:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%s liittyi ryhmään %s" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, 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:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%s erosi ryhmästä %s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Koko nimi: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Kotipaikka: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Kotisivu: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Tietoa: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, 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:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "Suora viesti käyttäjälle %s lähetetty" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Tapahtui virhe suoran viestin lähetyksessä." -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Ilmoituksia ei voi pistää päälle." -#: lib/command.php:427 +#: lib/command.php:418 #, fuzzy msgid "Already repeated that notice" msgstr "Poista tämä päivitys" -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Päivitys lähetetty" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Ongelma päivityksen tallentamisessa." -#: lib/command.php:491 +#: lib/command.php:482 #, 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:500 +#: lib/command.php:491 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Vastaa tähän päivitykseen" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "Ongelma päivityksen tallentamisessa." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Käyttäjän %s päivitykset tilattu" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 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:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Käyttäjän %s päivitysten tilaus lopetettu" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Komentoa ei ole vielä toteutettu." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Ilmoitukset pois päältä." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Ilmoituksia ei voi pistää pois päältä." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Ilmoitukset päällä." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Ilmoituksia ei voi pistää päälle." -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Et ole tilannut tämän käyttäjän päivityksiä." -#: lib/command.php:679 +#: lib/command.php:670 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:699 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Toista ei voitu asettaa tilaamaan sinua." -#: lib/command.php:701 +#: lib/command.php:692 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:721 +#: lib/command.php:712 #, fuzzy msgid "You are not a member of any groups." msgstr "Sinä et kuulu tähän ryhmään." -#: lib/command.php:723 +#: lib/command.php:714 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:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4695,20 +4702,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "Varmistuskoodia ei ole annettu." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 #, fuzzy msgid "Go to the installer." msgstr "Kirjaudu sisään palveluun" @@ -4914,11 +4921,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "Liity" @@ -5242,15 +5254,21 @@ msgstr "" msgid "Share my location" msgstr "Tageja ei voitu tallentaa." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Tageja ei voitu tallentaa." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5525,25 +5543,25 @@ msgstr "" msgid "User has blocked you." msgstr "Käyttäjä on asettanut eston sinulle." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Ei voitu tilata." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Toista ei voitu asettaa tilaamaan sinua." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Ei ole tilattu!." -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Ei voitu poistaa tilausta." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Ei voitu poistaa tilausta." @@ -5621,47 +5639,47 @@ msgstr "Viesti" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "muutama sekunti sitten" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "noin minuutti sitten" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "noin %d minuuttia sitten" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "noin tunti sitten" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "noin %d tuntia sitten" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "noin päivä sitten" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "noin %d päivää sitten" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "noin kuukausi sitten" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "noin %d kuukautta sitten" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "noin vuosi sitten" diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po index 2fa90cfd15..917a67ffca 100644 --- a/locale/fr/LC_MESSAGES/statusnet.po +++ b/locale/fr/LC_MESSAGES/statusnet.po @@ -12,12 +12,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:26:54+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:16+0000\n" "Language-Team: French\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: out-statusnet\n" @@ -47,10 +47,10 @@ msgstr "Page non trouvée" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Utilisateur non trouvé." @@ -395,7 +395,7 @@ msgstr "Vous êtes déjà membre de ce groupe." msgid "You have been blocked from that group by the admin." msgstr "Vous avez été bloqué de ce groupe par l’administrateur." -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Impossible de joindre l’utilisateur %1$s au groupe %2$s." @@ -404,7 +404,7 @@ msgstr "Impossible de joindre l’utilisateur %1$s au groupe %2$s." msgid "You are not a member of this group." msgstr "Vous n'êtes pas membre de ce groupe." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s." @@ -703,7 +703,7 @@ msgstr "Impossible d’enregistrer les informations de blocage." #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "Aucun groupe trouvé." @@ -1691,7 +1691,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:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1737,7 +1737,7 @@ msgstr "Message personnel" msgid "Optionally add a personal message to the invitation." msgstr "Ajouter un message personnel à l’invitation (optionnel)." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Envoyer" @@ -1809,7 +1809,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Vous devez ouvrir une session pour rejoindre un groupe." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s a rejoint le groupe %2$s" @@ -1818,15 +1818,11 @@ 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:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Vous n'êtes pas membre de ce groupe." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Aucun enregistrement à ce groupe n’a été trouvé." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s a quitté le groupe %2$s" @@ -1935,12 +1931,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:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 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:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Aucun contenu !" @@ -1948,7 +1944,7 @@ msgstr "Aucun contenu !" msgid "No recipient specified." msgstr "Aucun destinataire n’a été spécifié." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2100,29 +2096,24 @@ msgid "URL shortening service is too long (max 50 chars)." msgstr "Le service de réduction d’URL est trop long (50 caractères maximum)." #: actions/otp.php:69 -#, fuzzy msgid "No user ID specified." -msgstr "Aucun groupe n’a été spécifié." +msgstr "Aucun identifiant d'utilisateur n’a été spécifié." #: actions/otp.php:83 -#, fuzzy msgid "No login token specified." -msgstr "Aucun avis n’a été spécifié." +msgstr "Aucun jeton d'identification n’a été spécifié." #: actions/otp.php:90 -#, fuzzy msgid "No login token requested." -msgstr "Aucune identité de profil dans la requête." +msgstr "Aucune jeton d'identification requis." #: actions/otp.php:95 -#, fuzzy msgid "Invalid login token specified." -msgstr "Jeton invalide ou expiré." +msgstr "Jeton d'identification invalide." #: actions/otp.php:104 -#, fuzzy msgid "Login token expired." -msgstr "Ouverture de session" +msgstr "Jeton d'identification périmé." #: actions/outbox.php:61 #, php-format @@ -4097,10 +4088,25 @@ msgstr "Un fichier aussi gros dépasserai votre quota utilisateur de %d octets." 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." +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Profil du groupe" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Impossible de mettre à jour le groupe." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Profil du groupe" + #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" -msgstr "Impossible de créer le jeton d’ouverture de session pour %s." +msgstr "Impossible de créer le jeton d'ouverture de session pour %s" #: classes/Message.php:45 msgid "You are banned from sending direct messages." @@ -4114,27 +4120,27 @@ msgstr "Impossible d’insérer le message." msgid "Could not update message with new URI." msgstr "Impossible de mettre à jour le message avec un nouvel URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Problème lors de l’enregistrement de l’avis ; trop long." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Erreur lors de l’enregistrement de l’avis. Utilisateur inconnu." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Trop d’avis, trop vite ! Faites une pause et publiez à nouveau dans quelques " "minutes." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4142,25 +4148,25 @@ msgstr "" "Trop de messages en double trop vite ! Prenez une pause et publiez à nouveau " "dans quelques minutes." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Il vous est interdit de poster des avis sur ce site." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problème lors de l’enregistrement de l’avis." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Erreur de base de donnée en insérant la réponse :%s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Bienvenue à %1$s, @%2$s !" @@ -4202,9 +4208,9 @@ msgid "Other options" msgstr "Autres options " #: lib/action.php:144 -#, fuzzy, php-format +#, php-format msgid "%1$s - %2$s" -msgstr "%1$s (%2$s)" +msgstr "%1$s - %2$s" #: lib/action.php:159 msgid "Untitled page" @@ -4461,18 +4467,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "Désolé, cette commande n’a pas encore été implémentée." #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" -msgstr "Impossible de trouver un utilisateur avec le pseudo %s." +msgstr "Impossible de trouver un utilisateur avec le pseudo %s" #: lib/command.php:92 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 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" -msgstr "Clin d’œil envoyé à %s." +msgstr "Coup de code envoyé à %s" #: lib/command.php:126 #, php-format @@ -4485,201 +4491,192 @@ msgstr "" "Abonnés : %2$s\n" "Messages : %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy +#: 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." +msgstr "Aucun avis avec cet identifiant n’existe" -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: 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." +msgstr "Aucun avis récent pour cet utilisateur" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Avis ajouté aux favoris." #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" -msgstr "Vous êtes déjà membre de ce groupe." +msgstr "Vous êtes déjà membre de ce groupe" -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, php-format msgid "Could not join user %s to group %s" -msgstr "Impossible de joindre l’utilisateur %1$s au groupe %2$s." +msgstr "Impossible d’inscrire l’utilisateur %s au groupe %s" -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%1$s a rejoint le groupe %2$s" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, php-format msgid "Could not remove user %s to group %s" -msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s." +msgstr "Impossible de retirer l’utilisateur %s du groupe %s" -#: lib/command.php:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%1$s a quitté le groupe %2$s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Nom complet : %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Emplacement : %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Site Web : %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "À propos : %s" -#: lib/command.php:358 -#, fuzzy, php-format +#: lib/command.php:349 +#, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -"Message trop long ! La taille maximale est de %1$d caractères ; vous en avez " -"entré %2$d." +"Message trop long ! La taille maximale est de %d caractères ; vous en avez " +"entré %d." -#: lib/command.php:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "Message direct envoyé à %s." -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Une erreur est survenue pendant l’envoi de votre message." -#: lib/command.php:422 -#, fuzzy +#: lib/command.php:413 msgid "Cannot repeat your own notice" -msgstr "Vous ne pouvez pas reprendre votre propre avis." +msgstr "Impossible de reprendre votre propre avis" -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" -msgstr "Vous avez déjà repris cet avis." +msgstr "Avis déjà repris" -#: lib/command.php:435 -#, fuzzy, php-format +#: lib/command.php:426 +#, php-format msgid "Notice from %s repeated" -msgstr "Avis de %s repris." +msgstr "Avis de %s repris" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Erreur lors de la reprise de l’avis." -#: lib/command.php:491 -#, fuzzy, php-format +#: lib/command.php:482 +#, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -"Avis trop long ! La taille maximale est de %1$d caractères ; vous en avez " -"entré %2$d." +"Avis trop long ! La taille maximale est de %d caractères ; vous en avez " +"entré %d." -#: lib/command.php:500 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Reply to %s sent" -msgstr "Réponse à %s envoyée." +msgstr "Réponse à %s envoyée" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Problème lors de l’enregistrement de l’avis." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" -msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner." +msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Abonné à %s" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" -msgstr "" -"Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner." +msgstr "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Désabonné de %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Cette commande n’a pas encore été implémentée." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Avertissements désactivés." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Impossible de désactiver les avertissements." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Avertissements activés." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Impossible d’activer les avertissements." -#: lib/command.php:650 -#, fuzzy +#: lib/command.php:641 msgid "Login command is disabled" -msgstr "La commande d’ouverture de session est désactivée." +msgstr "La commande d'ouverture de session est désactivée" -#: lib/command.php:661 -#, fuzzy, php-format +#: lib/command.php:652 +#, 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." +"pendant 2 minutes : %s" -#: lib/command.php:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "Vous n'êtes pas abonné(e) à personne." -#: lib/command.php:679 +#: lib/command.php:670 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:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "Personne ne s’est abonné à vous." -#: lib/command.php:701 +#: lib/command.php:692 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:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "Vous n’êtes membre d’aucun groupe." -#: lib/command.php:723 +#: lib/command.php:714 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:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4758,20 +4755,20 @@ msgstr "" "tracks - pas encore implémenté.\n" "tracking - pas encore implémenté.\n" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Aucun fichier de configuration n’a été trouvé. " -#: lib/common.php:200 +#: lib/common.php:132 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:201 +#: lib/common.php:134 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:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Aller au programme d’installation" @@ -4976,11 +4973,16 @@ msgstr "Mo" msgid "kB" msgstr "Ko" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Langue « %s » inconnue." + #: lib/joinform.php:114 msgid "Join" msgstr "Rejoindre" @@ -5368,19 +5370,23 @@ msgid "Attach a file" msgstr "Attacher un fichier" #: lib/noticeform.php:212 -#, fuzzy msgid "Share my location" msgstr "Partager ma localisation." -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location" -msgstr "Ne pas partager ma localisation." - #: lib/noticeform.php:215 +msgid "Do not share my location" +msgstr "Ne pas partager ma localisation" + +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "Masquer cette info" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5638,23 +5644,23 @@ msgstr "Déjà abonné !" msgid "User has blocked you." msgstr "Cet utilisateur vous a bloqué." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Impossible de s’abonner." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Impossible d’abonner une autre personne à votre profil." -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Pas abonné !" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Impossible de supprimer l’abonnement à soi-même." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Impossible de cesser l’abonnement" @@ -5728,47 +5734,47 @@ msgstr "Message" msgid "Moderate" msgstr "Modérer" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "il y a quelques secondes" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "il y a 1 minute" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "il y a %d minutes" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "il y a 1 heure" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "il y a %d heures" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "il y a 1 jour" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "il y a %d jours" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "il y a 1 mois" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "il y a %d mois" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "il y a environ 1 an" diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po index 8b9658e48e..4dc2de67af 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:26:58+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:19+0000\n" "Language-Team: Irish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ga\n" "X-Message-Group: out-statusnet\n" @@ -45,10 +45,10 @@ msgstr "Non existe a etiqueta." #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Ningún usuario." @@ -394,7 +394,7 @@ msgstr "Xa estas suscrito a estes usuarios:" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Non podes seguir a este usuario: o Usuario non se atopa." @@ -403,7 +403,7 @@ msgstr "Non podes seguir a este usuario: o Usuario non se atopa." msgid "You are not a member of this group." msgstr "Non estás suscrito a ese perfil" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Non podes seguir a este usuario: o Usuario non se atopa." @@ -708,7 +708,7 @@ msgstr "Erro ao gardar información de bloqueo." #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 #, fuzzy msgid "No such group." msgstr "Non existe a etiqueta." @@ -1719,7 +1719,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:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1764,7 +1764,7 @@ msgstr "Mensaxe persoal" msgid "Optionally add a personal message to the invitation." msgstr "Opcionalmente engadir unha mensaxe persoal á invitación." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Enviar" @@ -1833,7 +1833,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s" -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s / Favoritos dende %s" @@ -1843,17 +1843,12 @@ 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:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 #, fuzzy msgid "You are not a member of that group." msgstr "Non estás suscrito a ese perfil" -#: actions/leavegroup.php:119 lib/command.php:278 -#, fuzzy -msgid "Could not find membership record." -msgstr "Non se puido actualizar o rexistro de usuario." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s / Favoritos dende %s" @@ -1956,12 +1951,12 @@ msgstr "" msgid "New message" msgstr "Nova mensaxe" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 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:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Sen contido!" @@ -1969,7 +1964,7 @@ msgstr "Sen contido!" msgid "No recipient specified." msgstr "Non se especificou ningún destinatario" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -4118,6 +4113,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Non existe o perfil." + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Non se puido actualizar o usuario." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Non existe o perfil." + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -4136,28 +4146,28 @@ msgstr "Non se pode inserir unha mensaxe." msgid "Could not update message with new URI." msgstr "Non se puido actualizar a mensaxe coa nova URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Erro ó inserir o hashtag na BD: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro " "duns minutos." -#: classes/Notice.php:241 +#: classes/Notice.php:240 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4166,25 +4176,25 @@ msgstr "" "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro " "duns minutos." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Tes restrinxido o envio de chíos neste sitio." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Aconteceu un erro ó gardar o chío." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Erro ó inserir a contestación na BD: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Mensaxe de %1$s en %2$s" @@ -4540,14 +4550,13 @@ msgstr "" "Suscriptores: %2$s\n" "Chíos: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: 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." @@ -4560,150 +4569,148 @@ msgstr "Chío marcado coma favorito." msgid "You are already a member of that group" msgstr "Xa estas suscrito a estes usuarios:" -#: lib/command.php:234 +#: lib/command.php:231 #, 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:239 +#: lib/command.php:236 #, fuzzy, php-format msgid "%s joined group %s" msgstr "%s / Favoritos dende %s" -#: lib/command.php:284 +#: lib/command.php:275 #, 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:289 +#: lib/command.php:280 #, fuzzy, php-format msgid "%s left group %s" msgstr "%s / Favoritos dende %s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Ubicación: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Páxina persoal: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, 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:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "Mensaxe directo a %s enviado" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Erro ó enviar a mensaxe directa." -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Non se pode activar a notificación." -#: lib/command.php:427 +#: lib/command.php:418 #, fuzzy msgid "Already repeated that notice" msgstr "Eliminar chío" -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Chío publicado" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Aconteceu un erro ó gardar o chío." -#: lib/command.php:491 +#: lib/command.php:482 #, 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:500 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Reply to %s sent" msgstr "Non se pode eliminar este chíos." -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "Aconteceu un erro ó gardar o chío." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "Especifica o nome do usuario ó que queres suscribirte" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Suscrito a %s" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "Especifica o nome de usuario ó que queres deixar de seguir" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Desuscribir de %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Comando non implementado." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notificación desactivada." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "No se pode desactivar a notificación." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notificación habilitada." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Non se pode activar a notificación." -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:679 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Xa estas suscrito a estes usuarios:" @@ -4712,12 +4719,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:699 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Outro usuario non se puido suscribir a ti." -#: lib/command.php:701 +#: lib/command.php:692 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." @@ -4726,12 +4733,12 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:721 +#: lib/command.php:712 #, fuzzy msgid "You are not a member of any groups." msgstr "Non estás suscrito a ese perfil" -#: lib/command.php:723 +#: lib/command.php:714 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" @@ -4740,7 +4747,7 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: lib/command.php:737 +#: lib/command.php:728 #, fuzzy msgid "" "Commands:\n" @@ -4808,20 +4815,20 @@ msgstr "" "tracks - non implementado por agora.\n" "tracking - non implementado por agora.\n" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "Sen código de confirmación." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -5031,11 +5038,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 #, fuzzy msgid "Join" @@ -5408,15 +5420,21 @@ msgstr "" msgid "Share my location" msgstr "Non se puideron gardar as etiquetas." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Non se puideron gardar as etiquetas." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5700,25 +5718,25 @@ msgstr "" msgid "User has blocked you." msgstr "O usuario bloqueoute." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "No se pode suscribir." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Outro usuario non se puido suscribir a ti." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Non está suscrito!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Non se pode eliminar a subscrición." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Non se pode eliminar a subscrición." @@ -5801,47 +5819,47 @@ msgstr "Nova mensaxe" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "fai uns segundos" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "fai un minuto" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "fai %d minutos" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "fai unha hora" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "fai %d horas" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "fai un día" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "fai %d días" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "fai un mes" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "fai %d meses" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "fai un ano" diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po index 6d8f61d8ec..c6e90c550c 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:27:03+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:22+0000\n" "Language-Team: Hebrew\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: he\n" "X-Message-Group: out-statusnet\n" @@ -43,10 +43,10 @@ msgstr "אין הודעה כזו." #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "אין משתמש כזה." @@ -387,7 +387,7 @@ msgstr "כבר נכנסת למערכת!" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "נכשלה ההפניה לשרת: %s" @@ -397,7 +397,7 @@ msgstr "נכשלה ההפניה לשרת: %s" msgid "You are not a member of this group." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "נכשלה יצירת OpenID מתוך: %s" @@ -700,7 +700,7 @@ msgstr "" #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 #, fuzzy msgid "No such group." msgstr "אין הודעה כזו." @@ -1697,7 +1697,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1738,7 +1738,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "שלח" @@ -1782,7 +1782,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -1791,16 +1791,12 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 #, fuzzy msgid "You are not a member of that group." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "הסטטוס של %1$s ב-%2$s " @@ -1900,12 +1896,12 @@ msgstr "" msgid "New message" msgstr "הודעה חדשה" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "אין תוכן!" @@ -1913,7 +1909,7 @@ msgstr "אין תוכן!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -3980,6 +3976,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "אין הודעה כזו." + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "עידכון המשתמש נכשל." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "אין הודעה כזו." + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -3997,51 +4008,51 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:230 +#: classes/Notice.php:229 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "בעיה בשמירת ההודעה." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4362,7 +4373,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" msgstr "עידכון המשתמש נכשל." @@ -4383,13 +4394,13 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 #, fuzzy msgid "User has no last notice" msgstr "למשתמש אין פרופיל." @@ -4403,176 +4414,176 @@ msgstr "" msgid "You are already a member of that group" msgstr "כבר נכנסת למערכת!" -#: lib/command.php:234 +#: lib/command.php:231 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "נכשלה ההפניה לשרת: %s" -#: lib/command.php:239 +#: lib/command.php:236 #, fuzzy, php-format msgid "%s joined group %s" msgstr "הסטטוס של %1$s ב-%2$s " -#: lib/command.php:284 +#: lib/command.php:275 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "נכשלה יצירת OpenID מתוך: %s" -#: lib/command.php:289 +#: lib/command.php:280 #, fuzzy, php-format msgid "%s left group %s" msgstr "הסטטוס של %1$s ב-%2$s " -#: lib/command.php:318 +#: lib/command.php:309 #, fuzzy, php-format msgid "Fullname: %s" msgstr "שם מלא" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "אודות: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "לא ניתן להירשם ללא הסכמה לרשיון" -#: lib/command.php:427 +#: lib/command.php:418 #, fuzzy msgid "Already repeated that notice" msgstr "כבר נכנסת למערכת!" -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "הודעות" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "בעיה בשמירת ההודעה." -#: lib/command.php:491 +#: lib/command.php:482 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "תגובת עבור %s" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "בעיה בשמירת ההודעה." -#: lib/command.php:556 +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:679 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "לא שלחנו אלינו את הפרופיל הזה" msgstr[1] "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:699 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "הרשמה מרוחקת" -#: lib/command.php:701 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "הרשמה מרוחקת" msgstr[1] "הרשמה מרוחקת" -#: lib/command.php:721 +#: lib/command.php:712 #, fuzzy msgid "You are not a member of any groups." msgstr "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:723 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "לא שלחנו אלינו את הפרופיל הזה" msgstr[1] "לא שלחנו אלינו את הפרופיל הזה" -#: lib/command.php:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4613,20 +4624,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "אין קוד אישור." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4833,11 +4844,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 #, fuzzy msgid "Join" @@ -5151,15 +5167,21 @@ msgstr "" msgid "Share my location" msgstr "שמירת הפרופיל נכשלה." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "שמירת הפרופיל נכשלה." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5435,25 +5457,25 @@ msgstr "" msgid "User has blocked you." msgstr "למשתמש אין פרופיל." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "לא מנוי!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "מחיקת המנוי לא הצליחה." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "מחיקת המנוי לא הצליחה." @@ -5533,47 +5555,47 @@ msgstr "הודעה חדשה" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "לפני מספר שניות" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "לפני כדקה" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "לפני כ-%d דקות" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "לפני כשעה" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "לפני כ-%d שעות" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "לפני כיום" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "לפני כ-%d ימים" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "לפני כחודש" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "לפני כ-%d חודשים" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "לפני כשנה" diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po index 01be59de26..8f548104d9 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:27:07+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:25+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: hsb\n" "X-Message-Group: out-statusnet\n" @@ -45,10 +45,10 @@ msgstr "Strona njeeksistuje" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Wužiwar njeeksistuje" @@ -376,7 +376,7 @@ msgstr "Sy hižo čłon teje skupiny." msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać." @@ -385,7 +385,7 @@ msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać." msgid "You are not a member of this group." msgstr "Njejsy čłon tuteje skupiny." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Njebě móžno wužiwarja %1$s ze skupiny %2$s wotstronić." @@ -676,7 +676,7 @@ msgstr "" #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "Skupina njeeksistuje." @@ -1611,7 +1611,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:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1654,7 +1654,7 @@ msgstr "Wosobinska powěsć" msgid "Optionally add a personal message to the invitation." msgstr "Wosobinsku powěsć po dobrozdaću přeprošenju přidać." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Pósłać" @@ -1698,7 +1698,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -1707,15 +1707,11 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "Dyrbiš přizjewjeny być, zo by skupinu wopušćił." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Njejsy čłon teje skupiny." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, php-format msgid "%1$s left group %2$s" msgstr "" @@ -1812,12 +1808,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:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 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:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Žadyn wobsah!" @@ -1825,7 +1821,7 @@ msgstr "Žadyn wobsah!" msgid "No recipient specified." msgstr "Žadyn přijimowar podaty." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -3799,10 +3795,25 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Skupinski profil" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Skupina njeje so dała aktualizować." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Skupinski profil" + #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" -msgstr "Njebě móžno, přizjewjenske znamješko za %s wutworić." +msgstr "Njeje móžno było, přizjewjenske znamješko za %s wutworić" #: classes/Message.php:45 msgid "You are banned from sending direct messages." @@ -3816,49 +3827,49 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4175,13 +4186,13 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy msgid "Notice with that id does not exist" msgstr "Zdźělenka z tym ID njeeksistuje." -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 #, fuzzy msgid "User has no last notice" msgstr "Wužiwar nima poslednju powěsć." @@ -4195,145 +4206,144 @@ msgstr "" msgid "You are already a member of that group" msgstr "Sy hižo čłon teje skupiny." -#: lib/command.php:234 +#: lib/command.php:231 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać." -#: lib/command.php:239 +#: lib/command.php:236 #, fuzzy, php-format msgid "%s joined group %s" msgstr "Wužiwarske skupiny" -#: lib/command.php:284 +#: lib/command.php:275 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "Njebě móžno wužiwarja %1$s do skupiny $2$s přesunyć." -#: lib/command.php:289 +#: lib/command.php:280 #, fuzzy, php-format msgid "%s left group %s" msgstr "Wužiwarske skupiny" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Dospołne mjeno: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Městno: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Wo: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, fuzzy, php-format msgid "Direct message to %s sent" msgstr "Direktna powěsć do %s pósłana." -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Njemóžno twoju zdźělenku wospjetować." -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" -msgstr "Tuta zdźělenka bu hižo wospjetowana." +msgstr "Tuta zdźělenka bu hižo wospjetowana" -#: lib/command.php:435 -#, fuzzy, php-format +#: lib/command.php:426 +#, php-format msgid "Notice from %s repeated" -msgstr "Powěsć wot %s wospjetowana." +msgstr "Zdźělenka wot %s wospjetowana" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Zmylk při wospjetowanju zdźělenki" -#: lib/command.php:491 +#: lib/command.php:482 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Wotmołwa na %s pósłana." -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "" -#: lib/command.php:556 +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:679 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Sy tutu wosobu abonował:" @@ -4341,11 +4351,11 @@ msgstr[1] "Sy tutej wosobje abonował:" msgstr[2] "Sy tute wosoby abonował:" msgstr[3] "Sy tute wosoby abonował:" -#: lib/command.php:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:701 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Tuta wosoba je će abonowała:" @@ -4353,11 +4363,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:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:723 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Sy čłon tuteje skupiny:" @@ -4365,7 +4375,7 @@ msgstr[1] "Sy čłon tuteju skupinow:" msgstr[2] "Sy čłon tutych skupinow:" msgstr[3] "Sy čłon tutych skupinow:" -#: lib/command.php:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4406,19 +4416,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Žana konfiguraciska dataja namakana. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4616,11 +4626,16 @@ msgstr "MB" msgid "kB" msgstr "KB" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Njeznata rěč \"%s\"." + #: lib/joinform.php:114 msgid "Join" msgstr "" @@ -4922,15 +4937,21 @@ msgstr "Dataju připowěsnyć" msgid "Share my location" msgstr "Městno dźělić." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Městno njedźělić." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5046,9 +5067,8 @@ msgid "Tags in %s's notices" msgstr "" #: lib/plugin.php:114 -#, fuzzy msgid "Unknown" -msgstr "Njeznata akcija" +msgstr "Njeznaty" #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -5189,23 +5209,23 @@ msgstr "Hižo abonowany!" msgid "User has blocked you." msgstr "Wužiwar je će zablokował." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Abonowanje njebě móžno" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Njeje abonowany!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Sebjeabonement njeje so dał zničić." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Abonoment njeje so dał zničić." @@ -5279,47 +5299,47 @@ msgstr "Powěsć" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "před něšto sekundami" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "před něhdźe jednej mjeńšinu" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "před %d mjeńšinami" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "před něhdźe jednej hodźinu" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "před něhdźe %d hodźinami" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "před něhdźe jednym dnjom" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "před něhdźe %d dnjemi" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "před něhdźe jednym měsacom" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "před něhdźe %d měsacami" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "před něhdźe jednym lětom" diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po index a845bae26d..3115ed7cef 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:27:11+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:28+0000\n" "Language-Team: Interlingua\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: out-statusnet\n" @@ -43,10 +43,10 @@ msgstr "Pagina non existe" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Usator non existe." @@ -389,7 +389,7 @@ msgstr "Tu es ja membro de iste gruppo." msgid "You have been blocked from that group by the admin." msgstr "Le administrator te ha blocate de iste gruppo." -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Non poteva inscriber le usator %s in le gruppo %s." @@ -398,7 +398,7 @@ msgstr "Non poteva inscriber le usator %s in le gruppo %s." msgid "You are not a member of this group." msgstr "Tu non es membro de iste gruppo." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Non poteva remover le usator %s del gruppo %s." @@ -695,7 +695,7 @@ msgstr "Falleva de salveguardar le information del blocada." #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "Gruppo non existe." @@ -1681,7 +1681,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:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1727,7 +1727,7 @@ msgstr "Message personal" msgid "Optionally add a personal message to the invitation." msgstr "Si tu vole, adde un message personal al invitation." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Inviar" @@ -1797,7 +1797,7 @@ msgstr "" 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:135 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s se faceva membro del gruppo %s" @@ -1806,15 +1806,11 @@ msgstr "%s se faceva membro del gruppo %s" msgid "You must be logged in to leave a group." msgstr "Tu debe aperir un session pro quitar un gruppo." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Tu non es membro de iste gruppo." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Non poteva trovar le datos del membrato." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s quitava le gruppo %s" @@ -1918,12 +1914,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:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 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:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Nulle contento!" @@ -1931,7 +1927,7 @@ msgstr "Nulle contento!" msgid "No recipient specified." msgstr "Nulle destinatario specificate." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -4023,6 +4019,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Profilo del gruppo" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Non poteva actualisar gruppo." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Profilo del gruppo" + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -4040,49 +4051,49 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4402,13 +4413,13 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 #, fuzzy msgid "Notice with that id does not exist" msgstr "Nulle usator existe con iste adresse de e-mail o nomine de usator." -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 #, fuzzy msgid "User has no last notice" msgstr "Le usator non ha un profilo." @@ -4418,175 +4429,172 @@ msgid "Notice marked as fave." msgstr "" #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" -msgstr "Tu es ja membro de iste gruppo." +msgstr "Tu es ja membro de iste gruppo" -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, php-format msgid "Could not join user %s to group %s" -msgstr "Non poteva inscriber le usator %s in le gruppo %s." +msgstr "Non poteva facer le usator %s membro del gruppo %s" -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%s se faceva membro del gruppo %s" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, php-format msgid "Could not remove user %s to group %s" msgstr "Non poteva remover le usator %s del gruppo %s" -#: lib/command.php:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%s quitava le gruppo %s" -#: lib/command.php:318 +#: lib/command.php:309 #, fuzzy, php-format msgid "Fullname: %s" msgstr "Nomine complete" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "Message directe a %s inviate" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 -#, fuzzy +#: lib/command.php:413 msgid "Cannot repeat your own notice" -msgstr "Non pote repeter tu proprie nota." +msgstr "Non pote repeter tu proprie nota" -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" -msgstr "Iste nota ha ja essite repetite." +msgstr "Iste nota ha ja essite repetite" -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Nota delite." -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Error durante le repetition del nota." -#: lib/command.php:491 +#: lib/command.php:482 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Responsas a %s" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "" -#: lib/command.php:556 +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:679 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:701 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:723 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4627,19 +4635,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "" -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4837,11 +4845,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Lingua \"%s\" incognite" + #: lib/joinform.php:114 msgid "Join" msgstr "" @@ -5144,15 +5157,21 @@ msgstr "" msgid "Share my location" msgstr "Non poteva salveguardar le preferentias de loco." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Non poteva salveguardar le preferentias de loco." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5413,23 +5432,23 @@ msgstr "" msgid "User has blocked you." msgstr "" -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "" -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "" @@ -5503,47 +5522,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "" diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po index b524a7f8f5..beef92d124 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:27:15+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:31+0000\n" "Language-Team: Icelandic\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: is\n" "X-Message-Group: out-statusnet\n" @@ -46,10 +46,10 @@ msgstr "Ekkert þannig merki." #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Enginn svoleiðis notandi." @@ -389,7 +389,7 @@ msgstr "Þú ert nú þegar meðlimur í þessum hópi" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Gat ekki bætt notandanum %s í hópinn %s" @@ -399,7 +399,7 @@ msgstr "Gat ekki bætt notandanum %s í hópinn %s" msgid "You are not a member of this group." msgstr "Þú ert ekki meðlimur í þessum hópi." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s" @@ -695,7 +695,7 @@ msgstr "Mistókst að vista upplýsingar um notendalokun" #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "Enginn þannig hópur." @@ -1674,7 +1674,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:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1720,7 +1720,7 @@ msgstr "Persónuleg skilaboð" msgid "Optionally add a personal message to the invitation." msgstr "Bættu persónulegum skilaboðum við boðskortið ef þú vilt." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Senda" @@ -1790,7 +1790,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Þú verður að hafa skráð þig inn til að bæta þér í hóp." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s bætti sér í hópinn %s" @@ -1799,15 +1799,11 @@ 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:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Þú ert ekki meðlimur í þessum hópi." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Gat ekki fundið meðlimaskrá." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s gekk úr hópnum %s" @@ -1912,12 +1908,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:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 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:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Ekkert innihald!" @@ -1925,7 +1921,7 @@ msgstr "Ekkert innihald!" msgid "No recipient specified." msgstr "Enginn móttökuaðili tilgreindur." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -4018,6 +4014,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Hópssíðan" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Gat ekki uppfært hóp." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Hópssíðan" + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -4036,51 +4047,51 @@ msgstr "Gat ekki skeytt skilaboðum inn í." msgid "Could not update message with new URI." msgstr "Gat ekki uppfært skilaboð með nýju veffangi." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Gat ekki vistað babl. Óþekktur notandi." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Of mikið babl í einu; slakaðu aðeins á og haltu svo áfram eftir nokkrar " "mínútur." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Vandamál komu upp við að vista babl." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Gagnagrunnsvilla við innsetningu svars: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4416,14 +4427,13 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: 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" @@ -4432,182 +4442,179 @@ msgid "Notice marked as fave." msgstr "Babl gert að uppáhaldi." #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" msgstr "Þú ert nú þegar meðlimur í þessum hópi" -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, php-format msgid "Could not join user %s to group %s" msgstr "Gat ekki bætt notandanum %s í hópinn %s" -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%s bætti sér í hópinn %s" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, 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:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%s gekk úr hópnum %s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Fullt nafn: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Staðsetning: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Heimasíða: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Um: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, 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:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "Bein skilaboð send til %s" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Villa kom upp við að senda bein skilaboð" -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Get ekki kveikt á tilkynningum." -#: lib/command.php:427 +#: lib/command.php:418 #, fuzzy msgid "Already repeated that notice" msgstr "Eyða þessu babli" -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Babl sent inn" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Vandamál komu upp við að vista babl." -#: lib/command.php:491 +#: lib/command.php:482 #, 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:500 +#: lib/command.php:491 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Svara þessu babli" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "Vandamál komu upp við að vista babl." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Nú ert þú áskrifandi að %s" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Nú ert þú ekki lengur áskrifandi að %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Skipun hefur ekki verið fullbúin" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Tilkynningar af." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Get ekki slökkt á tilkynningum." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Tilkynningar á." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Get ekki kveikt á tilkynningum." -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Þú ert ekki áskrifandi." -#: lib/command.php:679 +#: lib/command.php:670 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:699 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér." -#: lib/command.php:701 +#: lib/command.php:692 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:721 +#: lib/command.php:712 #, fuzzy msgid "You are not a member of any groups." msgstr "Þú ert ekki meðlimur í þessum hópi." -#: lib/command.php:723 +#: lib/command.php:714 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:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4648,20 +4655,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "Enginn staðfestingarlykill." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 #, fuzzy msgid "Go to the installer." msgstr "Skrá þig inn á síðuna" @@ -4864,11 +4871,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "Gerast meðlimur" @@ -5182,15 +5194,21 @@ msgstr "" msgid "Share my location" msgstr "Gat ekki vistað merki." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Gat ekki vistað merki." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5461,25 +5479,25 @@ msgstr "" msgid "User has blocked you." msgstr "Notandinn hefur lokað á þig." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Gat ekki farið í áskrift." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Ekki í áskrift!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Gat ekki eytt áskrift." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Gat ekki eytt áskrift." @@ -5555,47 +5573,47 @@ msgstr "Skilaboð" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "fyrir nokkrum sekúndum" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "fyrir um einni mínútu síðan" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "fyrir um %d mínútum síðan" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "fyrir um einum klukkutíma síðan" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "fyrir um %d klukkutímum síðan" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "fyrir um einum degi síðan" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "fyrir um %d dögum síðan" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "fyrir um einum mánuði síðan" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "fyrir um %d mánuðum síðan" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "fyrir um einu ári síðan" diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po index 9f4e3e7341..81c1d1fe7c 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:27:19+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:34+0000\n" "Language-Team: Italian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: it\n" "X-Message-Group: out-statusnet\n" @@ -44,10 +44,10 @@ msgstr "Pagina inesistente." #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Utente inesistente." @@ -390,7 +390,7 @@ msgstr "Fai già parte di quel gruppo." msgid "You have been blocked from that group by the admin." msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo." -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s." @@ -399,7 +399,7 @@ msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s." msgid "You are not a member of this group." msgstr "Non fai parte di questo gruppo." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s." @@ -695,7 +695,7 @@ msgstr "Salvataggio delle informazioni per il blocco non riuscito." #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "Nessuna gruppo." @@ -1679,7 +1679,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:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1724,7 +1724,7 @@ msgstr "Messaggio personale" msgid "Optionally add a personal message to the invitation." msgstr "Puoi aggiungere un messaggio personale agli inviti." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Invia" @@ -1794,7 +1794,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Devi eseguire l'accesso per iscriverti a un gruppo." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s fa ora parte del gruppo %2$s" @@ -1803,15 +1803,11 @@ 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:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Non fai parte di quel gruppo." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Impossibile trovare il record della membership." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s ha lasciato il gruppo %2$s" @@ -1913,12 +1909,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:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 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:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Nessun contenuto!" @@ -1926,7 +1922,7 @@ msgstr "Nessun contenuto!" msgid "No recipient specified." msgstr "Nessun destinatario specificato." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 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." @@ -2078,27 +2074,27 @@ msgstr "Il servizio di riduzione degli URL è troppo lungo (max 50 caratteri)." #: actions/otp.php:69 #, fuzzy msgid "No user ID specified." -msgstr "Nessun gruppo specificato." +msgstr "Nessun ID utente specificato." #: actions/otp.php:83 #, fuzzy msgid "No login token specified." -msgstr "Nessun messaggio specificato." +msgstr "Nessun token di accesso specificato." #: actions/otp.php:90 #, fuzzy msgid "No login token requested." -msgstr "Nessun ID di profilo nella richiesta." +msgstr "Nessun token di accesso richiesto." #: actions/otp.php:95 #, fuzzy msgid "Invalid login token specified." -msgstr "Token non valido o scaduto." +msgstr "Token di accesso specificato non valido." #: actions/otp.php:104 #, fuzzy msgid "Login token expired." -msgstr "Accedi al sito" +msgstr "Token di accesso scaduto." #: actions/outbox.php:61 #, php-format @@ -3256,7 +3252,7 @@ msgstr "Devi avere un'email di contatto valida." #: actions/siteadminpanel.php:172 #, fuzzy, php-format msgid "Unknown language \"%s\"." -msgstr "Lingua \"%s\" sconosciuta" +msgstr "Lingua \"%s\" sconosciuta." #: actions/siteadminpanel.php:179 msgid "Invalid snapshot report URL." @@ -4053,10 +4049,25 @@ msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" "Un file di questa dimensione supererebbe la tua quota mensile di %d byte." +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Profilo del gruppo" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Impossibile aggiornare il gruppo." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Profilo del gruppo" + #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" -msgstr "Impossibile creare il token di accesso per %s." +msgstr "Impossibile creare il token di accesso per %s" #: classes/Message.php:45 msgid "You are banned from sending direct messages." @@ -4070,27 +4081,27 @@ msgstr "Impossibile inserire il messaggio." msgid "Could not update message with new URI." msgstr "Impossibile aggiornare il messaggio con il nuovo URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Errore del DB nell'inserire un hashtag: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Problema nel salvare il messaggio. Troppo lungo." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Problema nel salvare il messaggio. Utente sconosciuto." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra " "qualche minuto." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4098,25 +4109,25 @@ msgstr "" "Troppi messaggi duplicati troppo velocemente; fai una pausa e scrivi di " "nuovo tra qualche minuto." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Ti è proibito inviare messaggi su questo sito." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problema nel salvare il messaggio." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Errore del DB nell'inserire la risposta: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Benvenuti su %1$s, @%2$s!" @@ -4160,7 +4171,7 @@ msgstr "Altre opzioni" #: lib/action.php:144 #, fuzzy, php-format msgid "%1$s - %2$s" -msgstr "%1$s (%2$s)" +msgstr "%1$s - %2$s" #: lib/action.php:159 msgid "Untitled page" @@ -4417,18 +4428,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "Questo comando non è ancora implementato." #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" -msgstr "Impossibile trovare un utente col soprannome %s." +msgstr "Impossibile trovare un utente col soprannome %s" #: lib/command.php:92 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 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" -msgstr "Richiamo inviato a %s." +msgstr "Richiamo inviato a %s" #: lib/command.php:126 #, php-format @@ -4441,14 +4452,12 @@ msgstr "" "Abbonati: %2$s\n" "Messaggi: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy +#: 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." +msgstr "Un messaggio con quel ID non esiste" -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: 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." @@ -4457,180 +4466,174 @@ msgid "Notice marked as fave." msgstr "Messaggio indicato come preferito." #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" -msgstr "Fai già parte di quel gruppo." +msgstr "Fai già parte di quel gruppo" -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, 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:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" -msgstr "%1$s fa ora parte del gruppo %2$s" +msgstr "%s fa ora parte del gruppo %s" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, 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:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%1$s ha lasciato il gruppo %2$s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Posizione: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Pagina web: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Informazioni: %s" -#: lib/command.php:358 -#, fuzzy, php-format +#: lib/command.php:349 +#, php-format msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d." +msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d" -#: lib/command.php:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "Messaggio diretto a %s inviato." -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Errore nell'inviare il messaggio diretto." -#: lib/command.php:422 -#, fuzzy +#: lib/command.php:413 msgid "Cannot repeat your own notice" -msgstr "Non puoi ripetere un tuo messaggio." +msgstr "Impossibile ripetere un proprio messaggio" -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" -msgstr "Hai già ripetuto quel messaggio." +msgstr "Hai già ripetuto quel messaggio" -#: lib/command.php:435 -#, fuzzy, php-format +#: lib/command.php:426 +#, php-format msgid "Notice from %s repeated" -msgstr "Messaggio da %s ripetuto." +msgstr "Messaggio da %s ripetuto" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Errore nel ripetere il messaggio." -#: lib/command.php:491 -#, fuzzy, php-format +#: lib/command.php:482 +#, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d." +msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d" -#: lib/command.php:500 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Reply to %s sent" -msgstr "Risposta a %s inviata." +msgstr "Risposta a %s inviata" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Errore nel salvare il messaggio." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "Specifica il nome dell'utente a cui abbonarti." -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Abbonati a %s" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento." -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Abbonamento a %s annullato" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Comando non ancora implementato." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notifiche disattivate." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Impossibile disattivare le notifiche." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notifiche attivate." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Impossibile attivare le notifiche." -#: lib/command.php:650 -#, fuzzy +#: lib/command.php:641 msgid "Login command is disabled" -msgstr "Il comando di accesso è disabilitato." +msgstr "Il comando di accesso è disabilitato" -#: lib/command.php:661 -#, fuzzy, php-format +#: lib/command.php:652 +#, 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." +"minuti: %s" -#: lib/command.php:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "Il tuo abbonamento è stato annullato." -#: lib/command.php:679 +#: lib/command.php:670 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:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "Nessuno è abbonato ai tuoi messaggi." -#: lib/command.php:701 +#: lib/command.php:692 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:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "Non fai parte di alcun gruppo." -#: lib/command.php:723 +#: lib/command.php:714 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:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4710,21 +4713,21 @@ msgstr "" "tracks - non ancora implementato\n" "tracking - non ancora implementato\n" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Non è stato trovato alcun file di configurazione. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "I file di configurazione sono stati cercati in questi posti: " -#: lib/common.php:201 +#: lib/common.php:134 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:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Vai al programma d'installazione." @@ -4925,11 +4928,16 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Lingua \"%s\" sconosciuta." + #: lib/joinform.php:114 msgid "Join" msgstr "Iscriviti" @@ -5320,15 +5328,21 @@ msgstr "Allega un file" msgid "Share my location" msgstr "Condividi la mia posizione" -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Non condividere la mia posizione" -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "Nascondi info" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5586,23 +5600,23 @@ msgstr "Hai già l'abbonamento!" msgid "User has blocked you." msgstr "L'utente non ti consente di seguirlo." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Impossibile abbonarsi." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Impossibile abbonare altri a te." -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Non hai l'abbonamento!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Impossibile eliminare l'auto-abbonamento." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Impossibile eliminare l'abbonamento." @@ -5676,47 +5690,47 @@ msgstr "Messaggio" msgid "Moderate" msgstr "Modera" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "pochi secondi fa" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "circa un minuto fa" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "circa %d minuti fa" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "circa un'ora fa" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "circa %d ore fa" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "circa un giorno fa" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "circa %d giorni fa" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "circa un mese fa" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "circa %d mesi fa" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "circa un anno fa" diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po index 367e599160..b3c04d2f43 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:27:23+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:37+0000\n" "Language-Team: Japanese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ja\n" "X-Message-Group: out-statusnet\n" @@ -46,10 +46,10 @@ msgstr "そのようなページはありません。" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "そのような利用者はいません。" @@ -91,13 +91,13 @@ msgstr "" "してみたり、何か投稿してみましょう。" #: actions/all.php:134 -#, fuzzy, php-format +#, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from his profile or [post something to " "his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"プロフィールから [%s さんに合図](../%s) したり、[知らせたいことについて投稿]" -"(%%%%action.newnotice%%%%?status_textarea=%s) したりできます。" +"プロフィールから [%1$s さんに合図](../%2$s) したり、[知らせたいことについて投" +"稿](%%%%action.newnotice%%%%?status_textarea=%3$s) したりできます。" #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202 #, php-format @@ -265,18 +265,16 @@ msgid "No status found with that ID." msgstr "そのＩＤのステータスが見つかりません。" #: actions/apifavoritecreate.php:119 -#, fuzzy msgid "This status is already a favorite." -msgstr "このステータスはすでにお気に入りです!" +msgstr "このステータスはすでにお気に入りです。" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 msgid "Could not create favorite." msgstr "お気に入りを作成できません。" #: actions/apifavoritedestroy.php:122 -#, fuzzy msgid "That status is not a favorite." -msgstr "そのステータスはお気に入りではありません!" +msgstr "そのステータスはお気に入りではありません。" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 msgid "Could not delete favorite." @@ -297,9 +295,8 @@ msgid "Could not unfollow user: User not found." msgstr "利用者のフォローを停止できませんでした: 利用者が見つかりません。" #: actions/apifriendshipsdestroy.php:120 -#, fuzzy msgid "You cannot unfollow yourself." -msgstr "自分自身をフォロー停止することはできません！" +msgstr "自分自身をフォロー停止することはできません。" #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." @@ -393,19 +390,19 @@ msgstr "すでにこのグループのメンバーです。" msgid "You have been blocked from that group by the admin." msgstr "管理者によってこのグループからブロックされています。" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 -#, fuzzy, php-format +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 +#, php-format msgid "Could not join user %1$s to group %2$s." -msgstr "利用者 %s はグループ %s に参加できません。" +msgstr "利用者 %1$s はグループ %2$s に参加できません。" #: actions/apigroupleave.php:114 msgid "You are not a member of this group." msgstr "このグループのメンバーではありません。" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 -#, fuzzy, php-format +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 +#, php-format msgid "Could not remove user %1$s from group %2$s." -msgstr "利用者 %s をグループ %s から削除できません。" +msgstr "利用者 %1$s をグループ %2$s から削除できません。" #: actions/apigrouplist.php:95 #, php-format @@ -471,14 +468,14 @@ msgid "Unsupported format." msgstr "サポート外の形式です。" #: actions/apitimelinefavorites.php:108 -#, fuzzy, php-format +#, php-format msgid "%1$s / Favorites from %2$s" -msgstr "%s / %s からのお気に入り" +msgstr "%1$s / %2$s からのお気に入り" #: actions/apitimelinefavorites.php:120 -#, fuzzy, php-format +#, php-format msgid "%1$s updates favorited by %2$s / %2$s." -msgstr "%s は %s でお気に入りを更新しました / %s。" +msgstr "%1$s は %2$s でお気に入りを更新しました / %2$s。" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 #: actions/grouprss.php:131 actions/userrss.php:90 @@ -696,7 +693,7 @@ msgstr "ブロック情報の保存に失敗しました。" #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "そのようなグループはありません。" @@ -706,9 +703,9 @@ msgid "%s blocked profiles" msgstr "%s ブロックされたプロファイル" #: actions/blockedfromgroup.php:93 -#, fuzzy, php-format +#, php-format msgid "%1$s blocked profiles, page %2$d" -msgstr "%s ブロックされたプロファイル、ページ %d" +msgstr "%1$s ブロックされたプロファイル、ページ %2$d" #: actions/blockedfromgroup.php:108 msgid "A list of the users blocked from joining this group." @@ -985,7 +982,6 @@ msgstr "グループを作るにはログインしていなければなりませ #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -#, fuzzy msgid "You must be an admin to edit the group." msgstr "グループを編集するには管理者である必要があります。" @@ -1011,7 +1007,6 @@ msgid "Options saved." msgstr "オプションが保存されました。" #: actions/emailsettings.php:60 -#, fuzzy msgid "Email settings" msgstr "メール設定" @@ -1049,7 +1044,6 @@ msgid "Cancel" msgstr "中止" #: actions/emailsettings.php:121 -#, fuzzy msgid "Email address" msgstr "メールアドレス" @@ -1356,14 +1350,14 @@ msgid "Block user from group" msgstr "グループからブロックされた利用者" #: actions/groupblock.php:162 -#, fuzzy, php-format +#, php-format msgid "" "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " "will be removed from the group, unable to post, and unable to subscribe to " "the group in the future." msgstr "" -"本当に利用者 %s をグループ %s からブロックしますか? 彼らはグループから削除さ" -"れる、投稿できない、グループをフォローできなくなります。" +"本当に利用者 %1$s をグループ %2$s からブロックしますか? 彼らはグループから削" +"除される、投稿できない、グループをフォローできなくなります。" #: actions/groupblock.php:178 msgid "Do not block this user from this group" @@ -1419,7 +1413,6 @@ msgstr "" "%s。" #: actions/grouplogo.php:178 -#, fuzzy msgid "User without matching profile." msgstr "合っているプロフィールのない利用者" @@ -1441,9 +1434,9 @@ msgid "%s group members" msgstr "%s グループメンバー" #: actions/groupmembers.php:96 -#, fuzzy, php-format +#, php-format msgid "%1$s group members, page %2$d" -msgstr "%s グループメンバー、ページ %d" +msgstr "%1$s グループメンバー、ページ %2$d" #: actions/groupmembers.php:111 msgid "A list of the users in this group." @@ -1552,7 +1545,6 @@ msgid "Error removing the block." msgstr "ブロックの削除エラー" #: actions/imsettings.php:59 -#, fuzzy msgid "IM settings" msgstr "IM設定" @@ -1583,7 +1575,6 @@ msgstr "" "たメッセージを確認してください。(%s を友人リストに追加しましたか？)" #: actions/imsettings.php:124 -#, fuzzy msgid "IM address" msgstr "IMアドレス" @@ -1683,7 +1674,7 @@ msgstr "新しい利用者を招待" msgid "You are already subscribed to these users:" msgstr "すでにこれらの利用者をフォローしています:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1729,7 +1720,7 @@ msgstr "パーソナルメッセージ" msgid "Optionally add a personal message to the invitation." msgstr "任意に招待にパーソナルメッセージを加えてください。" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "送る" @@ -1799,27 +1790,23 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "グループに入るためにはログインしなければなりません。" -#: actions/joingroup.php:135 -#, fuzzy, php-format +#: actions/joingroup.php:131 +#, php-format msgid "%1$s joined group %2$s" -msgstr "%s はグループ %s に参加しました" +msgstr "%1$s はグループ %2$s に参加しました" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." msgstr "グループから離れるにはログインしていなければなりません。" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "あなたはそのグループのメンバーではありません。" -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "会員資格記録を見つけることができませんでした。" - -#: actions/leavegroup.php:134 -#, fuzzy, php-format +#: actions/leavegroup.php:127 +#, php-format msgid "%1$s left group %2$s" -msgstr "%s はグループ %s に残りました。" +msgstr "%1$s はグループ %2$s に残りました。" #: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." @@ -1887,19 +1874,19 @@ msgid "Only an admin can make another user an admin." msgstr "管理者だけが別のユーザを管理者にすることができます。" #: actions/makeadmin.php:95 -#, fuzzy, php-format +#, php-format msgid "%1$s is already an admin for group \"%2$s\"." -msgstr "%s はすでにグループ \"%s\" の管理者です。" +msgstr "%1$s はすでにグループ \"%2$s\" の管理者です。" #: actions/makeadmin.php:132 -#, fuzzy, php-format +#, php-format msgid "Can't get membership record for %1$s in group %2$s." -msgstr "%s の会員資格記録をグループ %s 中から取得できません。" +msgstr "%1$s の会員資格記録をグループ %2$s 中から取得できません。" #: actions/makeadmin.php:145 -#, fuzzy, php-format +#, php-format msgid "Can't make %1$s an admin for group %2$s." -msgstr "%s をグループ %s の管理者にすることはできません" +msgstr "%1$s をグループ %2$s の管理者にすることはできません" #: actions/microsummary.php:69 msgid "No current status" @@ -1917,12 +1904,12 @@ msgstr "このフォームを使って新しいグループを作成します。 msgid "New message" msgstr "新しいメッセージ" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "この利用者にメッセージを送ることはできません。" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "コンテンツがありません！" @@ -1930,7 +1917,7 @@ msgstr "コンテンツがありません！" msgid "No recipient specified." msgstr "受取人が書かれていません。" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -1941,7 +1928,7 @@ msgid "Message sent" msgstr "メッセージを送りました" #: actions/newmessage.php:185 -#, fuzzy, php-format +#, php-format msgid "Direct message to %s sent." msgstr "ダイレクトメッセージを %s に送りました" @@ -1970,9 +1957,9 @@ msgid "Text search" msgstr "テキスト検索" #: actions/noticesearch.php:91 -#, fuzzy, php-format +#, php-format msgid "Search results for \"%1$s\" on %2$s" -msgstr "%s の %s 上の検索結果" +msgstr "\"%1$s\" の %2$s 上の検索結果" #: actions/noticesearch.php:121 #, php-format @@ -2080,29 +2067,24 @@ msgid "URL shortening service is too long (max 50 chars)." msgstr "URL 短縮サービスが長すぎます。（最大50字）" #: actions/otp.php:69 -#, fuzzy msgid "No user ID specified." -msgstr "グループ記述がありません。" +msgstr "利用者IDの記述がありません。" #: actions/otp.php:83 -#, fuzzy msgid "No login token specified." -msgstr "つぶやきがありません。" +msgstr "ログイントークンの記述がありません。" #: actions/otp.php:90 -#, fuzzy msgid "No login token requested." -msgstr "リクエスト内にプロファイルIDがありません。" +msgstr "ログイントークンが要求されていません。" #: actions/otp.php:95 -#, fuzzy msgid "Invalid login token specified." -msgstr "不正または期限切れのトークン" +msgstr "不正なログイントークンが指定されています。" #: actions/otp.php:104 -#, fuzzy msgid "Login token expired." -msgstr "サイトへログイン" +msgstr "ログイントークンが期限切れです・" #: actions/outbox.php:61 #, php-format @@ -2302,7 +2284,6 @@ msgid "When to use SSL" msgstr "SSL 使用時" #: actions/pathsadminpanel.php:308 -#, fuzzy msgid "SSL server" msgstr "SSLサーバ" @@ -2333,18 +2314,19 @@ msgid "Not a valid people tag: %s" msgstr "正しいタグではありません： %s" #: actions/peopletag.php:144 -#, fuzzy, php-format +#, php-format msgid "Users self-tagged with %1$s - page %2$d" -msgstr "ユーザがつけたタグ %s - ページ %d" +msgstr "ユーザ自身がつけたタグ %1$s - ページ %2$d" #: actions/postnotice.php:84 msgid "Invalid notice content" msgstr "不正なつぶやき内容" #: actions/postnotice.php:90 -#, fuzzy, php-format +#, php-format msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." -msgstr "つぶやきライセンス ‘%s’ はサイトライセンス ‘%s’ と互換性がありません。" +msgstr "" +"つぶやきライセンス ‘%1$s’ はサイトライセンス ‘%2$s’ と互換性がありません。" #: actions/profilesettings.php:60 msgid "Profile settings" @@ -2465,7 +2447,6 @@ msgid "Couldn't update user for autosubscribe." msgstr "自動フォローのための利用者を更新できませんでした。" #: actions/profilesettings.php:359 -#, fuzzy msgid "Couldn't save location prefs." msgstr "場所情報を保存できません。" @@ -2810,20 +2791,20 @@ msgid "" "\n" "Thanks for signing up and we hope you enjoy using this service." msgstr "" -"%s さん、おめでとうございます！%%%%site.name%%%% へようこそ。以下のようにして" -"始めることができます。\n" +"%1$s さん、おめでとうございます！%%%%site.name%%%% へようこそ。以下のようにし" +"て始めることができます。\n" "\n" -"* [あなたのプロフィール](%s) を参照して最初のメッセージを投稿する\n" +"* [あなたのプロファイル](%2$s) を参照して最初のメッセージを投稿する\n" "* [Jabber や GTalk のアドレス](%%%%action.imsettings%%%%) を追加して、インス" -"タントメッセージを通して通知を送れるようにする\n" +"タントメッセージを通してつぶやきを送れるようにする\n" "* あなたが知っている人やあなたと同じ興味をもっている人を[検索](%%%%action." "peoplesearch%%%%) する\n" -"* [プロフィール設定](%%%%action.profilesettings%%%%) を更新して他の利用者にあ" +"* [プロファイル設定](%%%%action.profilesettings%%%%) を更新して他の利用者にあ" "なたのことをより詳しく知らせる\n" "* 探している機能について[オンライン文書](%%%%doc.help%%%%) を読む\n" "\n" -"参加してくださりありがとうございます。私たちはあなたがこのサービスを楽しんで" -"使われることを願っています。" +"参加してくださってありがとうございます。私たちはあなたがこのサービスを楽しん" +"で使ってくれることを願っています。" #: actions/register.php:562 msgid "" @@ -2939,13 +2920,13 @@ msgid "Replies feed for %s (Atom)" msgstr "%s の返信フィード (Atom)" #: actions/replies.php:198 -#, fuzzy, php-format +#, php-format msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " "notice to his attention yet." msgstr "" -"これは %s への返信を表示したタイムラインです、しかし %s はまだつぶやきを受け" -"取っていません。" +"これは %1$s への返信を表示したタイムラインです、しかし %2$s はまだつぶやきを" +"受け取っていません。" #: actions/replies.php:203 #, php-format @@ -2957,13 +2938,13 @@ msgstr "" "ループに加わる] (%%action.groups%%)ことができます。" #: actions/replies.php:205 -#, fuzzy, php-format +#, php-format msgid "" "You can try to [nudge %1$s](../%2$s) or [post something to his or her " "attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" -"あなたは [合図 %s](../%s) するか、[その人宛てに何かを投稿](%%%%action." -"newnotice%%%%?status_textarea=%s)してください。" +"あなたは [%1$s に合図](../%2$s) するか、[その人宛てに何かを投稿](%%%%action." +"newnotice%%%%?status_textarea=%3$s)することができます。" #: actions/repliesrss.php:72 #, php-format @@ -3159,9 +3140,9 @@ msgid " tagged %s" msgstr "タグ付けされた %s" #: actions/showstream.php:122 -#, fuzzy, php-format +#, php-format msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" -msgstr "%sの%sとタグ付けされたつぶやきフィード (RSS 1.0)" +msgstr "%1$sの%2$sとタグ付けされたつぶやきフィード (RSS 1.0)" #: actions/showstream.php:129 #, php-format @@ -3184,9 +3165,9 @@ msgid "FOAF for %s" msgstr "%s の FOAF" #: actions/showstream.php:191 -#, fuzzy, php-format +#, php-format msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet." -msgstr "これは %s のタイムラインですが、%s はまだなにも投稿していません。" +msgstr "これは %1$s のタイムラインですが、%2$s はまだなにも投稿していません。" #: actions/showstream.php:196 msgid "" @@ -3197,13 +3178,13 @@ msgstr "" "いまは始める良い時でしょう:)" #: actions/showstream.php:198 -#, fuzzy, php-format +#, php-format msgid "" "You can try to nudge %1$s or [post something to his or her attention](%%%%" "action.newnotice%%%%?status_textarea=%2$s)." msgstr "" -"あなたは、%s に合図するか、[またはその人宛に何かを投稿](%%%%action.newnotice%" -"%%%?status_textarea=%s) しようとすることができます。" +"あなたは、%1$s に合図するか、[またはその人宛に何かを投稿](%%%%action." +"newnotice%%%%?status_textarea=%2$s) することができます。" #: actions/showstream.php:234 #, php-format @@ -3252,12 +3233,11 @@ msgid "Site name must have non-zero length." msgstr "サイト名は長さ0ではいけません。" #: actions/siteadminpanel.php:154 -#, fuzzy msgid "You must have a valid contact email address." msgstr "有効な連絡用メールアドレスがなければなりません。" #: actions/siteadminpanel.php:172 -#, fuzzy, php-format +#, php-format msgid "Unknown language \"%s\"." msgstr "不明な言語 \"%s\"" @@ -3443,7 +3423,6 @@ msgid "Save site settings" msgstr "サイト設定の保存" #: actions/smssettings.php:58 -#, fuzzy msgid "SMS settings" msgstr "SMS 設定" @@ -3474,7 +3453,6 @@ msgid "Enter the code you received on your phone." msgstr "あなたがあなたの電話で受け取ったコードを入れてください。" #: actions/smssettings.php:138 -#, fuzzy msgid "SMS phone number" msgstr "SMS 電話番号" @@ -3566,9 +3544,9 @@ msgid "%s subscribers" msgstr "フォローされている" #: actions/subscribers.php:52 -#, fuzzy, php-format +#, php-format msgid "%1$s subscribers, page %2$d" -msgstr "%s フォローされている、ページ %d" +msgstr "%1$s フォローされている、ページ %2$d" #: actions/subscribers.php:63 msgid "These are the people who listen to your notices." @@ -3607,9 +3585,9 @@ msgid "%s subscriptions" msgstr "%s フォローしている" #: actions/subscriptions.php:54 -#, fuzzy, php-format +#, php-format msgid "%1$s subscriptions, page %2$d" -msgstr "%s フォローしている、ページ %d" +msgstr "%1$s フォローしている、ページ %2$d" #: actions/subscriptions.php:65 msgid "These are the people whose notices you listen to." @@ -3736,12 +3714,12 @@ msgid "Unsubscribed" msgstr "フォロー解除済み" #: actions/updateprofile.php:62 actions/userauthorization.php:330 -#, fuzzy, php-format +#, php-format msgid "" "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -"リスニーストリームライセンス ‘%s’ は、サイトライセンス ‘%s’ と互換性がありま" -"せん。" +"リスニーストリームライセンス ‘%1$s’ は、サイトライセンス ‘%2$s’ と互換性があ" +"りません。" #: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 #: lib/personalgroupnav.php:115 @@ -3897,9 +3875,9 @@ msgstr "" "さい。" #: actions/userauthorization.php:296 -#, fuzzy, php-format +#, php-format msgid "Listener URI ‘%s’ not found here." -msgstr "リスナー URI ‘%s’ はここでは見つかりません" +msgstr "リスナー URI ‘%s’ はここでは見つかりません。" #: actions/userauthorization.php:301 #, php-format @@ -3963,9 +3941,9 @@ msgid "Try [searching for groups](%%action.groupsearch%%) and joining them." msgstr "[グループを探して](%%action.groupsearch%%)それに加入してください。" #: actions/version.php:73 -#, fuzzy, php-format +#, php-format msgid "StatusNet %s" -msgstr "統計データ" +msgstr "StatusNet %s" #: actions/version.php:153 #, php-format @@ -3973,15 +3951,16 @@ msgid "" "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " "Inc. and contributors." msgstr "" +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." #: actions/version.php:157 -#, fuzzy msgid "StatusNet" -msgstr "ステータスを削除しました。" +msgstr "StatusNet" #: actions/version.php:161 msgid "Contributors" -msgstr "" +msgstr "コントリビュータ" #: actions/version.php:168 msgid "" @@ -4008,20 +3987,17 @@ msgstr "" #: actions/version.php:189 msgid "Plugins" -msgstr "" +msgstr "プラグイン" #: actions/version.php:195 -#, fuzzy msgid "Name" -msgstr "ニックネーム" +msgstr "名前" #: actions/version.php:196 lib/action.php:741 -#, fuzzy msgid "Version" -msgstr "セッション" +msgstr "バージョン" #: actions/version.php:197 -#, fuzzy msgid "Author(s)" msgstr "作者" @@ -4051,8 +4027,23 @@ msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" "これほど大きいファイルはあなたの%dバイトの毎月の割当てを超えているでしょう。" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "グループプロファイル" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "グループを更新できません。" + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "グループプロファイル" + #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" msgstr "%s 用のログイン・トークンを作成できませんでした" @@ -4068,26 +4059,26 @@ msgstr "メッセージを追加できません。" msgid "Could not update message with new URI." msgstr "新しいURIでメッセージをアップデートできませんでした。" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "ハッシュタグ追加 ＤＢ エラー: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "つぶやきを保存する際に問題が発生しました。長すぎです。" -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "つぶやきを保存する際に問題が発生しました。不明な利用者です。" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "多すぎるつぶやきが速すぎます; 数分間の休みを取ってから再投稿してください。" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4095,25 +4086,25 @@ msgstr "" "多すぎる重複メッセージが速すぎます; 数分間休みを取ってから再度投稿してくださ" "い。" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "あなたはこのサイトでつぶやきを投稿するのが禁止されています。" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "つぶやきを保存する際に問題が発生しました。" -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "返信を追加する際にデータベースエラー : %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "ようこそ %1$s、@%2$s!" @@ -4155,9 +4146,9 @@ msgid "Other options" msgstr "その他のオプション" #: lib/action.php:144 -#, fuzzy, php-format +#, php-format msgid "%1$s - %2$s" -msgstr "%s はグループ %s に残りました。" +msgstr "" #: lib/action.php:159 msgid "Untitled page" @@ -4342,9 +4333,8 @@ msgid "You cannot make changes to this site." msgstr "あなたはこのサイトへの変更を行うことができません。" #: lib/adminpanelaction.php:107 -#, fuzzy msgid "Changes to that panel are not allowed." -msgstr "登録は許可されていません。" +msgstr "そのパネルへの変更は許可されていません。" #: lib/adminpanelaction.php:206 msgid "showForm() not implemented." @@ -4415,7 +4405,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "すみません、このコマンドはまだ実装されていません。" #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" msgstr "ユーザを更新できません" @@ -4424,7 +4414,7 @@ msgid "It does not make a lot of sense to nudge yourself!" msgstr "それは自分自身への合図で多くは意味がありません!" #: lib/command.php:99 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" msgstr "%s へ合図を送りました" @@ -4439,14 +4429,12 @@ msgstr "" "フォローされている: %2$s\n" "つぶやき: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy +#: 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:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 msgid "User has no last notice" msgstr "利用者はまだつぶやいていません" @@ -4455,175 +4443,169 @@ msgid "Notice marked as fave." msgstr "お気に入りにされているつぶやき。" #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" -msgstr "すでにこのグループのメンバーです。" +msgstr "あなたは既にそのグループに参加しています。" -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, php-format msgid "Could not join user %s to group %s" -msgstr "利用者 %s はグループ %s に参加できません。" +msgstr "利用者 %s はグループ %s に参加できません" -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%s はグループ %s に参加しました" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, php-format msgid "Could not remove user %s to group %s" msgstr "利用者 %s をグループ %s から削除することができません" -#: lib/command.php:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%s はグループ %s に残りました。" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "フルネーム： %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "場所: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "ホームページ: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "About: %s" -#: lib/command.php:358 -#, fuzzy, php-format +#: lib/command.php:349 +#, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "メッセージが長すぎます - 最大 %d 字、あなたが送ったのは %d" -#: lib/command.php:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "ダイレクトメッセージを %s に送りました" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "ダイレクトメッセージ送信エラー。" -#: lib/command.php:422 -#, fuzzy +#: lib/command.php:413 msgid "Cannot repeat your own notice" -msgstr "あなたのつぶやきを繰り返せません。" +msgstr "自分のつぶやきを繰り返すことはできません" -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" -msgstr "すでにつぶやきを繰り返しています。" +msgstr "すでにこのつぶやきは繰り返されています" -#: lib/command.php:435 -#, fuzzy, php-format +#: lib/command.php:426 +#, php-format msgid "Notice from %s repeated" msgstr "%s からつぶやきが繰り返されています" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "つぶやき繰り返しエラー" -#: lib/command.php:491 -#, fuzzy, php-format +#: lib/command.php:482 +#, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "つぶやきが長すぎます - 最大 %d 字、あなたが送ったのは %d" -#: lib/command.php:500 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Reply to %s sent" msgstr "%s へ返信を送りました" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "つぶやき保存エラー。" -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "フォローする利用者の名前を指定してください" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "%s をフォローしました" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "フォローをやめるユーザの名前を指定してください" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "%s のフォローをやめる" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "コマンドはまだ実装されていません。" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "通知オフ。" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "通知をオフできません。" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "通知オン。" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "通知をオンできません。" -#: lib/command.php:650 -#, fuzzy +#: lib/command.php:641 msgid "Login command is disabled" msgstr "ログインコマンドが無効になっています。" -#: lib/command.php:661 -#, fuzzy, php-format +#: lib/command.php:652 +#, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "このリンクは、かつてだけ使用可能であり、2分間だけ良いです: %s" -#: lib/command.php:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "あなたはだれにもフォローされていません。" -#: lib/command.php:679 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "あなたはこの人にフォローされています:" -#: lib/command.php:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "誰もフォローしていません。" -#: lib/command.php:701 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "この人はあなたにフォローされている:" -#: lib/command.php:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "あなたはどのグループのメンバーでもありません。" -#: lib/command.php:723 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "あなたはこのグループのメンバーではありません:" -#: lib/command.php:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4664,21 +4646,21 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "コンフィギュレーションファイルがありません。 " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "私は以下の場所でコンフィギュレーションファイルを探しました: " -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" "あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ" "ん。" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "インストーラへ。" @@ -4878,11 +4860,16 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "不明な言語 \"%s\"" + #: lib/joinform.php:114 msgid "Join" msgstr "参加" @@ -4963,11 +4950,9 @@ msgstr "" "%8$s でメールアドレスか通知オプションを変えてください。\n" #: lib/mail.php:258 -#, fuzzy, php-format +#, php-format msgid "Bio: %s" -msgstr "" -"自己紹介: %s\n" -"\n" +msgstr "自己紹介: %s" #: lib/mail.php:286 #, php-format @@ -5181,9 +5166,9 @@ msgid "Sorry, no incoming email allowed." msgstr "すみません、入ってくるメールは許可されていません。" #: lib/mailhandler.php:228 -#, fuzzy, php-format +#, php-format msgid "Unsupported message type: %s" -msgstr "サポート外の画像形式です。" +msgstr "サポート外のメッセージタイプ: %s" #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." @@ -5222,18 +5207,16 @@ msgid "File upload stopped by extension." msgstr "エクステンションによってファイルアップロードを中止しました。" #: lib/mediafile.php:179 lib/mediafile.php:216 -#, fuzzy msgid "File exceeds user's quota." -msgstr "ファイルはユーザの割当てを超えています!" +msgstr "ファイルはユーザの割当てを超えています。" #: lib/mediafile.php:196 lib/mediafile.php:233 msgid "File could not be moved to destination directory." msgstr "ファイルを目的ディレクトリに動かすことができませんでした。" #: lib/mediafile.php:201 lib/mediafile.php:237 -#, fuzzy msgid "Could not determine file's MIME type." -msgstr "ファイルのMIMEタイプを決定できません" +msgstr "ファイルのMIMEタイプを決定できません。" #: lib/mediafile.php:270 #, php-format @@ -5241,7 +5224,7 @@ msgid " Try using another %s format." msgstr "別の %s フォーマットを試してください。" #: lib/mediafile.php:275 -#, fuzzy, php-format +#, php-format msgid "%s is not a supported file type on this server." msgstr "%s はこのサーバのサポートしているファイルタイプではありません。" @@ -5275,17 +5258,21 @@ msgid "Attach a file" msgstr "ファイル添付" #: lib/noticeform.php:212 -#, fuzzy msgid "Share my location" -msgstr "あなたの場所を共有" - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location" -msgstr "あなたの場所を共有" +msgstr "あなたの場所を共有する" #: lib/noticeform.php:215 +msgid "Do not share my location" +msgstr "あなたの場所を共有しない" + +#: lib/noticeform.php:216 msgid "Hide this info" +msgstr "この情報を隠す" + +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" msgstr "" #: lib/noticelist.php:428 @@ -5407,9 +5394,8 @@ msgid "Tags in %s's notices" msgstr "%s のつぶやきのタグ" #: lib/plugin.php:114 -#, fuzzy msgid "Unknown" -msgstr "不明なアクション" +msgstr "不明" #: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82 msgid "Subscriptions" @@ -5550,23 +5536,23 @@ msgstr "すでにフォローしています!" msgid "User has blocked you." msgstr "利用者はあなたをブロックしました。" -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "フォローできません。" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "他の人があなたをフォローできません。" -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "フォローしていません！" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "自己フォローを削除できません。" -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "フォローを削除できません" @@ -5641,47 +5627,47 @@ msgstr "メッセージ" msgid "Moderate" msgstr "司会" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "数秒前" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "約 1 分前" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "約 %d 分前" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "約 1 時間前" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "約 %d 時間前" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "約 1 日前" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "約 %d 日前" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "約 1 ヵ月前" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "約 %d ヵ月前" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "約 1 年前" @@ -5696,6 +5682,6 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "%s は有効な色ではありません! 3か6の16進数を使ってください。" #: scripts/xmppdaemon.php:301 -#, fuzzy, php-format +#, php-format msgid "Message too long - maximum is %1$d characters, you sent %2$d." -msgstr "メッセージが長すぎます - 最大 %d 字、あなたが送ったのは %d" +msgstr "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。" diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po index 0a2e4561e4..f37715eca6 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:27:28+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:40+0000\n" "Language-Team: Korean\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ko\n" "X-Message-Group: out-statusnet\n" @@ -43,10 +43,10 @@ msgstr "그러한 태그가 없습니다." #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "그러한 사용자는 없습니다." @@ -391,7 +391,7 @@ msgstr "당신은 이미 이 그룹의 멤버입니다." msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "그룹 %s에 %s는 가입할 수 없습니다." @@ -401,7 +401,7 @@ msgstr "그룹 %s에 %s는 가입할 수 없습니다." msgid "You are not a member of this group." msgstr "당신은 해당 그룹의 멤버가 아닙니다." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다." @@ -699,7 +699,7 @@ msgstr "정보차단을 저장하는데 실패했습니다." #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "그러한 그룹이 없습니다." @@ -1702,7 +1702,7 @@ msgstr "새 사용자를 초대" msgid "You are already subscribed to these users:" msgstr "당신은 다음 사용자를 이미 구독하고 있습니다." -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1745,7 +1745,7 @@ msgstr "개인적인 메시지" msgid "Optionally add a personal message to the invitation." msgstr "초대장에 메시지 첨부하기." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "보내기" @@ -1810,7 +1810,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "그룹가입을 위해서는 로그인이 필요합니다." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s 는 그룹 %s에 가입했습니다." @@ -1819,15 +1819,11 @@ msgstr "%s 는 그룹 %s에 가입했습니다." msgid "You must be logged in to leave a group." msgstr "그룹을 떠나기 위해서는 로그인해야 합니다." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "당신은 해당 그룹의 멤버가 아닙니다." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "멤버십 기록을 발견할 수 없습니다." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s가 그룹%s를 떠났습니다." @@ -1929,12 +1925,12 @@ msgstr "새 그룹을 만들기 위해 이 양식을 사용하세요." msgid "New message" msgstr "새로운 메시지입니다." -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "내용이 없습니다!" @@ -1942,7 +1938,7 @@ msgstr "내용이 없습니다!" msgid "No recipient specified." msgstr "수신자를 지정하지 않았습니다." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -4039,6 +4035,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "그룹 프로필" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "그룹을 업데이트 할 수 없습니다." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "그룹 프로필" + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -4057,28 +4068,28 @@ msgstr "메시지를 삽입할 수 없습니다." msgid "Could not update message with new URI." msgstr "새 URI와 함께 메시지를 업데이트할 수 없습니다." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "해쉬테그를 추가 할 때에 데이타베이스 에러 : %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "게시글 저장문제. 알려지지않은 회원" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 " "해보세요." -#: classes/Notice.php:241 +#: classes/Notice.php:240 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4087,25 +4098,25 @@ msgstr "" "너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 " "해보세요." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "이 사이트에 게시글 포스팅으로부터 당신은 금지되었습니다." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%2$s에서 %1$s까지 메시지" @@ -4443,14 +4454,13 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 msgid "User has no last notice" msgstr "이용자의 지속적인 게시글이 없습니다." @@ -4459,179 +4469,176 @@ msgid "Notice marked as fave." msgstr "게시글이 좋아하는 글로 지정되었습니다." #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" msgstr "당신은 이미 이 그룹의 멤버입니다." -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, php-format msgid "Could not join user %s to group %s" msgstr "그룹 %s에 %s는 가입할 수 없습니다." -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%s 는 그룹 %s에 가입했습니다." -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, php-format msgid "Could not remove user %s to group %s" msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다." -#: lib/command.php:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%s가 그룹%s를 떠났습니다." -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "전체이름: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "위치: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "홈페이지: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "자기소개: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다." -#: lib/command.php:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "%s에게 보낸 직접 메시지" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "직접 메시지 보내기 오류." -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "알림을 켤 수 없습니다." -#: lib/command.php:427 +#: lib/command.php:418 #, fuzzy msgid "Already repeated that notice" msgstr "이 게시글 삭제하기" -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "게시글이 등록되었습니다." -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: lib/command.php:491 +#: lib/command.php:482 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다." -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "이 게시글에 대해 답장하기" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "통지를 저장하는데 문제가 발생했습니다." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "구독하려는 사용자의 이름을 지정하십시오." -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "%s에게 구독되었습니다." -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "구독을 해제하려는 사용자의 이름을 지정하십시오." -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "%s에서 구독을 해제했습니다." -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "명령이 아직 실행되지 않았습니다." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "알림끄기." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "알림을 끌 수 없습니다." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "알림이 켜졌습니다." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "알림을 켤 수 없습니다." -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "당신은 이 프로필에 구독되지 않고있습니다." -#: lib/command.php:679 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다." -#: lib/command.php:699 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "다른 사람을 구독 하실 수 없습니다." -#: lib/command.php:701 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "다른 사람을 구독 하실 수 없습니다." -#: lib/command.php:721 +#: lib/command.php:712 #, fuzzy msgid "You are not a member of any groups." msgstr "당신은 해당 그룹의 멤버가 아닙니다." -#: lib/command.php:723 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다." -#: lib/command.php:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4672,20 +4679,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "확인 코드가 없습니다." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 #, fuzzy msgid "Go to the installer." msgstr "이 사이트 로그인" @@ -4889,11 +4896,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "가입" @@ -5205,15 +5217,21 @@ msgstr "" msgid "Share my location" msgstr "태그를 저장할 수 없습니다." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "태그를 저장할 수 없습니다." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5488,25 +5506,25 @@ msgstr "" msgid "User has blocked you." msgstr "회원이 당신을 차단해왔습니다." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "구독 하실 수 없습니다." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "다른 사람을 구독 하실 수 없습니다." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "구독하고 있지 않습니다!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "예약 구독을 삭제 할 수 없습니다." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "예약 구독을 삭제 할 수 없습니다." @@ -5584,47 +5602,47 @@ msgstr "메시지" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "몇 초 전" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "1분 전" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "%d분 전" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "1시간 전" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "%d시간 전" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "하루 전" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "%d일 전" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "1달 전" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "%d달 전" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "1년 전" diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po index 48495e59fa..4bda795f0a 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:27:31+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:43+0000\n" "Language-Team: Macedonian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: out-statusnet\n" @@ -44,10 +44,10 @@ msgstr "Нема таква страница" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Нема таков корисник." @@ -391,7 +391,7 @@ msgstr "Веќе членувате во таа група." msgid "You have been blocked from that group by the admin." msgstr "Блокирани сте од таа група од администраторот." -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Не можам да го зачленам корисникот %1$s во групата 2$s." @@ -400,7 +400,7 @@ msgstr "Не можам да го зачленам корисникот %1$s в msgid "You are not a member of this group." msgstr "Не членувате во оваа група." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Не можев да го отстранам корисникот %1$s од групата %2$s." @@ -698,7 +698,7 @@ msgstr "Не можев да ги снимам инофрмациите за б #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "Нема таква група." @@ -1684,7 +1684,7 @@ msgstr "Покани нови корисници" msgid "You are already subscribed to these users:" msgstr "Веќе сте претплатени на овие корисници:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1730,7 +1730,7 @@ msgstr "Лична порака" msgid "Optionally add a personal message to the invitation." msgstr "Можете да додадете и лична порака во поканата." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Испрати" @@ -1800,7 +1800,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Мора да сте најавени за да можете да се зачлените во група." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s се зачлени во групата %2$s" @@ -1809,15 +1809,11 @@ msgstr "%1$s се зачлени во групата %2$s" msgid "You must be logged in to leave a group." msgstr "Мора да сте најавени за да можете да ја напуштите групата." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Не членувате во таа група." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Не можам да ја пронајдам членската евиденција." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s ја напушти групата %2$s" @@ -1919,12 +1915,12 @@ msgstr "Овој образец служи за создавање нова гр msgid "New message" msgstr "Нова порака" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Не можете да испратите порака до овојо корисник." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Нема содржина!" @@ -1932,7 +1928,7 @@ msgstr "Нема содржина!" msgid "No recipient specified." msgstr "Нема назначено примач." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2085,29 +2081,24 @@ msgid "URL shortening service is too long (max 50 chars)." msgstr "Услугата за скратување на URL-адреси е предолга (највеќе до 50 знаци)." #: actions/otp.php:69 -#, fuzzy msgid "No user ID specified." -msgstr "Нема назначено група." +msgstr "Нема назначено кориснички ID." #: actions/otp.php:83 -#, fuzzy msgid "No login token specified." -msgstr "Нема назначено забелешка." +msgstr "Нема назначено најавен жетон." #: actions/otp.php:90 -#, fuzzy msgid "No login token requested." -msgstr "Во барањето нема id на профилот." +msgstr "Не е побаран најавен жетон." #: actions/otp.php:95 -#, fuzzy msgid "Invalid login token specified." -msgstr "Неважечки или истечен жетон." +msgstr "Назначен е неважечки најавен жетон." #: actions/otp.php:104 -#, fuzzy msgid "Login token expired." -msgstr "Најавете се" +msgstr "Најавниот жетон е истечен." #: actions/outbox.php:61 #, php-format @@ -4072,10 +4063,25 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "ВОлку голема податотека ќе ја надмине Вашата месечна квота од %d бајти" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Профил на група" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Не можев да ја подновам групата." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Профил на група" + #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" -msgstr "Не можам да создадам најавен жетон за %s." +msgstr "Не можам да создадам најавен жетон за" #: classes/Message.php:45 msgid "You are banned from sending direct messages." @@ -4089,27 +4095,27 @@ msgstr "Не можев да ја испратам пораката." msgid "Could not update message with new URI." msgstr "Не можев да ја подновам пораката со нов URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Грешка во базата на податоци при вметнувањето на хеш-ознака: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Проблем со зачувувањето на белешката. Премногу долго." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Проблем со зачувувањето на белешката. Непознат корисник." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Премногу забелњшки за прекратко време; здивнете малку и продолжете за " "неколку минути." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4117,25 +4123,25 @@ msgstr "" "Премногу дуплирани пораки во прекратко време; здивнете малку и продолжете за " "неколку минути." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Забрането Ви е да објавувате забелешки на оваа веб-страница." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Проблем во зачувувањето на белешката." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Одговор од внесот во базата: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добредојдовте на %1$s, @%2$s!" @@ -4177,9 +4183,9 @@ msgid "Other options" msgstr "Други нагодувања" #: lib/action.php:144 -#, fuzzy, php-format +#, php-format msgid "%1$s - %2$s" -msgstr "%1$s (%2$s)" +msgstr "%1$s - %2$s" #: lib/action.php:159 msgid "Untitled page" @@ -4436,18 +4442,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "Жалиме, оваа наредба сè уште не е имплементирана." #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" -msgstr "Не можев да пронајдам корисник со прекар %s." +msgstr "Не можев да пронајдам корисник со прекар %s" #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Нема баш логика да се подбуцнувате сами себеси." #: lib/command.php:99 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" -msgstr "Испратено подбуцнување на %s." +msgstr "Испратено подбуцнување на %s" #: lib/command.php:126 #, php-format @@ -4460,14 +4466,12 @@ msgstr "" "Претплатници: %2$s\n" "Забелешки: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 msgid "Notice with that id does not exist" -msgstr "Не постои забелешка со таков id." +msgstr "Не постои забелешка со таков id" -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 msgid "User has no last notice" msgstr "Корисникот нема последна забелешка" @@ -4476,181 +4480,175 @@ msgid "Notice marked as fave." msgstr "Забелешката е обележана како омилена." #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" -msgstr "Веќе членувате во таа група." +msgstr "Веќе членувате во таа група" -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, php-format msgid "Could not join user %s to group %s" -msgstr "Не можам да го зачленам корисникот %1$s во групата 2$s." +msgstr "Не можев да го зачленам корисникот %s во групата %s" -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" -msgstr "%1$s се зачлени во групата %2$s" +msgstr "%s се зачлени во групата %s" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, php-format msgid "Could not remove user %s to group %s" -msgstr "Не можев да го отстранам корисникот %1$s од групата %2$s." +msgstr "Не можев да го отстранам корисникот %s од групата %s" -#: lib/command.php:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" -msgstr "%1$s ја напушти групата %2$s" +msgstr "%s ја напушти групата %s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Име и презиме: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Локација: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Домашна страница: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "За: %s" -#: lib/command.php:358 -#, fuzzy, php-format +#: lib/command.php:349 +#, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -"Пораката е предолга - дозволени се највеќе %1$d знаци, а вие испративте %2$d." +"Пораката е предолга - дозволени се највеќе %d знаци, а вие испративте %d" -#: lib/command.php:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" -msgstr "Директната порака до %s е испратена." +msgstr "Директната порака до %s е испратена" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Грашка при испаќањето на директната порака." -#: lib/command.php:422 -#, fuzzy +#: lib/command.php:413 msgid "Cannot repeat your own notice" -msgstr "Не можете да ја повторувате сопствената забелешка." +msgstr "Не можете да повторувате сопствени забалешки" -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" -msgstr "Забелешката е веќе повторена." +msgstr "Оваа забелешка е веќе повторена" -#: lib/command.php:435 -#, fuzzy, php-format +#: lib/command.php:426 +#, php-format msgid "Notice from %s repeated" -msgstr "Забелешката од %s е повторена." +msgstr "Забелешката од %s е повторена" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Грешка при повторувањето на белешката." -#: lib/command.php:491 -#, fuzzy, php-format +#: lib/command.php:482 +#, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -"Забелешката е предолга - треба да нема повеќе од %1$d знаци, а Вие " -"испративте %2$d." +"Забелешката е предолга - треба да нема повеќе од %d знаци, а Вие испративте %" +"d" -#: lib/command.php:500 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Reply to %s sent" -msgstr "Одговорот на %s е испратен." +msgstr "Одговорот на %s е испратен" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Грешка при зачувувањето на белешката." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" -msgstr "Назначете го името на корисникот на којшто сакате да се претплатите." +msgstr "Назначете го името на корисникот на којшто сакате да се претплатите" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Претплатено на %s" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "Назначете го името на корисникот од кого откажувате претплата." -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Претплатата на %s е откажана" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Наредбата сè уште не е имплементирана." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Известувањето е исклучено." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Не можам да исклучам известување." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Известувањето е вклучено." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Не можам да вклучам известување." -#: lib/command.php:650 -#, fuzzy +#: lib/command.php:641 msgid "Login command is disabled" -msgstr "Наредбата за најава е оневозможена." +msgstr "Наредбата за најава е оневозможена" -#: lib/command.php:661 -#, fuzzy, php-format +#: lib/command.php:652 +#, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" -msgstr "Оваа врска може да се употреби само еднаш, и трае само 2 минути: %s." +msgstr "Оваа врска може да се употреби само еднаш, и трае само 2 минути: %s" -#: lib/command.php:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "Не сте претплатени никому." -#: lib/command.php:679 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Не ни го испративте тој профил." msgstr[1] "Не ни го испративте тој профил." -#: lib/command.php:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "Никој не е претплатен на Вас." -#: lib/command.php:701 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Оддалечена претплата" msgstr[1] "Оддалечена претплата" -#: lib/command.php:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "Не членувате во ниедна група." -#: lib/command.php:723 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "Не ни го испративте тој профил." msgstr[1] "Не ни го испративте тој профил." -#: lib/command.php:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4728,19 +4726,19 @@ msgstr "" "tracks - сè уште не е имплементирано.\n" "tracking - сè уште не е имплементирано.\n" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Нема пронајдено конфигурациска податотека. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "Побарав конфигурациони податотеки на следниве места: " -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "Препорачуваме да го пуштите инсталатерот за да го поправите ова." -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Оди на инсталаторот." @@ -4942,11 +4940,16 @@ msgstr "МБ" msgid "kB" msgstr "кб" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Непознат јазик „%s“" + #: lib/joinform.php:114 msgid "Join" msgstr "Придружи се" @@ -5338,19 +5341,23 @@ msgid "Attach a file" msgstr "Прикажи податотека" #: lib/noticeform.php:212 -#, fuzzy msgid "Share my location" msgstr "Споделете ја мојата локација." -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location" -msgstr "Не ја споделувај мојата локација." - #: lib/noticeform.php:215 +msgid "Do not share my location" +msgstr "Не ја прикажувај мојата локација" + +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "Сокриј го ова инфо" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5608,24 +5615,24 @@ msgstr "Веќе претплатено!" msgid "User has blocked you." msgstr "Корисникот Ве има блокирано." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Претплатата е неуспешна." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Не можев да прептлатам друг корисник на Вас." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Не сте претплатени!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Не можам да ја избришам самопретплатата." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Претплата не може да се избрише." @@ -5699,47 +5706,47 @@ msgstr "Порака" msgid "Moderate" msgstr "Модерирај" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "пред неколку секунди" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "пред една минута" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "пред %d минути" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "пред еден час" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "пред %d часа" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "пред еден ден" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "пред %d денови" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "пред еден месец" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "пред %d месеца" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "пред една година" diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po index 5ff0bfa916..5fe48460e4 100644 --- a/locale/nb/LC_MESSAGES/statusnet.po +++ b/locale/nb/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:27:35+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:46+0000\n" "Language-Team: Norwegian (bokmål)‬\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: no\n" "X-Message-Group: out-statusnet\n" @@ -43,10 +43,10 @@ msgstr "Ingen slik side" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Ingen slik bruker" @@ -393,7 +393,7 @@ msgstr "Du er allerede medlem av den gruppen." msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Klarte ikke å oppdatere bruker." @@ -403,7 +403,7 @@ msgstr "Klarte ikke å oppdatere bruker." msgid "You are not a member of this group." msgstr "Du er allerede logget inn!" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Klarte ikke å oppdatere bruker." @@ -701,7 +701,7 @@ msgstr "" #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 #, fuzzy msgid "No such group." msgstr "Klarte ikke å lagre profil." @@ -1673,7 +1673,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1714,7 +1714,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Send" @@ -1779,7 +1779,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -1788,15 +1788,11 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "" -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%1$s sin status på %2$s" @@ -1895,12 +1891,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "" @@ -1908,7 +1904,7 @@ msgstr "" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -3960,6 +3956,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Klarte ikke å lagre profil." + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Klarte ikke å oppdatere bruker." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Klarte ikke å lagre profil." + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -3977,49 +3988,49 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4348,12 +4359,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 +#: 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." @@ -4363,178 +4374,177 @@ msgid "Notice marked as fave." msgstr "" #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" msgstr "Du er allerede medlem av den gruppen." -#: lib/command.php:234 +#: lib/command.php:231 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "Klarte ikke å oppdatere bruker." -#: lib/command.php:239 +#: lib/command.php:236 #, fuzzy, php-format msgid "%s joined group %s" msgstr "%1$s sin status på %2$s" -#: lib/command.php:284 +#: lib/command.php:275 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "Klarte ikke å oppdatere bruker." -#: lib/command.php:289 +#: lib/command.php:280 #, fuzzy, php-format msgid "%s left group %s" msgstr "%1$s sin status på %2$s" -#: lib/command.php:318 +#: lib/command.php:309 #, fuzzy, php-format msgid "Fullname: %s" msgstr "Fullt navn" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, fuzzy, php-format msgid "Direct message to %s sent" msgstr "Direktemeldinger til %s" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Kan ikke slette notisen." -#: lib/command.php:427 +#: lib/command.php:418 #, fuzzy msgid "Already repeated that notice" msgstr "Kan ikke slette notisen." -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Nytt nick" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "" -#: lib/command.php:491 +#: lib/command.php:482 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Svar til %s" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "" -#: lib/command.php:556 +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Ikke autorisert." -#: lib/command.php:679 +#: lib/command.php:670 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:699 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Svar til %s" -#: lib/command.php:701 +#: lib/command.php:692 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:721 +#: lib/command.php:712 #, fuzzy msgid "You are not a member of any groups." msgstr "Du er allerede logget inn!" -#: lib/command.php:723 +#: lib/command.php:714 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:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4575,20 +4585,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "Fant ikke bekreftelseskode." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4793,11 +4803,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 #, fuzzy msgid "Join" @@ -5112,15 +5127,21 @@ msgstr "" msgid "Share my location" msgstr "Klarte ikke å lagre profil." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Klarte ikke å lagre profil." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5390,25 +5411,25 @@ msgstr "" msgid "User has blocked you." msgstr "" -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Alle abonnementer" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Klarte ikke å lagre avatar-informasjonen" -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "" @@ -5486,47 +5507,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "noen få sekunder siden" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "omtrent ett minutt siden" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "omtrent %d minutter siden" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "omtrent én time siden" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "omtrent %d timer siden" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "omtrent én dag siden" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "omtrent %d dager siden" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "omtrent én måned siden" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "omtrent %d måneder siden" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "omtrent ett år siden" diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po index 36906bde71..ade4434a53 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:27:46+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:52+0000\n" "Language-Team: Dutch\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: out-statusnet\n" @@ -45,10 +45,10 @@ msgstr "Deze pagina bestaat niet" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Onbekende gebruiker." @@ -397,7 +397,7 @@ msgstr "U bent al lid van die groep." 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." -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s." @@ -406,7 +406,7 @@ msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s." msgid "You are not a member of this group." msgstr "U bent geen lid van deze groep." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Het was niet mogelijk gebruiker %1$s uit de group %2$s te verwijderen." @@ -705,7 +705,7 @@ msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan." #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "De opgegeven groep bestaat niet." @@ -1696,7 +1696,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:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1744,7 +1744,7 @@ msgstr "Persoonlijk bericht" msgid "Optionally add a personal message to the invitation." msgstr "Persoonlijk bericht bij de uitnodiging (optioneel)." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Verzenden" @@ -1814,7 +1814,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "U moet aangemeld zijn om lid te worden van een groep." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s is lid geworden van de groep %2$s" @@ -1823,15 +1823,11 @@ 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:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "U bent geen lid van deze groep" -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Er is geen groepslidmaatschap aangetroffen." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s heeft de groep %2$s verlaten" @@ -1934,12 +1930,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:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 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:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Geen inhoud!" @@ -1947,7 +1943,7 @@ msgstr "Geen inhoud!" msgid "No recipient specified." msgstr "Er is geen ontvanger aangegeven." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 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." @@ -2098,29 +2094,24 @@ msgid "URL shortening service is too long (max 50 chars)." msgstr "De URL voor de verkortingdienst is te lang (maximaal 50 tekens)." #: actions/otp.php:69 -#, fuzzy msgid "No user ID specified." -msgstr "Er is geen groep aangegeven." +msgstr "Er is geen ID opgegeven." #: actions/otp.php:83 -#, fuzzy msgid "No login token specified." -msgstr "Er is geen mededeling opgegeven." +msgstr "Er is geen token opgegeven." #: actions/otp.php:90 -#, fuzzy msgid "No login token requested." -msgstr "Het profiel-ID was niet aanwezig in het verzoek." +msgstr "Er is niet om een aanmeldtoken gevraagd." #: actions/otp.php:95 -#, fuzzy msgid "Invalid login token specified." -msgstr "Het token is ongeldig of verlopen." +msgstr "Het opgegeven token is ongeldig." #: actions/otp.php:104 -#, fuzzy msgid "Login token expired." -msgstr "Aanmelden" +msgstr "Het aanmeldtoken is verlopen." #: actions/outbox.php:61 #, php-format @@ -4093,10 +4084,25 @@ msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" "Een bestand van deze grootte overschijdt uw maandelijkse quota van %d bytes." +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Groepsprofiel" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Het was niet mogelijk de groep bij te werken." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Groepsprofiel" + #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" -msgstr "Het was niet mogelijk een aanmeldtoken aan te maken voor %s." +msgstr "Het was niet mogelijk een aanmeldtoken aan te maken voor %s" #: classes/Message.php:45 msgid "You are banned from sending direct messages." @@ -4110,31 +4116,31 @@ msgstr "Het was niet mogelijk het bericht in te voegen." msgid "Could not update message with new URI." msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "" "Er is een probleem opgetreden bij het opslaan van de mededeling. Deze is te " "lang." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "" "Er was een probleem bij het opslaan van de mededeling. De gebruiker is " "onbekend." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "U hebt te snel te veel mededelingen verstuurd. Kom even op adem en probeer " "het over enige tijd weer." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4142,27 +4148,27 @@ msgstr "" "Te veel duplicaatberichten te snel achter elkaar. Neem een adempauze en " "plaats over een aantal minuten pas weer een bericht." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" "U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "" "Er is een databasefout opgetreden bij het invoegen van het antwoord: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Welkom bij %1$s, @%2$s!" @@ -4204,9 +4210,9 @@ msgid "Other options" msgstr "Overige instellingen" #: lib/action.php:144 -#, fuzzy, php-format +#, php-format msgid "%1$s - %2$s" -msgstr "%1$s (%2$s)" +msgstr "%1$s - %2$s" #: lib/action.php:159 msgid "Untitled page" @@ -4463,18 +4469,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "Dit commando is nog niet geïmplementeerd." #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" -msgstr "De gebruiker %s is niet aangetroffen." +msgstr "De gebruiker %s is niet aangetroffen" #: lib/command.php:92 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 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" -msgstr "De por naar %s is verzonden." +msgstr "De por naar %s is verzonden" #: lib/command.php:126 #, php-format @@ -4487,201 +4493,193 @@ msgstr "" "Abonnees: %2$s\n" "Mededelingen: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy +#: 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." +msgstr "Er bestaat geen mededeling met dat ID" -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: 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." +msgstr "Deze gebruiker heeft geen laatste mededeling" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "De mededeling is op de favorietenlijst geplaatst." #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" -msgstr "U bent al lid van die groep." +msgstr "U bent al lid van deze groep" -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, php-format msgid "Could not join user %s to group %s" -msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s." +msgstr "Het was niet mogelijk om de gebruiker %s toe te voegen aan de groep %s" -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" -msgstr "%1$s is lid geworden van de groep %2$s" +msgstr "%s is lid geworden van de groep %s" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, php-format msgid "Could not remove user %s to group %s" -msgstr "De gebruiker %1$s kon niet uit de groep %2$s verwijderd worden." +msgstr "De gebruiker %s kon niet uit de groep %s verwijderd worden" -#: lib/command.php:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" -msgstr "%1$s heeft de groep %2$s verlaten" +msgstr "%s heeft de groep %s verlaten" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Volledige naam: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Locatie: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Thuispagina: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Over: %s" -#: lib/command.php:358 -#, fuzzy, php-format +#: lib/command.php:349 +#, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -"Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van uw " -"bericht was %2$d." +"Het bericht te is lang. De maximale lengte is %d tekens. De lengte van uw " +"bericht was %d" -#: lib/command.php:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" -msgstr "Het directe bericht aan %s is verzonden." +msgstr "Het directe bericht aan %s is verzonden" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Er is een fout opgetreden bij het verzonden van het directe bericht." -#: lib/command.php:422 -#, fuzzy +#: lib/command.php:413 msgid "Cannot repeat your own notice" -msgstr "U kunt uw eigen mededeling niet herhalen." +msgstr "U kunt uw eigen mededelingen niet herhalen." -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" msgstr "U hebt die mededeling al herhaald." -#: lib/command.php:435 -#, fuzzy, php-format +#: lib/command.php:426 +#, php-format msgid "Notice from %s repeated" -msgstr "De mededeling van %s is herhaald." +msgstr "De mededeling van %s is herhaald" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Er is een fout opgetreden bij het herhalen van de mededeling." -#: lib/command.php:491 -#, fuzzy, php-format +#: lib/command.php:482 +#, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -"De mededeling is te lang. De maximale lengte is %1$d tekens. Uw mededeling " -"bevatte %2$d tekens." +"De mededeling is te lang. De maximale lengte is %d tekens. Uw mededeling " +"bevatte %d tekens" -#: lib/command.php:500 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Reply to %s sent" -msgstr "Het antwoord aan %s is verzonden." +msgstr "Het antwoord aan %s is verzonden" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Er is een fout opgetreden bij het opslaan van de mededeling." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" -msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren." +msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Geabonneerd op %s" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "" -"Geef de naam op van de gebruiker waarvoor u het abonnement wilt opzeggen." +"Geef de naam op van de gebruiker waarvoor u het abonnement wilt opzeggen" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Uw abonnement op %s is opgezegd" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Dit commando is nog niet geïmplementeerd." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notificaties uitgeschakeld." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Het is niet mogelijk de mededelingen uit te schakelen." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notificaties ingeschakeld." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Het is niet mogelijk de notificatie uit te schakelen." -#: lib/command.php:650 -#, fuzzy +#: lib/command.php:641 msgid "Login command is disabled" -msgstr "Het aanmeldcommando is uitgeschakeld." +msgstr "Het aanmeldcommando is uitgeschakeld" -#: lib/command.php:661 -#, fuzzy, php-format +#: lib/command.php:652 +#, 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." +"geldig: %s" -#: lib/command.php:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "U bent op geen enkele gebruiker geabonneerd." -#: lib/command.php:679 +#: lib/command.php:670 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:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "Niemand heeft een abonnenment op u." -#: lib/command.php:701 +#: lib/command.php:692 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:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "U bent lid van geen enkele groep." -#: lib/command.php:723 +#: lib/command.php:714 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:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4761,20 +4759,20 @@ msgstr "" "tracks - nog niet beschikbaar\n" "tracking - nog niet beschikbaar\n" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Er is geen instellingenbestand aangetroffen. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen: " -#: lib/common.php:201 +#: lib/common.php:134 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:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Naar het installatieprogramma gaan." @@ -4976,11 +4974,16 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "De taal \"%s\" is niet bekend." + #: lib/joinform.php:114 msgid "Join" msgstr "Toetreden" @@ -5371,19 +5374,23 @@ msgid "Attach a file" msgstr "Bestand toevoegen" #: lib/noticeform.php:212 -#, fuzzy msgid "Share my location" -msgstr "Mijn locatie bekend maken." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location" -msgstr "Mijn locatie niet bekend maken." +msgstr "Mijn locatie bekend maken" #: lib/noticeform.php:215 +msgid "Do not share my location" +msgstr "Mijn locatie niet bekend maken" + +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "Deze informatie verbergen" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5642,23 +5649,23 @@ msgstr "U bent al gebonneerd!" msgid "User has blocked you." msgstr "Deze gebruiker negeert u." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Kan niet abonneren " -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Het was niet mogelijk om een ander op u te laten abonneren" -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Niet geabonneerd!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Het was niet mogelijk het abonnement op uzelf te verwijderen." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Kon abonnement niet verwijderen." @@ -5732,47 +5739,47 @@ msgstr "Bericht" msgid "Moderate" msgstr "Modereren" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "een paar seconden geleden" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "ongeveer een minuut geleden" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "ongeveer %d minuten geleden" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "ongeveer een uur geleden" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "ongeveer %d uur geleden" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "ongeveer een dag geleden" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "ongeveer %d dagen geleden" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "ongeveer een maand geleden" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "ongeveer %d maanden geleden" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "ongeveer een jaar geleden" diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po index 383493bbf7..5bba0e8b01 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:27:39+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:49+0000\n" "Language-Team: Norwegian Nynorsk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nn\n" "X-Message-Group: out-statusnet\n" @@ -43,10 +43,10 @@ msgstr "Dette emneord finst ikkje." #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Brukaren finst ikkje." @@ -389,7 +389,7 @@ msgstr "Du er allereie medlem av den gruppa" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s" @@ -399,7 +399,7 @@ msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s" msgid "You are not a member of this group." msgstr "Du er ikkje medlem av den gruppa." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Kunne ikkje fjerne %s fra %s gruppa " @@ -697,7 +697,7 @@ msgstr "Lagring av informasjon feila." #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "Denne gruppa finst ikkje." @@ -1701,7 +1701,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:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1747,7 +1747,7 @@ msgstr "Personleg melding" msgid "Optionally add a personal message to the invitation." msgstr "Eventuelt legg til ei personleg melding til invitasjonen." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Send" @@ -1812,7 +1812,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Du må være logga inn for å bli med i ei gruppe." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s blei medlem av gruppe %s" @@ -1821,15 +1821,11 @@ 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:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Du er ikkje medlem av den gruppa." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Kan ikkje finne brukar." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s forlot %s gruppa" @@ -1932,12 +1928,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:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 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:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Ingen innhald." @@ -1945,7 +1941,7 @@ msgstr "Ingen innhald." msgid "No recipient specified." msgstr "Ingen mottakar spesifisert." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -4058,6 +4054,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Gruppe profil" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Kann ikkje oppdatera gruppa." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Gruppe profil" + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -4076,27 +4087,27 @@ msgstr "Kunne ikkje lagre melding." msgid "Could not update message with new URI." msgstr "Kunne ikkje oppdatere melding med ny URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Feil ved lagring av notis. Ukjend brukar." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt." -#: classes/Notice.php:241 +#: classes/Notice.php:240 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " @@ -4104,25 +4115,25 @@ msgid "" msgstr "" "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Du kan ikkje lengre legge inn notisar på denne sida." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Eit problem oppstod ved lagring av notis." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Databasefeil, kan ikkje lagra svar: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Melding til %1$s på %2$s" @@ -4460,14 +4471,13 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: 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" @@ -4476,182 +4486,179 @@ msgid "Notice marked as fave." msgstr "Notis markert som favoritt." #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" msgstr "Du er allereie medlem av den gruppa" -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, php-format msgid "Could not join user %s to group %s" msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s" -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%s blei medlem av gruppe %s" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, php-format msgid "Could not remove user %s to group %s" msgstr "Kunne ikkje fjerne %s fra %s gruppa " -#: lib/command.php:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%s forlot %s gruppa" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Fullt namn: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Stad: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Heimeside: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Om: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, 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:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "Direkte melding til %s sendt" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Ein feil oppstod ved sending av direkte melding." -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Kan ikkje slå på notifikasjon." -#: lib/command.php:427 +#: lib/command.php:418 #, fuzzy msgid "Already repeated that notice" msgstr "Slett denne notisen" -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Melding lagra" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Eit problem oppstod ved lagring av notis." -#: lib/command.php:491 +#: lib/command.php:482 #, 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:500 +#: lib/command.php:491 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Svar på denne notisen" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "Eit problem oppstod ved lagring av notis." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "Spesifer namnet til brukaren du vil tinge" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Tingar %s" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "Spesifer namnet til brukar du vil fjerne tinging på" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Tingar ikkje %s lengre" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Kommando ikkje implementert." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notifikasjon av." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Kan ikkje skru av notifikasjon." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notifikasjon på." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Kan ikkje slå på notifikasjon." -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Du tingar ikkje oppdateringar til den profilen." -#: lib/command.php:679 +#: lib/command.php:670 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:699 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Kan ikkje tinga andre til deg." -#: lib/command.php:701 +#: lib/command.php:692 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:721 +#: lib/command.php:712 #, fuzzy msgid "You are not a member of any groups." msgstr "Du er ikkje medlem av den gruppa." -#: lib/command.php:723 +#: lib/command.php:714 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:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4692,20 +4699,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "Ingen stadfestingskode." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 #, fuzzy msgid "Go to the installer." msgstr "Logg inn or sida" @@ -4909,11 +4916,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "Bli med" @@ -5232,15 +5244,21 @@ msgstr "" msgid "Share my location" msgstr "Kan ikkje lagra merkelapp." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Kan ikkje lagra merkelapp." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5515,25 +5533,25 @@ msgstr "" msgid "User has blocked you." msgstr "Brukar har blokkert deg." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Kan ikkje tinga." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Kan ikkje tinga andre til deg." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Ikkje tinga." -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Kan ikkje sletta tinging." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Kan ikkje sletta tinging." @@ -5611,47 +5629,47 @@ msgstr "Melding" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "eit par sekund sidan" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "omtrent eitt minutt sidan" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "~%d minutt sidan" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "omtrent ein time sidan" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "~%d timar sidan" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "omtrent ein dag sidan" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "~%d dagar sidan" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "omtrent ein månad sidan" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "~%d månadar sidan" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "omtrent eitt år sidan" diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po index d06e4a1192..9e8414dc19 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:27:54+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:55+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.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pl\n" "X-Message-Group: out-statusnet\n" @@ -48,10 +48,10 @@ msgstr "Nie ma takiej strony" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Brak takiego użytkownika." @@ -394,7 +394,7 @@ msgstr "Jesteś już członkiem tej grupy." msgid "You have been blocked from that group by the admin." msgstr "Zostałeś zablokowany w tej grupie przez administratora." -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s." @@ -403,7 +403,7 @@ msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s." msgid "You are not a member of this group." msgstr "Nie jesteś członkiem tej grupy." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s." @@ -696,7 +696,7 @@ msgstr "Zapisanie informacji o blokadzie nie powiodło się." #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "Nie ma takiej grupy." @@ -1670,7 +1670,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:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1716,7 +1716,7 @@ msgstr "Osobista wiadomość" msgid "Optionally add a personal message to the invitation." msgstr "Opcjonalnie dodaj osobistą wiadomość do zaproszenia." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Wyślij" @@ -1786,7 +1786,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Musisz być zalogowany, aby dołączyć do grupy." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "Użytkownik %1$s dołączył do grupy %2$s" @@ -1795,15 +1795,11 @@ 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:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Nie jesteś członkiem tej grupy." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Nie można odnaleźć wpisu członkostwa." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, php-format msgid "%1$s left group %2$s" msgstr "Użytkownik %1$s opuścił grupę %2$s" @@ -1906,12 +1902,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:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 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:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Brak zawartości." @@ -1919,7 +1915,7 @@ msgstr "Brak zawartości." msgid "No recipient specified." msgstr "Nie podano odbiorcy." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 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." @@ -2070,29 +2066,24 @@ msgid "URL shortening service is too long (max 50 chars)." msgstr "Adres URL usługi skracania jest za długi (maksymalnie 50 znaków)." #: actions/otp.php:69 -#, fuzzy msgid "No user ID specified." -msgstr "Nie podano grupy." +msgstr "Nie podano identyfikatora użytkownika." #: actions/otp.php:83 -#, fuzzy msgid "No login token specified." -msgstr "Nie podano wpisu." +msgstr "Nie podano tokenu logowania." #: actions/otp.php:90 -#, fuzzy msgid "No login token requested." -msgstr "Brak identyfikatora profilu w żądaniu." +msgstr "Nie zażądano tokenu logowania." #: actions/otp.php:95 -#, fuzzy msgid "Invalid login token specified." -msgstr "Nieprawidłowy lub wygasły token." +msgstr "Podano nieprawidłowy token logowania." #: actions/otp.php:104 -#, fuzzy msgid "Login token expired." -msgstr "Zaloguj się na stronie" +msgstr "Token logowania wygasł." #: actions/outbox.php:61 #, php-format @@ -4047,10 +4038,25 @@ msgstr "" "Plik tej wielkości przekroczyłby miesięczny przydział użytkownika wynoszący %" "d bajty." +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Profil grupy" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Nie można zaktualizować grupy." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Profil grupy" + #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" -msgstr "Nie można utworzyć tokenów loginów dla %s." +msgstr "Nie można utworzyć tokenów loginów dla %s" #: classes/Message.php:45 msgid "You are banned from sending direct messages." @@ -4064,27 +4070,27 @@ msgstr "Nie można wprowadzić wiadomości." msgid "Could not update message with new URI." msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Błąd bazy danych podczas wprowadzania znacznika mieszania: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Problem podczas zapisywania wpisu. Za długi." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Za dużo wpisów w za krótkim czasie, weź głęboki oddech i wyślij ponownie za " "kilka minut." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4092,25 +4098,25 @@ msgstr "" "Za dużo takich samych wiadomości w za krótkim czasie, weź głęboki oddech i " "wyślij ponownie za kilka minut." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Zabroniono ci wysyłania wpisów na tej stronie." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problem podczas zapisywania wpisu." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Witaj w %1$s, @%2$s." @@ -4152,9 +4158,9 @@ msgid "Other options" msgstr "Inne opcje" #: lib/action.php:144 -#, fuzzy, php-format +#, php-format msgid "%1$s - %2$s" -msgstr "%1$s (%2$s)" +msgstr "%1$s - %2$s" #: lib/action.php:159 msgid "Untitled page" @@ -4411,7 +4417,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "Te polecenie nie zostało jeszcze zaimplementowane." #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" msgstr "Nie można odnaleźć użytkownika z pseudonimem %s." @@ -4420,7 +4426,7 @@ 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 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" msgstr "Wysłano szturchnięcie do użytkownika %s." @@ -4435,14 +4441,12 @@ msgstr "" "Subskrybenci: %2$s\n" "Wpisy: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy +#: 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:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: 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." @@ -4451,183 +4455,177 @@ msgid "Notice marked as fave." msgstr "Zaznaczono wpis jako ulubiony." #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" msgstr "Jesteś już członkiem tej grupy." -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, 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:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "Użytkownik %1$s dołączył do grupy %2$s" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, 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:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "Użytkownik %1$s opuścił grupę %2$s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Imię i nazwisko: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Położenie: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Strona domowa: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "O mnie: %s" -#: lib/command.php:358 -#, fuzzy, php-format +#: lib/command.php:349 +#, 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:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s." -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Błąd podczas wysyłania bezpośredniej wiadomości." -#: lib/command.php:422 -#, fuzzy +#: lib/command.php:413 msgid "Cannot repeat your own notice" -msgstr "Nie można powtórzyć własnego wpisu." +msgstr "Nie można powtórzyć własnego wpisu" -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" -msgstr "Już powtórzono ten wpis." +msgstr "Już powtórzono ten wpis" -#: lib/command.php:435 -#, fuzzy, php-format +#: lib/command.php:426 +#, php-format msgid "Notice from %s repeated" -msgstr "Powtórzono wpis od użytkownika %s." +msgstr "Powtórzono wpis od użytkownika %s" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Błąd podczas powtarzania wpisu." -#: lib/command.php:491 -#, fuzzy, php-format +#: lib/command.php:482 +#, 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:500 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Reply to %s sent" msgstr "Wysłano odpowiedź do %s." -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Błąd podczas zapisywania wpisu." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "Podaj nazwę użytkownika do subskrybowania." -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Subskrybowano użytkownika %s" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji." -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Usunięto subskrypcję użytkownika %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Nie zaimplementowano polecenia." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Wyłączono powiadomienia." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Nie można wyłączyć powiadomień." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Włączono powiadomienia." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Nie można włączyć powiadomień." -#: lib/command.php:650 -#, fuzzy +#: lib/command.php:641 msgid "Login command is disabled" -msgstr "Polecenie logowania jest wyłączone." +msgstr "Polecenie logowania jest wyłączone" -#: lib/command.php:661 -#, fuzzy, php-format +#: lib/command.php:652 +#, 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:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "Nie subskrybujesz nikogo." -#: lib/command.php:679 +#: lib/command.php:670 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:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "Nikt cię nie subskrybuje." -#: lib/command.php:701 +#: lib/command.php:692 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:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "Nie jesteś członkiem żadnej grupy." -#: lib/command.php:723 +#: lib/command.php:714 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:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4707,19 +4705,19 @@ msgstr "" "tracks - jeszcze nie zaimplementowano\n" "tracking - jeszcze nie zaimplementowano\n" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Nie odnaleziono pliku konfiguracji." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "Szukano plików konfiguracji w następujących miejscach: " -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "Należy uruchomić instalator, aby to naprawić." -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Przejdź do instalatora." @@ -4921,11 +4919,16 @@ msgstr "MB" msgid "kB" msgstr "KB" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Nieznany język \"%s\"." + #: lib/joinform.php:114 msgid "Join" msgstr "Dołącz" @@ -5311,19 +5314,23 @@ msgid "Attach a file" msgstr "Załącz plik" #: lib/noticeform.php:212 -#, fuzzy msgid "Share my location" -msgstr "Ujawnij położenie." - -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location" -msgstr "Nie ujawniaj położenia." +msgstr "Ujawnij położenie" #: lib/noticeform.php:215 +msgid "Do not share my location" +msgstr "Nie ujawniaj położenia" + +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "Ukryj tę informację" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5581,23 +5588,23 @@ msgstr "Już subskrybowane." msgid "User has blocked you." msgstr "Użytkownik zablokował cię." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Nie można subskrybować." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Nie można subskrybować innych do ciebie." -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Niesubskrybowane." -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Nie można usunąć autosubskrypcji." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Nie można usunąć subskrypcji." @@ -5671,47 +5678,47 @@ msgstr "Wiadomość" msgid "Moderate" msgstr "Moderuj" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "kilka sekund temu" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "około minutę temu" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "około %d minut temu" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "około godzinę temu" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "około %d godzin temu" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "blisko dzień temu" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "około %d dni temu" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "około miesiąc temu" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "około %d miesięcy temu" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "około rok temu" diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po index 0c8f086ba6..f635266d10 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:27:59+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:05:58+0000\n" "Language-Team: Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt\n" "X-Message-Group: out-statusnet\n" @@ -44,10 +44,10 @@ msgstr "Página não encontrada." #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Utilizador não encontrado." @@ -387,7 +387,7 @@ msgstr "Já é membro desse grupo." msgid "You have been blocked from that group by the admin." msgstr "Foi bloqueado desse grupo pelo gestor." -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Não foi possível adicionar %1$s ao grupo %2$s." @@ -396,7 +396,7 @@ msgstr "Não foi possível adicionar %1$s ao grupo %2$s." msgid "You are not a member of this group." msgstr "Não é membro deste grupo." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Não foi possível remover %1$s do grupo %2$s." @@ -689,7 +689,7 @@ msgstr "Não foi possível gravar informação do bloqueio." #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "Grupo não foi encontrado." @@ -1674,7 +1674,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:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1719,7 +1719,7 @@ msgstr "Mensagem pessoal" msgid "Optionally add a personal message to the invitation." msgstr "Pode optar por acrescentar uma mensagem pessoal ao convite" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Enviar" @@ -1788,7 +1788,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Precisa de iniciar uma sessão para se juntar a um grupo." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s juntou-se ao grupo %2$s" @@ -1797,15 +1797,11 @@ 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:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Não é um membro desse grupo." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Não foi encontrado um registo de membro de grupo." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s deixou o grupo %2$s" @@ -1908,12 +1904,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:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 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:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Sem conteúdo!" @@ -1921,7 +1917,7 @@ msgstr "Sem conteúdo!" msgid "No recipient specified." msgstr "Não especificou um destinatário." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 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." @@ -4047,10 +4043,25 @@ msgstr "" 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." +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Perfil do grupo" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Não foi possível actualizar o grupo." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Perfil do grupo" + #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" -msgstr "Não foi possível criar a chave de entrada para %s." +msgstr "Não foi possível criar a chave de entrada para %s" #: classes/Message.php:45 msgid "You are banned from sending direct messages." @@ -4064,27 +4075,27 @@ msgstr "Não foi possível inserir a mensagem." msgid "Could not update message with new URI." msgstr "Não foi possível actualizar a mensagem com a nova URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Erro na base de dados ao inserir a marca: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Problema na gravação da nota. Demasiado longa." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Problema na gravação da nota. Utilizador desconhecido." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Demasiadas notas, demasiado rápido; descanse e volte a publicar daqui a " "alguns minutos." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4092,25 +4103,25 @@ msgstr "" "Demasiadas mensagens duplicadas, demasiado rápido; descanse e volte a " "publicar daqui a alguns minutos." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Está proibido de publicar notas neste site." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problema na gravação da nota." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%1$s dá-lhe as boas-vindas, @%2$s!" @@ -4411,18 +4422,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "Desculpe, este comando ainda não foi implementado." #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" -msgstr "Não foi encontrado um utilizador com a alcunha %s." +msgstr "Não foi encontrado um utilizador com a alcunha %s" #: lib/command.php:92 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 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" -msgstr "Toque enviado para %s." +msgstr "Cotovelada enviada a %s" #: lib/command.php:126 #, php-format @@ -4435,196 +4446,188 @@ msgstr "" "Subscritores: %2$s\n" "Notas: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy +#: 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." +msgstr "Não existe nenhuma nota com essa identificação" -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: 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." +msgstr "Utilizador não tem nenhuma última nota" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Nota marcada como favorita." #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" -msgstr "Já é membro desse grupo." +msgstr "Já é membro desse grupo" -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, php-format msgid "Could not join user %s to group %s" -msgstr "Não foi possível adicionar %1$s ao grupo %2$s." +msgstr "Não foi possível juntar o utilizador %s ao grupo %s" -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" -msgstr "%1$s juntou-se ao grupo %2$s" +msgstr "%s juntou-se ao grupo %s" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, php-format msgid "Could not remove user %s to group %s" -msgstr "Não foi possível remover o utilizador %1$s do grupo %2$s." +msgstr "Não foi possível remover o utilizador %s do grupo %s" -#: lib/command.php:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" -msgstr "%1$s deixou o grupo %2$s" +msgstr "%s deixou o grupo %s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Localidade: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Página pessoal: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:358 -#, fuzzy, php-format +#: lib/command.php:349 +#, php-format msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d." +msgstr "Mensagem demasiado extensa - máx. %d caracteres, enviou %d" -#: lib/command.php:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" -msgstr "Mensagem directa para %s foi enviada." +msgstr "Mensagem directa para %s enviada" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Erro no envio da mensagem directa." -#: lib/command.php:422 -#, fuzzy +#: lib/command.php:413 msgid "Cannot repeat your own notice" -msgstr "Não pode repetir a sua própria nota." +msgstr "Não pode repetir a sua própria nota" -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" -msgstr "Já repetiu essa nota." +msgstr "Já repetiu essa nota" -#: lib/command.php:435 -#, fuzzy, php-format +#: lib/command.php:426 +#, php-format msgid "Notice from %s repeated" -msgstr "Nota de %s repetida." +msgstr "Nota de %s repetida" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Erro ao repetir nota." -#: lib/command.php:491 -#, fuzzy, php-format +#: lib/command.php:482 +#, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "Nota demasiado extensa - máx. %1$d caracteres, enviou %2$d." +msgstr "Nota demasiado extensa - máx. %d caracteres, enviou %d" -#: lib/command.php:500 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Reply to %s sent" -msgstr "Resposta a %s enviada." +msgstr "Resposta a %s enviada" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Erro ao gravar nota." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" -msgstr "Introduza o nome do utilizador para subscrever." +msgstr "Introduza o nome do utilizador para subscrever" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Subscreveu %s" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" -msgstr "Introduza o nome do utilizador para deixar de subscrever." +msgstr "Introduza o nome do utilizador para deixar de subscrever" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Deixou de subscrever %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Comando ainda não implementado." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notificação desligada." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Não foi possível desligar a notificação." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notificação ligada." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Não foi possível ligar a notificação." -#: lib/command.php:650 -#, fuzzy +#: lib/command.php:641 msgid "Login command is disabled" -msgstr "Comando para iniciar sessão foi desactivado." +msgstr "Comando para iniciar sessão foi desactivado" -#: lib/command.php:661 -#, fuzzy, php-format +#: lib/command.php:652 +#, 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." +"s" -#: lib/command.php:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "Não subscreveu ninguém." -#: lib/command.php:679 +#: lib/command.php:670 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:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "Ninguém subscreve as suas notas." -#: lib/command.php:701 +#: lib/command.php:692 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:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "Não está em nenhum grupo." -#: lib/command.php:723 +#: lib/command.php:714 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:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4702,19 +4705,19 @@ msgstr "" "tracks - ainda não implementado.\n" "tracking - ainda não implementado.\n" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Ficheiro de configuração não encontrado. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "Procurei ficheiros de configuração nos seguintes sítios: " -#: lib/common.php:201 +#: lib/common.php:134 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:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Ir para o instalador." @@ -4915,11 +4918,16 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Língua desconhecida \"%s\"." + #: lib/joinform.php:114 msgid "Join" msgstr "Juntar-me" @@ -5307,19 +5315,24 @@ msgid "Attach a file" msgstr "Anexar um ficheiro" #: lib/noticeform.php:212 -#, fuzzy msgid "Share my location" msgstr "Partilhar a minha localização." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Não partilhar a minha localização." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "Ocultar esta informação" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5577,23 +5590,23 @@ msgstr "Já subscrito!" msgid "User has blocked you." msgstr "O utilizador bloqueou-o." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Não foi possível subscrever." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Não foi possível que outro o subscrevesse." -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Não subscrito!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Não foi possível apagar a auto-subscrição." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Não foi possível apagar a subscrição." @@ -5667,47 +5680,47 @@ msgstr "Mensagem" msgid "Moderate" msgstr "Moderar" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "há alguns segundos" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "há cerca de um minuto" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "há cerca de %d minutos" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "há cerca de uma hora" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "há cerca de %d horas" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "há cerca de um dia" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "há cerca de %d dias" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "há cerca de um mês" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "há cerca de %d meses" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "há cerca de um ano" diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po index c608b3ba5d..cd0bdedd70 100644 --- a/locale/pt_BR/LC_MESSAGES/statusnet.po +++ b/locale/pt_BR/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:28:03+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:06:02+0000\n" "Language-Team: Brazilian Portuguese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: pt-br\n" "X-Message-Group: out-statusnet\n" @@ -45,10 +45,10 @@ msgstr "Esta página não existe." #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Este usuário não existe." @@ -396,7 +396,7 @@ msgstr "Você já é membro desse grupo." msgid "You have been blocked from that group by the admin." msgstr "O administrador desse grupo bloqueou sua inscrição." -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Não foi possível associar o usuário %s ao grupo %s." @@ -405,7 +405,7 @@ msgstr "Não foi possível associar o usuário %s ao grupo %s." msgid "You are not a member of this group." msgstr "Você não é membro deste grupo." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Não foi possível remover o usuário %s do grupo %s." @@ -701,7 +701,7 @@ msgstr "Não foi possível salvar a informação de bloqueio." #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "Esse grupo não existe." @@ -1695,7 +1695,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:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1740,7 +1740,7 @@ msgstr "Mensagem pessoal" msgid "Optionally add a personal message to the invitation." msgstr "Você pode, opcionalmente, adicionar uma mensagem pessoal ao convite." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Enviar" @@ -1810,7 +1810,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Você deve estar autenticado para se associar a um grupo." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s associou-se ao grupo %s" @@ -1819,15 +1819,11 @@ msgstr "%s associou-se ao grupo %s" msgid "You must be logged in to leave a group." msgstr "Você deve estar autenticado para sair de um grupo." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Você não é um membro desse grupo." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Não foi possível encontrar o registro do membro." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s deixou o grupo %s" @@ -1933,12 +1929,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:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 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:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Nenhum conteúdo!" @@ -1946,7 +1942,7 @@ msgstr "Nenhum conteúdo!" msgid "No recipient specified." msgstr "Não foi especificado nenhum destinatário." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -4075,8 +4071,23 @@ msgstr "Um arquivo deste tamanho excederá a sua conta de %d bytes." 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." +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Perfil do grupo" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Não foi possível atualizar o grupo." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Perfil do grupo" + #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" msgstr "Não foi possível criar o token de autenticação para %s" @@ -4092,27 +4103,27 @@ msgstr "Não foi possível inserir a mensagem." msgid "Could not update message with new URI." msgstr "Não foi possível atualizar a mensagem com a nova URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Erro no banco de dados durante a inserção da hashtag: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Problema no salvamento da mensagem. Ela é muito extensa." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Problema no salvamento da mensagem. Usuário desconhecido." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Muitas mensagens em um período curto de tempo; dê uma respirada e publique " "novamente daqui a alguns minutos." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4120,25 +4131,25 @@ msgstr "" "Muitas mensagens duplicadas em um período curto de tempo; dê uma respirada e " "publique novamente daqui a alguns minutos." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Você está proibido de publicar mensagens neste site." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problema no salvamento da mensagem." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Erro no banco de dados na inserção da reposta: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Bem vindo(a) a %1$s, @%2$s!" @@ -4442,7 +4453,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "Desculpe, mas esse comando ainda não foi implementado." #: lib/command.php:88 -#, fuzzy, php-format +#, 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" @@ -4451,7 +4462,7 @@ 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 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" msgstr "Foi enviada a chamada de atenção para %s" @@ -4466,14 +4477,12 @@ msgstr "" "Assinantes: %2$s\n" "Mensagens: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy +#: 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:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: 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\"" @@ -4482,182 +4491,176 @@ msgid "Notice marked as fave." msgstr "Mensagem marcada como favorita." #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" -msgstr "Você já é membro desse grupo." +msgstr "Você já é um membro desse grupo." -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, 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." +msgstr "Não foi possível associar o usuário %s ao grupo %s" -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%s associou-se ao grupo %s" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, 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:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%s deixou o grupo %s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Nome completo: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Localização: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Site: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Sobre: %s" -#: lib/command.php:358 -#, fuzzy, php-format +#: lib/command.php:349 +#, 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:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "A mensagem direta para %s foi enviada" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Ocorreu um erro durante o envio da mensagem direta." -#: lib/command.php:422 -#, fuzzy +#: lib/command.php:413 msgid "Cannot repeat your own notice" -msgstr "Você não pode repetria sua própria mensagem." +msgstr "Você não pode repetir sua própria mensagem" -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" -msgstr "Você já repetiu essa mensagem." +msgstr "Você já repetiu essa mensagem" -#: lib/command.php:435 -#, fuzzy, php-format +#: lib/command.php:426 +#, php-format msgid "Notice from %s repeated" msgstr "Mensagem de %s repetida" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Erro na repetição da mensagem." -#: lib/command.php:491 -#, fuzzy, php-format +#: lib/command.php:482 +#, 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:500 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Reply to %s sent" msgstr "A resposta a %s foi enviada" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Erro no salvamento da mensagem." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "Especifique o nome do usuário que será assinado" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Efetuada a assinatura de %s" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "Especifique o nome do usuário cuja assinatura será cancelada" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Cancelada a assinatura de %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "O comando não foi implementado ainda." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notificação desligada." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Não é possível desligar a notificação." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notificação ligada." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Não é possível ligar a notificação." -#: lib/command.php:650 -#, fuzzy +#: lib/command.php:641 msgid "Login command is disabled" msgstr "O comando para autenticação está desabilitado" -#: lib/command.php:661 -#, fuzzy, php-format +#: lib/command.php:652 +#, 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:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "Você não está assinando ninguém." -#: lib/command.php:679 +#: lib/command.php:670 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:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "Ninguém o assinou ainda." -#: lib/command.php:701 +#: lib/command.php:692 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:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "Você não é membro de nenhum grupo." -#: lib/command.php:723 +#: lib/command.php:714 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:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4736,19 +4739,19 @@ msgstr "" "tracks - não implementado ainda\n" "tracking - não implementado ainda\n" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Não foi encontrado nenhum arquivo de configuração. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "Eu procurei pelos arquivos de configuração nos seguintes lugares: " -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "Você pode querer executar o instalador para corrigir isto." -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Ir para o instalador." @@ -4950,11 +4953,16 @@ msgstr "Mb" msgid "kB" msgstr "Kb" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Idioma desconhecido \"%s\"" + #: lib/joinform.php:114 msgid "Join" msgstr "Entrar" @@ -5351,15 +5359,21 @@ msgstr "Anexar um arquivo" msgid "Share my location" msgstr "Indique a sua localização" -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Indique a sua localização" -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5618,23 +5632,23 @@ msgstr "Já assinado!" msgid "User has blocked you." msgstr "O usuário bloqueou você." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Não foi possível assinar." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Não foi possível fazer com que outros o assinem." -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Não assinado!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Não foi possível excluir a auto-assinatura." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Não foi possível excluir a assinatura." @@ -5708,47 +5722,47 @@ msgstr "Mensagem" msgid "Moderate" msgstr "Moderar" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "alguns segundos atrás" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "cerca de 1 minuto atrás" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "cerca de %d minutos atrás" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "cerca de 1 hora atrás" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "cerca de %d horas atrás" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "cerca de 1 dia atrás" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "cerca de %d dias atrás" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "cerca de 1 mês atrás" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "cerca de %d meses atrás" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "cerca de 1 ano atrás" diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po index 574ae66a2c..f727147b96 100644 --- a/locale/ru/LC_MESSAGES/statusnet.po +++ b/locale/ru/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:28:10+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:06:06+0000\n" "Language-Team: Russian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ru\n" "X-Message-Group: out-statusnet\n" @@ -46,10 +46,10 @@ msgstr "Нет такой страницы" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Нет такого пользователя." @@ -393,7 +393,7 @@ msgstr "Вы уже являетесь членом этой группы." msgid "You have been blocked from that group by the admin." msgstr "Вы заблокированы из этой группы администратором." -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Не удаётся присоединить пользователя %1$s к группе %2$s." @@ -402,7 +402,7 @@ msgstr "Не удаётся присоединить пользователя %1 msgid "You are not a member of this group." msgstr "Вы не являетесь членом этой группы." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Не удаётся удалить пользователя %1$s из группы %2$s." @@ -696,7 +696,7 @@ msgstr "Не удаётся сохранить информацию о блок #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "Нет такой группы." @@ -1687,7 +1687,7 @@ msgstr "Пригласить новых пользователей" msgid "You are already subscribed to these users:" msgstr "Вы уже подписаны на пользователя:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1732,7 +1732,7 @@ msgstr "Личное сообщение" msgid "Optionally add a personal message to the invitation." msgstr "Можно добавить к приглашению личное сообщение." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "ОК" @@ -1802,7 +1802,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Вы должны авторизоваться для вступления в группу." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s вступил в группу %2$s" @@ -1811,15 +1811,11 @@ msgstr "%1$s вступил в группу %2$s" msgid "You must be logged in to leave a group." msgstr "Вы должны авторизоваться, чтобы покинуть группу." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Вы не являетесь членом этой группы." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Не удаётся найти учетную запись." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s покинул группу %2$s" @@ -1921,12 +1917,12 @@ msgstr "Используйте эту форму для создания нов msgid "New message" msgstr "Новое сообщение" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Вы не можете послать сообщение этому пользователю." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Нет контента!" @@ -1934,7 +1930,7 @@ msgstr "Нет контента!" msgid "No recipient specified." msgstr "Нет адресата." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "Не посылайте сообщения сами себе; просто потихоньку скажите это себе." @@ -4061,10 +4057,25 @@ msgstr "Файл такого размера превысит вашу поль msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Файл такого размера превысит вашу месячную квоту в %d байта." +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Профиль группы" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Не удаётся обновить информацию о группе." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Профиль группы" + #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" -msgstr "Не удаётся создать токен входа для %s." +msgstr "Не удаётся создать токен входа для %s" #: classes/Message.php:45 msgid "You are banned from sending direct messages." @@ -4078,27 +4089,27 @@ msgstr "Не удаётся вставить сообщение." msgid "Could not update message with new URI." msgstr "Не удаётся обновить сообщение с новым URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Ошибка баз данных при вставке хеш-тегов для %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Проблемы с сохранением записи. Слишком длинно." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Проблема при сохранении записи. Неизвестный пользователь." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Слишком много записей за столь короткий срок; передохните немного и " "попробуйте вновь через пару минут." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4106,25 +4117,25 @@ msgstr "" "Слишком много одинаковых записей за столь короткий срок; передохните немного " "и попробуйте вновь через пару минут." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Вам запрещено поститься на этом сайте (бан)" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Проблемы с сохранением записи." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Ошибка баз данных при вставке ответа для %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Добро пожаловать на %1$s, @%2$s!" @@ -4426,18 +4437,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "Простите, эта команда ещё не выполнена." #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" -msgstr "Не удаётся найти пользователя с именем %s." +msgstr "Не удаётся найти пользователя с именем %s" #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Нет смысла «подталкивать» самого себя!" #: lib/command.php:99 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" -msgstr "«Подталкивание» послано %s." +msgstr "«Подталкивание» послано %s" #: lib/command.php:126 #, php-format @@ -4450,14 +4461,12 @@ msgstr "" "Подписчиков: %2$s\n" "Записей: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 msgid "Notice with that id does not exist" -msgstr "Записи с таким id не существует." +msgstr "Записи с таким id не существует" -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 msgid "User has no last notice" msgstr "У пользователя нет последней записи." @@ -4466,182 +4475,175 @@ msgid "Notice marked as fave." msgstr "Запись помечена как любимая." #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" msgstr "Вы уже являетесь членом этой группы." -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, php-format msgid "Could not join user %s to group %s" -msgstr "Не удаётся присоединить пользователя %1$s к группе %2$s." +msgstr "Не удаётся присоединить пользователя %s к группе %s" -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%1$s вступил в группу %2$s" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, php-format msgid "Could not remove user %s to group %s" msgstr "Не удаётся удалить пользователя %1$s из группы %2$s." -#: lib/command.php:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%1$s покинул группу %2$s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Полное имя: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Месторасположение: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Домашняя страница: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "О пользователе: %s" -#: lib/command.php:358 -#, fuzzy, php-format +#: lib/command.php:349 +#, php-format msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "" -"Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d." +msgstr "Сообщение слишком длинное — не больше %d символов, вы посылаете %d" -#: lib/command.php:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "Прямое сообщение для %s послано." -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Ошибка при отправке прямого сообщения." -#: lib/command.php:422 -#, fuzzy +#: lib/command.php:413 msgid "Cannot repeat your own notice" msgstr "Невозможно повторить собственную запись." -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" -msgstr "Запись уже повторена." +msgstr "Эта запись уже повторена" -#: lib/command.php:435 -#, fuzzy, php-format +#: lib/command.php:426 +#, php-format msgid "Notice from %s repeated" -msgstr "Запись %s повторена." +msgstr "Запись %s повторена" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Ошибка при повторении записи." -#: lib/command.php:491 -#, fuzzy, php-format +#: lib/command.php:482 +#, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "Запись слишком длинная — не больше %1$d символов, вы отправили %2$d." +msgstr "Запись слишком длинная — не больше %d символов, вы посылаете %d" -#: lib/command.php:500 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Reply to %s sent" -msgstr "Ответ %s отправлен." +msgstr "Ответ %s отправлен" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Проблемы с сохранением записи." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "Укажите имя пользователя для подписки." -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Подписано на %s" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "Укажите имя пользователя для отмены подписки." -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Отписано от %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Команда ещё не выполнена." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Оповещение отсутствует." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Нет оповещения." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Есть оповещение." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Есть оповещение." -#: lib/command.php:650 -#, fuzzy +#: lib/command.php:641 msgid "Login command is disabled" -msgstr "Команда входа отключена." +msgstr "Команда входа отключена" -#: lib/command.php:661 -#, fuzzy, php-format +#: lib/command.php:652 +#, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" -msgstr "Эта ссылка действительна только один раз в течение 2 минут: %s." +msgstr "Эта ссылка действительна только один раз в течение 2 минут: %s" -#: lib/command.php:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "Вы ни на кого не подписаны." -#: lib/command.php:679 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Вы подписаны на этих людей:" msgstr[1] "Вы подписаны на этих людей:" msgstr[2] "Вы подписаны на этих людей:" -#: lib/command.php:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "Никто не подписан на вас." -#: lib/command.php:701 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Эти люди подписались на вас:" msgstr[1] "Эти люди подписались на вас:" msgstr[2] "Эти люди подписались на вас:" -#: lib/command.php:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "Вы не состоите ни в одной группе." -#: lib/command.php:723 +#: lib/command.php:714 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:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4719,19 +4721,19 @@ msgstr "" "tracks — пока не реализовано.\n" "tracking — пока не реализовано.\n" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Конфигурационный файл не найден. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "Конфигурационные файлы искались в следующих местах: " -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "Возможно, вы решите запустить установщик для исправления этого." -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Перейти к установщику" @@ -4933,11 +4935,16 @@ msgstr "МБ" msgid "kB" msgstr "КБ" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Неизвестный язык «%s»." + #: lib/joinform.php:114 msgid "Join" msgstr "Присоединиться" @@ -5324,19 +5331,24 @@ msgid "Attach a file" msgstr "Прикрепить файл" #: lib/noticeform.php:212 -#, fuzzy msgid "Share my location" msgstr "Поделиться своим местоположением." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Не публиковать своё местоположение." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "Скрыть эту информацию" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5594,23 +5606,23 @@ msgstr "Уже подписаны!" msgid "User has blocked you." msgstr "Пользователь заблокировал Вас." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Подписка неудачна." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Не удаётся подписать других на вашу ленту." -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Не подписаны!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Невозможно удалить самоподписку." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Не удаётся удалить подписку." @@ -5684,47 +5696,47 @@ msgstr "Сообщение" msgid "Moderate" msgstr "Модерировать" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "пару секунд назад" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "около минуты назад" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "около %d минут(ы) назад" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "около часа назад" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "около %d часа(ов) назад" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "около дня назад" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "около %d дня(ей) назад" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "около месяца назад" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "около %d месяца(ев) назад" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "около года назад" diff --git a/locale/statusnet.po b/locale/statusnet.po index 87d8b0b50d..fb8fd0ad6b 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-01-11 23:25+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,10 +41,10 @@ msgstr "" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "" @@ -372,7 +372,7 @@ msgstr "" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "" @@ -381,7 +381,7 @@ msgstr "" msgid "You are not a member of this group." msgstr "" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "" @@ -671,7 +671,7 @@ msgstr "" #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "" @@ -1603,7 +1603,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1644,7 +1644,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "" @@ -1688,7 +1688,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -1697,15 +1697,11 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "" -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, php-format msgid "%1$s left group %2$s" msgstr "" @@ -1802,12 +1798,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "" @@ -1815,7 +1811,7 @@ msgstr "" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -3784,6 +3780,18 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +msgid "Group join failed." +msgstr "" + +#: classes/Group_member.php:53 +msgid "Not part of group." +msgstr "" + +#: classes/Group_member.php:60 +msgid "Group leave failed." +msgstr "" + #: classes/Login_token.php:76 #, php-format msgid "Could not create login token for %s" @@ -3801,49 +3809,49 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4160,12 +4168,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 msgid "User has no last notice" msgstr "" @@ -4177,169 +4185,169 @@ msgstr "" msgid "You are already a member of that group" msgstr "" -#: lib/command.php:234 +#: lib/command.php:231 #, php-format msgid "Could not join user %s to group %s" msgstr "" -#: lib/command.php:239 +#: lib/command.php:236 #, php-format msgid "%s joined group %s" msgstr "" -#: lib/command.php:284 +#: lib/command.php:275 #, php-format msgid "Could not remove user %s to group %s" msgstr "" -#: lib/command.php:289 +#: lib/command.php:280 #, php-format msgid "%s left group %s" msgstr "" -#: lib/command.php:318 +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 +#: lib/command.php:413 msgid "Cannot repeat your own notice" msgstr "" -#: lib/command.php:427 +#: lib/command.php:418 msgid "Already repeated that notice" msgstr "" -#: lib/command.php:435 +#: lib/command.php:426 #, php-format msgid "Notice from %s repeated" msgstr "" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "" -#: lib/command.php:491 +#: lib/command.php:482 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 +#: lib/command.php:491 #, php-format msgid "Reply to %s sent" msgstr "" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "" -#: lib/command.php:556 +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:679 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:701 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:723 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4380,19 +4388,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "" -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4590,11 +4598,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 msgid "Join" msgstr "" @@ -4895,14 +4908,20 @@ msgstr "" msgid "Share my location" msgstr "" -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 msgid "Do not share my location" msgstr "" -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5160,23 +5179,23 @@ msgstr "" msgid "User has blocked you." msgstr "" -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "" -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "" @@ -5250,47 +5269,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "" diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po index 3d395afce0..aab154cafd 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:28:14+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:06:09+0000\n" "Language-Team: Swedish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: sv\n" "X-Message-Group: out-statusnet\n" @@ -44,10 +44,10 @@ msgstr "Ingen sådan sida" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Ingen sådan användare." @@ -388,7 +388,7 @@ msgstr "Du är redan en medlem i denna grupp." msgid "You have been blocked from that group by the admin." msgstr "Du har blivit blockerad från denna grupp av administratören." -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Kunde inte ansluta användare % till grupp %s." @@ -397,7 +397,7 @@ msgstr "Kunde inte ansluta användare % till grupp %s." msgid "You are not a member of this group." msgstr "Du är inte en medlem i denna grupp." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Kunde inte ta bort användare %s från grupp %s." @@ -691,7 +691,7 @@ msgstr "Misslyckades att spara blockeringsinformation." #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "Ingen sådan grupp." @@ -1677,7 +1677,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:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1724,7 +1724,7 @@ msgstr "Personligt meddelande" msgid "Optionally add a personal message to the invitation." msgstr "Om du vill, skriv ett personligt meddelande till inbjudan." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Skicka" @@ -1768,7 +1768,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Du måste vara inloggad för att kunna gå med i en grupp." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s gick med i grupp %s" @@ -1777,15 +1777,11 @@ msgstr "%s gick med i grupp %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:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Du är inte en medlem i den gruppen." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Kunde inte hitta uppgift om medlemskap." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s lämnade grupp %s" @@ -1886,12 +1882,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:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 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:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Inget innehåll!" @@ -1899,7 +1895,7 @@ msgstr "Inget innehåll!" msgid "No recipient specified." msgstr "Ingen mottagare angiven." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -3994,8 +3990,23 @@ msgstr "En så här stor fil skulle överskrida din användarkvot på %d byte." 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." +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Grupprofil" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Kunde inte uppdatera grupp." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Grupprofil" + #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" msgstr "Kunde inte skapa inloggnings-token för %s" @@ -4011,27 +4022,27 @@ msgstr "Kunde inte infoga meddelande." msgid "Could not update message with new URI." msgstr "Kunde inte uppdatera meddelande med ny URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Databasfel vid infogning av hashtag: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Problem vid sparande av notis. För långt." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Problem vid sparande av notis. Okänd användare." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "För många notiser för snabbt; ta en vilopaus och posta igen om ett par " "minuter." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4039,25 +4050,25 @@ msgstr "" "För många duplicerade meddelanden för snabbt; ta en vilopaus och posta igen " "om ett par minuter." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Du är utestängd från att posta notiser på denna webbplats." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Problem med att spara notis." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Databasfel vid infogning av svar: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Välkommen till %1$s, @%2$s!" @@ -4359,7 +4370,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "Ledsen, detta kommando är inte implementerat än." #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" msgstr "Kunde inte hitta en användare med smeknamnet %s" @@ -4368,7 +4379,7 @@ 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 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" msgstr "Knuff skickad till %s" @@ -4383,14 +4394,12 @@ msgstr "" "Prenumeranter: %2$s\n" "Notiser: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy +#: 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:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: 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" @@ -4399,179 +4408,173 @@ msgid "Notice marked as fave." msgstr "Notis markerad som favorit." #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" -msgstr "Du är redan en medlem i denna grupp." +msgstr "Du är redan en medlem i denna grupp" -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, php-format msgid "Could not join user %s to group %s" -msgstr "Kunde inte ansluta användare % till grupp %s." +msgstr "Kunde inte ansluta användare %s till groupp %s" -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%s gick med i grupp %s" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, 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:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%s lämnade grupp %s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Fullständigt namn: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Plats: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Hemsida: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Om: %s" -#: lib/command.php:358 -#, fuzzy, php-format +#: lib/command.php:349 +#, 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:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "Direktmeddelande till %s skickat" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Fel vid sändning av direktmeddelande." -#: lib/command.php:422 -#, fuzzy +#: lib/command.php:413 msgid "Cannot repeat your own notice" -msgstr "Kan inte upprepa din egen notis." +msgstr "Kan inte upprepa din egen notis" -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" -msgstr "Redan upprepat denna notis." +msgstr "Redan upprepat denna notis" -#: lib/command.php:435 -#, fuzzy, php-format +#: lib/command.php:426 +#, php-format msgid "Notice from %s repeated" msgstr "Notis fron %s upprepad" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Fel vid upprepning av notis." -#: lib/command.php:491 -#, fuzzy, php-format +#: lib/command.php:482 +#, 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:500 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Reply to %s sent" msgstr "Svar på %s skickat" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Fel vid sparande av notis." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "Ange namnet på användaren att prenumerara på" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Prenumerar på %s" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "Ange namnet på användaren att avsluta prenumeration på" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Prenumeration hos %s avslutad" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Kommando inte implementerat än." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Notifikation av." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Kan inte sätta på notifikation." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Notifikation på." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Kan inte stänga av notifikation." -#: lib/command.php:650 -#, fuzzy +#: lib/command.php:641 msgid "Login command is disabled" msgstr "Inloggningskommando är inaktiverat" -#: lib/command.php:661 -#, fuzzy, php-format +#: lib/command.php:652 +#, 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:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "Du prenumererar inte på någon." -#: lib/command.php:679 +#: lib/command.php:670 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:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "Ingen prenumerar på dig." -#: lib/command.php:701 +#: lib/command.php:692 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:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "Du är inte medlem i några grupper." -#: lib/command.php:723 +#: lib/command.php:714 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:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4612,19 +4615,19 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Ingen konfigurationsfil hittades. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "Jag letade efter konfigurationsfiler på följande platser: " -#: lib/common.php:201 +#: lib/common.php:134 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:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Gå till installeraren." @@ -4824,11 +4827,16 @@ msgstr "MB" msgid "kB" msgstr "kB" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Okänt språk \"%s\"" + #: lib/joinform.php:114 msgid "Join" msgstr "Gå med" @@ -5149,15 +5157,21 @@ msgstr "Bifoga en fil" msgid "Share my location" msgstr "Dela din plats" -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Dela din plats" -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5416,23 +5430,23 @@ msgstr "Redan prenumerant!" msgid "User has blocked you." msgstr "Användaren har blockerat dig." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Kunde inte prenumerera." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Kunde inte göra andra till prenumeranter hos dig." -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Inte prenumerant!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Kunde inte ta bort själv-prenumeration." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Kunde inte ta bort prenumeration." @@ -5506,47 +5520,47 @@ msgstr "Meddelande" msgid "Moderate" msgstr "Moderera" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "ett par sekunder sedan" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "för nån minut sedan" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "för %d minuter sedan" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "för en timma sedan" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "för %d timmar sedan" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "för en dag sedan" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "för %d dagar sedan" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "för en månad sedan" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "för %d månader sedan" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "för ett år sedan" diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po index a9e89cc5ab..72ed8daafd 100644 --- a/locale/te/LC_MESSAGES/statusnet.po +++ b/locale/te/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:28:19+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:06:12+0000\n" "Language-Team: Telugu\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: te\n" "X-Message-Group: out-statusnet\n" @@ -43,10 +43,10 @@ msgstr "అటువంటి పేజీ లేదు" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "అటువంటి వాడుకరి లేరు." @@ -383,7 +383,7 @@ msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ msgid "You have been blocked from that group by the admin." msgstr "నిర్వాహకులు ఆ గుంపు నుండి మిమ్మల్ని నిరోధించారు." -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s" @@ -392,7 +392,7 @@ msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించ msgid "You are not a member of this group." msgstr "మీరు ఈ గుంపులో సభ్యులు కాదు." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "వాడుకరి %sని %s గుంపు నుండి తొలగించలేకపోయాం." @@ -685,7 +685,7 @@ msgstr "నిరోధపు సమాచారాన్ని భద్రప #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "అటువంటి గుంపు లేదు." @@ -972,7 +972,6 @@ msgstr "గుంపుని సృష్టించడానికి మీ #: actions/editgroup.php:103 actions/editgroup.php:168 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 -#, fuzzy msgid "You must be an admin to edit the group." msgstr "గుంపుని మార్చడానికి మీరు నిర్వాహకులయి ఉండాలి." @@ -998,7 +997,6 @@ msgid "Options saved." msgstr "ఎంపికలు భద్రమయ్యాయి." #: actions/emailsettings.php:60 -#, fuzzy msgid "Email settings" msgstr "ఈమెయిల్ అమరికలు" @@ -1034,9 +1032,8 @@ msgid "Cancel" msgstr "రద్దుచేయి" #: actions/emailsettings.php:121 -#, fuzzy msgid "Email address" -msgstr "ఈమెయిలు చిరునామాలు" +msgstr "ఈమెయిలు చిరునామా" #: actions/emailsettings.php:123 msgid "Email address, like \"UserName@example.org\"" @@ -1513,7 +1510,6 @@ msgid "Error removing the block." msgstr "నిరోధాన్ని తొలగించడంలో పొరపాటు." #: actions/imsettings.php:59 -#, fuzzy msgid "IM settings" msgstr "IM అమరికలు" @@ -1540,7 +1536,6 @@ msgid "" msgstr "" #: actions/imsettings.php:124 -#, fuzzy msgid "IM address" msgstr "IM చిరునామా" @@ -1633,7 +1628,7 @@ msgstr "కొత్త వాడుకరులని ఆహ్వానిం msgid "You are already subscribed to these users:" msgstr "మీరు ఇప్పటికే ఈ వాడుకరులకు చందాచేరి ఉన్నారు:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1674,7 +1669,7 @@ msgstr "వ్యక్తిగత సందేశం" msgid "Optionally add a personal message to the invitation." msgstr "ఐచ్ఛికంగా ఆహ్వానానికి వ్యక్తిగత సందేశం చేర్చండి." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "పంపించు" @@ -1718,25 +1713,21 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "గుంపుల్లో చేరడానికి మీరు ప్రవేశించి ఉండాలి." -#: actions/joingroup.php:135 -#, fuzzy, php-format +#: actions/joingroup.php:131 +#, php-format msgid "%1$s joined group %2$s" -msgstr "%s %s గుంపులో చేరారు" +msgstr "%1$s %2$s గుంపులో చేరారు" #: actions/leavegroup.php:60 msgid "You must be logged in to leave a group." msgstr "గుంపుని వదిలివెళ్ళడానికి మీరు ప్రవేశించి ఉండాలి." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "మీరు ఆ గుంపులో సభ్యులు కాదు." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 -#, fuzzy, php-format +#: actions/leavegroup.php:127 +#, php-format msgid "%1$s left group %2$s" msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు" @@ -1805,9 +1796,9 @@ msgid "Only an admin can make another user an admin." msgstr "నిర్వాహకులు మాత్రమే మరొక వాడుకరిని నిర్వాహకునిగా చేయగలరు." #: actions/makeadmin.php:95 -#, fuzzy, php-format +#, php-format msgid "%1$s is already an admin for group \"%2$s\"." -msgstr "%s ఇప్పటికే \"%s\" గుంపు యొక్క ఒక నిర్వాకులు." +msgstr "%1$s ఇప్పటికే \"%2$s\" గుంపు యొక్క ఒక నిర్వాకులు." #: actions/makeadmin.php:132 #, fuzzy, php-format @@ -1835,12 +1826,12 @@ msgstr "కొత్త గుంపుని సృష్టిండాని msgid "New message" msgstr "కొత్త సందేశం" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "ఈ వాడుకరికి మీరు సందేశాన్ని పంపించలేరు." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "విషయం లేదు!" @@ -1848,7 +1839,7 @@ msgstr "విషయం లేదు!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "మీకు మీరే సందేశాన్ని పంపుకోకండి; దాని బదులు మీలో మీరే మెల్లగా చెప్పుకోండి." @@ -2147,7 +2138,7 @@ msgstr "అలంకారం" #: actions/pathsadminpanel.php:237 msgid "Theme server" -msgstr "" +msgstr "అలంకారాల సేవకి" #: actions/pathsadminpanel.php:241 msgid "Theme path" @@ -2162,9 +2153,8 @@ msgid "Avatars" msgstr "అవతారాలు" #: actions/pathsadminpanel.php:257 -#, fuzzy msgid "Avatar server" -msgstr "అవతారపు అమరికలు" +msgstr "అవతారాల సేవకి" #: actions/pathsadminpanel.php:261 #, fuzzy @@ -2180,9 +2170,8 @@ msgid "Backgrounds" msgstr "నేపథ్యాలు" #: actions/pathsadminpanel.php:278 -#, fuzzy msgid "Background server" -msgstr "నేపథ్యం" +msgstr "నేపథ్యాల సేవకి" #: actions/pathsadminpanel.php:282 #, fuzzy @@ -2634,7 +2623,7 @@ msgstr "నమోదు" #: actions/register.php:135 msgid "Registration not allowed." -msgstr "" +msgstr "నమోదు అనుమతించబడదు." #: actions/register.php:198 msgid "You can't register if you don't agree to the license." @@ -3233,7 +3222,7 @@ msgstr "అటువంటి వాడుకరి లేరు." #: actions/siteadminpanel.php:335 msgid "Disable new registrations." -msgstr "" +msgstr "కొత్త నమోదులను అచేతనంచేయి." #: actions/siteadminpanel.php:341 msgid "Snapshots" @@ -3342,7 +3331,7 @@ msgstr "" #: actions/smssettings.php:306 msgid "No phone number." -msgstr "" +msgstr "ఫోను నెంబరు లేదు." #: actions/smssettings.php:311 msgid "No carrier selected." @@ -3350,7 +3339,7 @@ msgstr "" #: actions/smssettings.php:318 msgid "That is already your phone number." -msgstr "" +msgstr "ఇది ఇప్పటికే మీ ఫోను నెంబరు." #: actions/smssettings.php:321 msgid "That phone number already belongs to another user." @@ -3609,11 +3598,11 @@ msgstr "ప్రొఫైలు" #: actions/useradminpanel.php:222 msgid "Bio Limit" -msgstr "" +msgstr "స్వపరిచయ పరిమితి" #: actions/useradminpanel.php:223 msgid "Maximum length of a profile bio in characters." -msgstr "" +msgstr "స్వపరిచయం యొక్క గరిష్ఠ పొడవు, అక్షరాలలో." #: actions/useradminpanel.php:231 msgid "New users" @@ -3840,7 +3829,6 @@ msgid "Plugins" msgstr "" #: actions/version.php:195 -#, fuzzy msgid "Name" msgstr "పేరు" @@ -3850,9 +3838,8 @@ msgid "Version" msgstr "వ్యక్తిగత" #: actions/version.php:197 -#, fuzzy msgid "Author(s)" -msgstr "రచయిత" +msgstr "రచయిత(లు)" #: actions/version.php:198 lib/groupeditform.php:172 msgid "Description" @@ -3875,6 +3862,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "గుంపు ప్రొఫైలు" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "గుంపుని తాజాకరించలేకున్నాం." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "గుంపు ప్రొఫైలు" + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -3892,51 +3894,51 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:230 +#: classes/Notice.php:229 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "ఈ సైటులో నోటీసులు రాయడం నుండి మిమ్మల్ని నిషేధించారు." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "@%2$s, %1$sకి స్వాగతం!" @@ -3980,9 +3982,9 @@ msgid "Other options" msgstr "ఇతర ఎంపికలు" #: lib/action.php:144 -#, fuzzy, php-format +#, php-format msgid "%1$s - %2$s" -msgstr "%1$s (%2$s)" +msgstr "%1$s - %2$s" #: lib/action.php:159 msgid "Untitled page" @@ -4111,7 +4113,7 @@ msgstr "బాడ్జి" #: lib/action.php:773 msgid "StatusNet software license" -msgstr "" +msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైసెన్సు" #: lib/action.php:776 #, php-format @@ -4249,7 +4251,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" msgstr "వాడుకరిని తాజాకరించలేకున్నాం." @@ -4273,13 +4275,13 @@ msgstr "" "చందాదార్లు: %2$s\n" "నోటీసులు: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 #, fuzzy msgid "User has no last notice" msgstr "వాడుకరికి ప్రొఫైలు లేదు." @@ -4289,177 +4291,176 @@ msgid "Notice marked as fave." msgstr "" #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" -msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు." +msgstr "మీరు ఇప్పటికే ఆ గుంపులో సభ్యులు" -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, php-format msgid "Could not join user %s to group %s" -msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s" +msgstr "వాడుకరి %sని %s గుంపులో చేర్చలేకపోయాం" -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%s %s గుంపులో చేరారు" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, php-format msgid "Could not remove user %s to group %s" msgstr "వాడుకరి %sని %s గుంపు నుండి తొలగించలేకపోయాం" -#: lib/command.php:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "పూర్తిపేరు: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "ప్రాంతం: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" -msgstr "" +msgstr "హోంపేజీ: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "గురించి: %s" -#: lib/command.php:358 +#: lib/command.php:349 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు" -#: lib/command.php:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "%sకి నేరు సందేశాన్ని పంపించాం" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "ఈ లైసెన్సుకి అంగీకరించకపోతే మీరు నమోదుచేసుకోలేరు." -#: lib/command.php:427 +#: lib/command.php:418 #, fuzzy msgid "Already repeated that notice" msgstr "ఈ నోటీసుని తొలగించు" -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "సందేశాలు" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: lib/command.php:491 -#, fuzzy, php-format +#: lib/command.php:482 +#, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "%sకి స్పందనలు" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు." -#: lib/command.php:556 +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "%sకి చందా చేరారు" -#: lib/command.php:584 +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 -#, fuzzy, php-format +#: lib/command.php:652 +#, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "ఈ లంకెని ఒకే సారి ఉపయోగించగలరు, మరియు అది పనిచేసేది 2 నిమిషాలు మాత్రమే: %s" -#: lib/command.php:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "మీరు ఎవరికీ చందాచేరలేదు." -#: lib/command.php:679 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "%sకి స్పందనలు" msgstr[1] "%sకి స్పందనలు" -#: lib/command.php:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "మీకు చందాదార్లు ఎవరూ లేరు." -#: lib/command.php:701 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "%sకి స్పందనలు" msgstr[1] "%sకి స్పందనలు" -#: lib/command.php:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "మీరు ఏ గుంపులోనూ సభ్యులు కాదు." -#: lib/command.php:723 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!" -#: lib/command.php:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4500,20 +4501,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "నిర్ధారణ సంకేతం లేదు." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4718,11 +4719,16 @@ msgstr "మెబై" msgid "kB" msgstr "కిబై" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "గుర్తు తెలియని భాష \"%s\"" + #: lib/joinform.php:114 msgid "Join" msgstr "చేరు" @@ -5029,15 +5035,21 @@ msgstr "ఒక ఫైలుని జోడించు" msgid "Share my location" msgstr "ట్యాగులని భద్రపరచలేకున్నాం." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "ట్యాగులని భద్రపరచలేకున్నాం." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5305,25 +5317,25 @@ msgstr "ఇప్పటికే చందాచేరారు!" msgid "User has blocked you." msgstr "వాడుకరి మిమ్మల్ని నిరోధించారు." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "చందా చేర్చలేకపోయాం." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "చందాదార్లు" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "చందాని తొలగించలేకపోయాం." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "చందాని తొలగించలేకపోయాం." @@ -5400,47 +5412,47 @@ msgstr "సందేశం" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "కొన్ని క్షణాల క్రితం" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "ఓ నిమిషం క్రితం" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "%d నిమిషాల క్రితం" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "ఒక గంట క్రితం" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "%d గంటల క్రితం" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "ఓ రోజు క్రితం" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "%d రోజుల క్రితం" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "ఓ నెల క్రితం" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "%d నెలల క్రితం" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "ఒక సంవత్సరం క్రితం" diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po index 9374b52ce9..c456120306 100644 --- a/locale/tr/LC_MESSAGES/statusnet.po +++ b/locale/tr/LC_MESSAGES/statusnet.po @@ -8,12 +8,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:28:23+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:06:15+0000\n" "Language-Team: Turkish\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: tr\n" "X-Message-Group: out-statusnet\n" @@ -44,10 +44,10 @@ msgstr "Böyle bir durum mesajı yok." #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Böyle bir kullanıcı yok." @@ -391,7 +391,7 @@ msgstr "Zaten giriş yapmış durumdasıznız!" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Sunucuya yönlendirme yapılamadı: %s" @@ -401,7 +401,7 @@ msgstr "Sunucuya yönlendirme yapılamadı: %s" msgid "You are not a member of this group." msgstr "Bize o profili yollamadınız" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "OpenID formu yaratılamadı: %s" @@ -704,7 +704,7 @@ msgstr "" #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 #, fuzzy msgid "No such group." msgstr "Böyle bir durum mesajı yok." @@ -1699,7 +1699,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1740,7 +1740,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Gönder" @@ -1784,7 +1784,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -1793,16 +1793,12 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 #, fuzzy msgid "You are not a member of that group." msgstr "Bize o profili yollamadınız" -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%1$s'in %2$s'deki durum mesajları " @@ -1906,12 +1902,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "İçerik yok!" @@ -1919,7 +1915,7 @@ msgstr "İçerik yok!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -3988,6 +3984,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Böyle bir durum mesajı yok." + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Kullanıcı güncellenemedi." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Böyle bir durum mesajı yok." + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -4005,51 +4016,51 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:230 +#: classes/Notice.php:229 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Durum mesajını kaydederken hata oluştu." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Cevap eklenirken veritabanı hatası: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4371,7 +4382,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" msgstr "Kullanıcı güncellenemedi." @@ -4392,12 +4403,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 +#: 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." @@ -4411,173 +4422,173 @@ msgstr "" msgid "You are already a member of that group" msgstr "Zaten giriş yapmış durumdasıznız!" -#: lib/command.php:234 +#: lib/command.php:231 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "Sunucuya yönlendirme yapılamadı: %s" -#: lib/command.php:239 +#: lib/command.php:236 #, fuzzy, php-format msgid "%s joined group %s" msgstr "%1$s'in %2$s'deki durum mesajları " -#: lib/command.php:284 +#: lib/command.php:275 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "OpenID formu yaratılamadı: %s" -#: lib/command.php:289 +#: lib/command.php:280 #, fuzzy, php-format msgid "%s left group %s" msgstr "%1$s'in %2$s'deki durum mesajları " -#: lib/command.php:318 +#: lib/command.php:309 #, fuzzy, php-format msgid "Fullname: %s" msgstr "Tam İsim" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız." -#: lib/command.php:427 +#: lib/command.php:418 #, fuzzy msgid "Already repeated that notice" msgstr "Zaten giriş yapmış durumdasıznız!" -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Durum mesajları" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Durum mesajını kaydederken hata oluştu." -#: lib/command.php:491 +#: lib/command.php:482 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "%s için cevaplar" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "Durum mesajını kaydederken hata oluştu." -#: lib/command.php:556 +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "Bize o profili yollamadınız" -#: lib/command.php:679 +#: lib/command.php:670 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:699 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Uzaktan abonelik" -#: lib/command.php:701 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Uzaktan abonelik" -#: lib/command.php:721 +#: lib/command.php:712 #, fuzzy msgid "You are not a member of any groups." msgstr "Bize o profili yollamadınız" -#: lib/command.php:723 +#: lib/command.php:714 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:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4618,20 +4629,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "Onay kodu yok." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4841,11 +4852,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 #, fuzzy msgid "Join" @@ -5160,15 +5176,21 @@ msgstr "" msgid "Share my location" msgstr "Profil kaydedilemedi." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Profil kaydedilemedi." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5442,25 +5464,25 @@ msgstr "" msgid "User has blocked you." msgstr "Kullanıcının profili yok." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Abonelik silinemedi." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Abonelik silinemedi." @@ -5538,47 +5560,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "birkaç saniye önce" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "yaklaşık bir dakika önce" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "yaklaşık %d dakika önce" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "yaklaşık bir saat önce" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "yaklaşık %d saat önce" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "yaklaşık bir gün önce" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "yaklaşık %d gün önce" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "yaklaşık bir ay önce" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "yaklaşık %d ay önce" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "yaklaşık bir yıl önce" diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po index 1870112162..49e8ae3093 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:28:27+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:06:18+0000\n" "Language-Team: Ukrainian\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: out-statusnet\n" @@ -46,10 +46,10 @@ msgstr "Немає такої сторінки" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Такого користувача немає." @@ -389,7 +389,7 @@ msgstr "Ви вже є учасником цієї групи." msgid "You have been blocked from that group by the admin." msgstr "Адмін цієї групи заблокував Вашу присутність в ній." -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "Не вдалось долучити користувача %1$s до групи %2$s." @@ -398,7 +398,7 @@ msgstr "Не вдалось долучити користувача %1$s до г msgid "You are not a member of this group." msgstr "Ви не є учасником цієї групи." -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "Не вдалось видалити користувача %1$s з групи %2$s." @@ -694,7 +694,7 @@ msgstr "Збереження інформації про блокування з #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "Такої групи немає." @@ -1671,7 +1671,7 @@ msgstr "Запросити нових користувачів" msgid "You are already subscribed to these users:" msgstr "Ви вже підписані до цих користувачів:" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1717,7 +1717,7 @@ msgstr "Особисті повідомлення" msgid "Optionally add a personal message to the invitation." msgstr "Можна додати персональне повідомлення до запрошення (опціонально)." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Так!" @@ -1788,7 +1788,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Ви повинні спочатку увійти на сайт, аби приєднатися до групи." -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "%1$s приєднався до групи %2$s" @@ -1797,15 +1797,11 @@ msgstr "%1$s приєднався до групи %2$s" msgid "You must be logged in to leave a group." msgstr "Ви повинні спочатку увійти на сайт, аби залишити групу." -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "Ви не є учасником цієї групи." -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "Не вдалося знайти запис щодо членства." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, php-format msgid "%1$s left group %2$s" msgstr "%1$s залишив групу %2$s" @@ -1909,12 +1905,12 @@ msgstr "Скористайтесь цією формою для створенн msgid "New message" msgstr "Нове повідомлення" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "Ви не можете надіслати повідомлення цьому користувачеві." -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Немає змісту!" @@ -1922,7 +1918,7 @@ msgstr "Немає змісту!" msgid "No recipient specified." msgstr "Жодного отримувача не визначено." -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -2073,29 +2069,24 @@ msgid "URL shortening service is too long (max 50 chars)." msgstr "Сервіс скорочення URL-адрес надто довгий (50 знаків максимум)." #: actions/otp.php:69 -#, fuzzy msgid "No user ID specified." -msgstr "Групу не визначено." +msgstr "ID користувача не визначено." #: actions/otp.php:83 -#, fuzzy msgid "No login token specified." -msgstr "Зазначеного допису немає." +msgstr "Токен для входу не визначено." #: actions/otp.php:90 -#, fuzzy msgid "No login token requested." -msgstr "У запиті відсутній ID профілю." +msgstr "Токен для входу у запиті відсутній." #: actions/otp.php:95 -#, fuzzy msgid "Invalid login token specified." -msgstr "Недійсний або неправильний токен." +msgstr "Токен для входу визначено як неправильний." #: actions/otp.php:104 -#, fuzzy msgid "Login token expired." -msgstr "Вхід на сайт" +msgstr "Токен для входу втратив чинність." #: actions/outbox.php:61 #, php-format @@ -4049,10 +4040,25 @@ msgstr "Розміри цього файлу перевищують Вашу к msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "Розміри цього файлу перевищують Вашу місячну квоту на %d байтів." +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Профіль групи" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Не вдалося оновити групу." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Профіль групи" + #: classes/Login_token.php:76 -#, fuzzy, php-format +#, php-format msgid "Could not create login token for %s" -msgstr "Не вдалося створити токен входу для %s." +msgstr "Не вдалося створити токен входу для %s" #: classes/Message.php:45 msgid "You are banned from sending direct messages." @@ -4066,27 +4072,27 @@ msgstr "Не можна долучити повідомлення." msgid "Could not update message with new URI." msgstr "Не можна оновити повідомлення з новим URI." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "Помилка бази даних при додаванні теґу: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 msgid "Problem saving notice. Too long." msgstr "Проблема при збереженні допису. Надто довге." -#: classes/Notice.php:230 +#: classes/Notice.php:229 msgid "Problem saving notice. Unknown user." msgstr "Проблема при збереженні допису. Невідомий користувач." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" "Дуже багато дописів за короткий термін; ходіть подихайте повітрям і " "повертайтесь за кілька хвилин." -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." @@ -4094,25 +4100,25 @@ msgstr "" "Дуже багато повідомлень за короткий термін; ходіть подихайте повітрям і " "повертайтесь за кілька хвилин." -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "Вам заборонено надсилати дописи до цього сайту." -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Проблема при збереженні допису." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Помилка бази даних при додаванні відповіді: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "RT @%1$s %2$s" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "Вітаємо на %1$s, @%2$s!" @@ -4154,9 +4160,9 @@ msgid "Other options" msgstr "Інші опції" #: lib/action.php:144 -#, fuzzy, php-format +#, php-format msgid "%1$s - %2$s" -msgstr "%1$s (%2$s)" +msgstr "%1$s — %2$s" #: lib/action.php:159 msgid "Untitled page" @@ -4413,18 +4419,18 @@ msgid "Sorry, this command is not yet implemented." msgstr "Даруйте, але виконання команди ще не завершено." #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" -msgstr "Не вдалося знайти користувача з ім’ям %s." +msgstr "Не вдалося знайти користувача з іменем %s" #: lib/command.php:92 msgid "It does not make a lot of sense to nudge yourself!" msgstr "Гадаємо, користі від «розштовхування» самого себе небагато, чи не так?!" #: lib/command.php:99 -#, fuzzy, php-format +#, php-format msgid "Nudge sent to %s" -msgstr "Спробу «розштовхати» %s зараховано." +msgstr "Спробу «розштовхати» %s зараховано" #: lib/command.php:126 #, php-format @@ -4437,199 +4443,190 @@ msgstr "" "Підписчики: %2$s\n" "Дописи: %3$s" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 -#, fuzzy +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 msgid "Notice with that id does not exist" -msgstr "Допису з таким id не існує." +msgstr "Такого допису не існує" -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 msgid "User has no last notice" -msgstr "Користувач не має останнього допису." +msgstr "Користувач не має останнього допису" #: lib/command.php:190 msgid "Notice marked as fave." msgstr "Допис позначено як обраний." #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" msgstr "Ви вже є учасником цієї групи." -#: lib/command.php:234 -#, fuzzy, php-format +#: lib/command.php:231 +#, php-format msgid "Could not join user %s to group %s" msgstr "Не вдалось долучити користувача %1$s до групи %2$s." -#: lib/command.php:239 -#, fuzzy, php-format +#: lib/command.php:236 +#, php-format msgid "%s joined group %s" msgstr "%1$s приєднався до групи %2$s" -#: lib/command.php:284 -#, fuzzy, php-format +#: lib/command.php:275 +#, php-format msgid "Could not remove user %s to group %s" msgstr "Не вдалося видалити користувача %1$s з групи %2$s." -#: lib/command.php:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%1$s залишив групу %2$s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "Повне ім’я: %s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "Локація: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "Веб-сторінка: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "Про мене: %s" -#: lib/command.php:358 -#, fuzzy, php-format +#: lib/command.php:349 +#, php-format msgid "Message too long - maximum is %d characters, you sent %d" -msgstr "" -"Повідомлення надто довге — максимум %1$d символів, а Ви надсилаєте %2$d." +msgstr "Повідомлення надто довге — максимум %d знаків, а ви надсилаєте %d" -#: lib/command.php:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "Пряме повідомлення для %s надіслано." -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "Помилка при відправці прямого повідомлення." -#: lib/command.php:422 -#, fuzzy +#: lib/command.php:413 msgid "Cannot repeat your own notice" -msgstr "Не можу вторувати Вашому власному допису." +msgstr "Не можу вторувати Вашому власному допису" -#: lib/command.php:427 -#, fuzzy +#: lib/command.php:418 msgid "Already repeated that notice" -msgstr "Цьому допису вже вторували." +msgstr "Цьому допису вже вторували" -#: lib/command.php:435 -#, fuzzy, php-format +#: lib/command.php:426 +#, php-format msgid "Notice from %s repeated" -msgstr "Допису від %s вторували." +msgstr "Допису від %s вторували" -#: lib/command.php:437 +#: lib/command.php:428 msgid "Error repeating notice." msgstr "Помилка із вторуванням допису." -#: lib/command.php:491 -#, fuzzy, php-format +#: lib/command.php:482 +#, php-format msgid "Notice too long - maximum is %d characters, you sent %d" -msgstr "Допис надто довгий — максимум %1$d символів, а Ви надсилаєте %2$d." +msgstr "Допис надто довгий — максимум %d знаків, а ви надсилаєте %d" -#: lib/command.php:500 -#, fuzzy, php-format +#: lib/command.php:491 +#, php-format msgid "Reply to %s sent" -msgstr "Відповідь для %s надіслано." +msgstr "Відповідь до %s надіслано" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "Проблема при збереженні допису." -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" -msgstr "Зазначте ім’я користувача, до якого бажаєте підписатись." +msgstr "Зазначте ім’я користувача, до якого бажаєте підписатись" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "Підписано до %s" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" -msgstr "Зазначте ім’я користувача, від якого бажаєте відписатись." +msgstr "Зазначте ім’я користувача, від якого бажаєте відписатись" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "Відписано від %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "Виконання команди ще не завершено." -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "Сповіщення вимкнуто." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "Не можна вимкнути сповіщення." -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "Сповіщення увімкнуто." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "Не можна увімкнути сповіщення." -#: lib/command.php:650 -#, fuzzy +#: lib/command.php:641 msgid "Login command is disabled" -msgstr "Команду входу відключено." +msgstr "Команду входу відключено" -#: lib/command.php:661 -#, fuzzy, php-format +#: lib/command.php:652 +#, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -"Це посилання можна використати лише раз, воно дійсне протягом 2 хвилин: %s." +"Це посилання можна використати лише раз, воно дійсне протягом 2 хвилин: %s" -#: lib/command.php:677 +#: lib/command.php:668 msgid "You are not subscribed to anyone." msgstr "Ви не маєте жодних підписок." -#: lib/command.php:679 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "Ви підписані до цієї особи:" msgstr[1] "Ви підписані до цих людей:" msgstr[2] "Ви підписані до цих людей:" -#: lib/command.php:699 +#: lib/command.php:690 msgid "No one is subscribed to you." msgstr "До Вас ніхто не підписаний." -#: lib/command.php:701 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "Ця особа є підписаною до Вас:" msgstr[1] "Ці люди підписані до Вас:" msgstr[2] "Ці люди підписані до Вас:" -#: lib/command.php:721 +#: lib/command.php:712 msgid "You are not a member of any groups." msgstr "Ви не є учасником жодної групи." -#: lib/command.php:723 +#: lib/command.php:714 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:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4705,19 +4702,19 @@ msgstr "" "tracks — наразі не виконується\n" "tracking — наразі не виконується\n" -#: lib/common.php:199 +#: lib/common.php:131 msgid "No configuration file found. " msgstr "Файлу конфігурації не знайдено. " -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "Шукав файли конфігурації в цих місцях: " -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "Запустіть файл інсталяції, аби полагодити це." -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "Іти до файлу інсталяції." @@ -4918,11 +4915,16 @@ msgstr "Мб" msgid "kB" msgstr "кб" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "[%s]" +#: lib/jabber.php:385 +#, fuzzy, php-format +msgid "Unknown inbox source %d." +msgstr "Невідома мова «%s»." + #: lib/joinform.php:114 msgid "Join" msgstr "Приєднатись" @@ -5309,19 +5311,23 @@ msgid "Attach a file" msgstr "Вкласти файл" #: lib/noticeform.php:212 -#, fuzzy msgid "Share my location" msgstr "Показувати локацію." -#: lib/noticeform.php:214 -#, fuzzy -msgid "Do not share my location" -msgstr "Приховувати локацію." - #: lib/noticeform.php:215 +msgid "Do not share my location" +msgstr "Приховувати мою локацію" + +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "Сховати інформацію" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5579,23 +5585,23 @@ msgstr "Вже підписаний!" msgid "User has blocked you." msgstr "Користувач заблокував Вас." -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "Невдала підписка." -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "Не вдалося підписати інших до Вас." -#: lib/subs.php:128 +#: lib/subs.php:137 msgid "Not subscribed!" msgstr "Не підписано!" -#: lib/subs.php:133 +#: lib/subs.php:142 msgid "Couldn't delete self-subscription." msgstr "Не можу видалити самопідписку." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Не вдалося видалити підписку." @@ -5669,47 +5675,47 @@ msgstr "Повідомлення" msgid "Moderate" msgstr "Модерувати" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "мить тому" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "хвилину тому" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "близько %d хвилин тому" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "годину тому" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "близько %d годин тому" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "день тому" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "близько %d днів тому" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "місяць тому" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "близько %d місяців тому" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "рік тому" diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po index b503aa6256..82d4d2037a 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:28:31+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:06:21+0000\n" "Language-Team: Vietnamese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: vi\n" "X-Message-Group: out-statusnet\n" @@ -43,10 +43,10 @@ msgstr "Không có tin nhắn nào." #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "Không có user nào." @@ -393,7 +393,7 @@ msgstr "Bạn đã theo những người này:" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$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." @@ -403,7 +403,7 @@ msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè c msgid "You are not a member of this group." msgstr "Bạn chưa cập nhật thông tin riêng" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$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." @@ -709,7 +709,7 @@ msgstr "" #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 #, fuzzy msgid "No such group." msgstr "Không có tin nhắn nào." @@ -1742,7 +1742,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:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, fuzzy, php-format msgid "%1$s (%2$s)" msgstr "%s (%s)" @@ -1790,7 +1790,7 @@ msgstr "Tin nhắn cá nhân" msgid "Optionally add a personal message to the invitation." msgstr "Không bắt buộc phải thêm thông điệp vào thư mời." -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "Gửi" @@ -1861,7 +1861,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "Bạn phải đăng nhập vào mới có thể gửi thư mời những " -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s và nhóm" @@ -1871,17 +1871,12 @@ 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:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 #, fuzzy msgid "You are not a member of that group." msgstr "Bạn chưa cập nhật thông tin riêng" -#: actions/leavegroup.php:119 lib/command.php:278 -#, fuzzy -msgid "Could not find membership record." -msgstr "Không thể cập nhật thành viên." - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s và nhóm" @@ -1986,13 +1981,13 @@ msgstr "" msgid "New message" msgstr "Tin mới nhất" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 #, 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:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "Không có nội dung!" @@ -2000,7 +1995,7 @@ msgstr "Không có nội dung!" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -4131,6 +4126,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "Thông tin nhóm" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "Không thể cập nhật thành viên." + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "Thông tin nhóm" + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -4151,51 +4161,51 @@ msgstr "Không thể chèn thêm vào đăng nhận." msgid "Could not update message with new URI." msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận." -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, fuzzy, php-format msgid "DB error inserting hashtag: %s" msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:230 +#: classes/Notice.php:229 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%s (%s)" -#: classes/User.php:368 +#: classes/User.php:382 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "%s chào mừng bạn " @@ -4549,13 +4559,13 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 +#: 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." @@ -4570,176 +4580,176 @@ msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của b msgid "You are already a member of that group" msgstr "Bạn đã theo những người này:" -#: lib/command.php:234 +#: lib/command.php:231 #, 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:239 +#: lib/command.php:236 #, fuzzy, php-format msgid "%s joined group %s" msgstr "%s và nhóm" -#: lib/command.php:284 +#: lib/command.php:275 #, 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:289 +#: lib/command.php:280 #, fuzzy, php-format msgid "%s left group %s" msgstr "%s và nhóm" -#: lib/command.php:318 +#: lib/command.php:309 #, fuzzy, php-format msgid "Fullname: %s" msgstr "Tên đầy đủ" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, fuzzy, php-format msgid "Location: %s" msgstr "Thành phố: %s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, fuzzy, php-format msgid "Homepage: %s" msgstr "Trang chủ hoặc Blog: %s" -#: lib/command.php:327 +#: lib/command.php:318 #, fuzzy, php-format msgid "About: %s" msgstr "Giới thiệu" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, fuzzy, php-format msgid "Direct message to %s sent" msgstr "Tin nhắn riêng" -#: lib/command.php:378 +#: lib/command.php:369 #, fuzzy msgid "Error sending direct message." msgstr "Thư bạn đã gửi" -#: lib/command.php:422 +#: lib/command.php:413 #, 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:427 +#: lib/command.php:418 #, fuzzy msgid "Already repeated that notice" msgstr "Xóa tin nhắn" -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "Tin đã gửi" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: lib/command.php:491 +#: lib/command.php:482 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "Trả lời tin nhắn này" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "Có lỗi xảy ra khi lưu tin nhắn." -#: lib/command.php:556 +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, fuzzy, php-format msgid "Subscribed to %s" msgstr "Theo nhóm này" -#: lib/command.php:584 +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, fuzzy, php-format msgid "Unsubscribed from %s" msgstr "Hết theo" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 #, fuzzy msgid "Notification off." msgstr "Không có mã số xác nhận." -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 #, fuzzy msgid "Notification on." msgstr "Không có mã số xác nhận." -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 #, 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:679 +#: lib/command.php:670 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:699 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "Không thể tạo favorite." -#: lib/command.php:701 +#: lib/command.php:692 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:721 +#: lib/command.php:712 #, 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:723 +#: lib/command.php:714 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:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4780,20 +4790,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "Không có mã số xác nhận." -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -5010,11 +5020,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 #, fuzzy msgid "Join" @@ -5382,15 +5397,21 @@ msgstr "" msgid "Share my location" msgstr "Không thể lưu hồ sơ cá nhân." -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "Không thể lưu hồ sơ cá nhân." -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5674,27 +5695,27 @@ msgstr "" msgid "User has blocked you." msgstr "Người dùng không có thông tin." -#: lib/subs.php:60 +#: lib/subs.php:63 #, fuzzy msgid "Could not subscribe." msgstr "Chưa đăng nhận!" -#: lib/subs.php:79 +#: lib/subs.php:82 #, fuzzy msgid "Could not subscribe other to you." msgstr "Không thể tạo favorite." -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "Chưa đăng nhận!" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "Không thể xóa đăng nhận." -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "Không thể xóa đăng nhận." @@ -5777,47 +5798,47 @@ msgstr "Tin mới nhất" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "vài giây trước" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "1 phút trước" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "%d phút trước" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "1 giờ trước" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "%d giờ trước" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "1 ngày trước" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "%d ngày trước" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "1 tháng trước" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "%d tháng trước" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "1 năm trước" diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 040571a282..32adff4386 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:28:35+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:06:24+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -45,10 +45,10 @@ msgstr "没有该页面" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "没有这个用户。" @@ -391,7 +391,7 @@ msgstr "您已经是该组成员" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "无法把 %s 用户添加到 %s 组" @@ -401,7 +401,7 @@ msgstr "无法把 %s 用户添加到 %s 组" msgid "You are not a member of this group." msgstr "您未告知此个人信息" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "无法订阅用户：未找到。" @@ -703,7 +703,7 @@ msgstr "保存阻止信息失败。" #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 msgid "No such group." msgstr "没有这个组。" @@ -1712,7 +1712,7 @@ msgstr "邀请新用户" msgid "You are already subscribed to these users:" msgstr "您已订阅这些用户：" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "%1$s (%2$s)" @@ -1753,7 +1753,7 @@ msgstr "个人消息" msgid "Optionally add a personal message to the invitation." msgstr "在邀请中加几句话(可选)。" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "发送" @@ -1818,7 +1818,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "您必须登录才能加入组。" -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, fuzzy, php-format msgid "%1$s joined group %2$s" msgstr "%s 加入 %s 组" @@ -1828,17 +1828,12 @@ msgstr "%s 加入 %s 组" msgid "You must be logged in to leave a group." msgstr "您必须登录才能邀请其他人使用 %s" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 #, fuzzy msgid "You are not a member of that group." msgstr "您未告知此个人信息" -#: actions/leavegroup.php:119 lib/command.php:278 -#, fuzzy -msgid "Could not find membership record." -msgstr "无法更新用户记录。" - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%s 离开群 %s" @@ -1938,12 +1933,12 @@ msgstr "使用此表格创建组。" msgid "New message" msgstr "新消息" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "无法向此用户发送消息。" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "没有内容！" @@ -1951,7 +1946,7 @@ msgstr "没有内容！" msgid "No recipient specified." msgstr "没有收件人。" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "不要向自己发送消息；跟自己悄悄说就得了。" @@ -4056,6 +4051,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "组资料" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "无法更新组" + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "组资料" + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -4074,52 +4084,52 @@ msgstr "无法添加信息。" msgid "Could not update message with new URI." msgstr "无法添加新URI的信息。" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "添加标签时数据库出错：%s" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "保存通告时出错。" -#: classes/Notice.php:230 +#: classes/Notice.php:229 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "保存通告时出错。" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。" -#: classes/Notice.php:241 +#: classes/Notice.php:240 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "在这个网站你被禁止发布消息。" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "保存通告时出错。" -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "添加回复时数据库出错：%s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: classes/User.php:382 #, fuzzy, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "发送给 %1$s 的 %2$s 消息" @@ -4467,14 +4477,13 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 -#, fuzzy +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 msgid "User has no last notice" msgstr "用户没有通告。" @@ -4483,179 +4492,176 @@ msgid "Notice marked as fave." msgstr "通告被标记为收藏。" #: lib/command.php:217 -#, fuzzy msgid "You are already a member of that group" msgstr "您已经是该组成员" -#: lib/command.php:234 +#: lib/command.php:231 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "无法把 %s 用户添加到 %s 组" -#: lib/command.php:239 +#: lib/command.php:236 #, fuzzy, php-format msgid "%s joined group %s" msgstr "%s 加入 %s 组" -#: lib/command.php:284 +#: lib/command.php:275 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "无法订阅用户：未找到。" -#: lib/command.php:289 -#, fuzzy, php-format +#: lib/command.php:280 +#, php-format msgid "%s left group %s" msgstr "%s 离开群 %s" -#: lib/command.php:318 -#, fuzzy, php-format +#: lib/command.php:309 +#, php-format msgid "Fullname: %s" msgstr "全名：%s" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "位置：%s" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "主页：%s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "关于：%s" -#: lib/command.php:358 +#: lib/command.php:349 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。" -#: lib/command.php:376 -#, fuzzy, php-format +#: lib/command.php:367 +#, php-format msgid "Direct message to %s sent" msgstr "已向 %s 发送消息" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "发送消息出错。" -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "无法开启通告。" -#: lib/command.php:427 +#: lib/command.php:418 #, fuzzy msgid "Already repeated that notice" msgstr "删除通告" -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "消息已发布。" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "保存通告时出错。" -#: lib/command.php:491 +#: lib/command.php:482 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "无法删除通告。" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "保存通告时出错。" -#: lib/command.php:556 -#, fuzzy +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "指定要订阅的用户名" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "订阅 %s" -#: lib/command.php:584 -#, fuzzy +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "指定要取消订阅的用户名" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "取消订阅 %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "命令尚未实现。" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "通告关闭。" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "无法关闭通告。" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "通告开启。" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "无法开启通告。" -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "您未告知此个人信息" -#: lib/command.php:679 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "您已订阅这些用户：" -#: lib/command.php:699 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "无法订阅他人更新。" -#: lib/command.php:701 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "无法订阅他人更新。" -#: lib/command.php:721 +#: lib/command.php:712 #, fuzzy msgid "You are not a member of any groups." msgstr "您未告知此个人信息" -#: lib/command.php:723 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "您未告知此个人信息" -#: lib/command.php:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4696,20 +4702,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "没有验证码" -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 #, fuzzy msgid "Go to the installer." msgstr "登入本站" @@ -4921,11 +4927,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 #, fuzzy msgid "Join" @@ -5250,15 +5261,21 @@ msgstr "" msgid "Share my location" msgstr "无法保存个人信息。" -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "无法保存个人信息。" -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5541,25 +5558,25 @@ msgstr "" msgid "User has blocked you." msgstr "用户没有个人信息。" -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "无法订阅。" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "无法订阅他人更新。" -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "未订阅！" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "无法删除订阅。" -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "无法删除订阅。" @@ -5643,47 +5660,47 @@ msgstr "新消息" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "几秒前" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "一分钟前" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "%d 分钟前" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "一小时前" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "%d 小时前" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "一天前" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "%d 天前" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "一个月前" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "%d 个月前" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "一年前" diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po index 314bd0cdd9..5a65525501 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-01-11 23:25+0000\n" -"PO-Revision-Date: 2010-01-11 23:28:38+0000\n" +"POT-Creation-Date: 2010-01-13 22:04+0000\n" +"PO-Revision-Date: 2010-01-13 22:06:27+0000\n" "Language-Team: Traditional Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha (r60950); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.16alpha (r61027); Translate extension (2010-01-04)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hant\n" "X-Message-Group: out-statusnet\n" @@ -43,10 +43,10 @@ msgstr "無此通知" #: actions/replies.php:73 actions/repliesrss.php:38 #: actions/showfavorites.php:105 actions/userbyid.php:74 #: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 +#: lib/command.php:163 lib/command.php:302 lib/command.php:355 +#: lib/command.php:401 lib/command.php:462 lib/command.php:518 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: lib/subs.php:34 lib/subs.php:125 msgid "No such user." msgstr "無此使用者" @@ -385,7 +385,7 @@ msgstr "" msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:128 +#: actions/apigroupjoin.php:138 actions/joingroup.php:124 #, fuzzy, php-format msgid "Could not join user %1$s to group %2$s." msgstr "無法連結到伺服器:%s" @@ -395,7 +395,7 @@ msgstr "無法連結到伺服器:%s" msgid "You are not a member of this group." msgstr "無法連結到伺服器:%s" -#: actions/apigroupleave.php:124 actions/leavegroup.php:127 +#: actions/apigroupleave.php:124 actions/leavegroup.php:119 #, fuzzy, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "無法從 %s 建立OpenID" @@ -696,7 +696,7 @@ msgstr "" #: actions/grouplogo.php:99 actions/groupmembers.php:83 #: actions/grouprss.php:98 actions/groupunblock.php:86 #: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:263 +#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 #, fuzzy msgid "No such group." msgstr "無此通知" @@ -1671,7 +1671,7 @@ msgstr "" msgid "You are already subscribed to these users:" msgstr "" -#: actions/invite.php:131 actions/invite.php:139 lib/command.php:315 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format msgid "%1$s (%2$s)" msgstr "" @@ -1712,7 +1712,7 @@ msgstr "" msgid "Optionally add a personal message to the invitation." msgstr "" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:237 msgid "Send" msgstr "" @@ -1756,7 +1756,7 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:135 +#: actions/joingroup.php:131 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -1765,15 +1765,11 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:90 lib/command.php:265 msgid "You are not a member of that group." msgstr "" -#: actions/leavegroup.php:119 lib/command.php:278 -msgid "Could not find membership record." -msgstr "" - -#: actions/leavegroup.php:134 +#: actions/leavegroup.php:127 #, fuzzy, php-format msgid "%1$s left group %2$s" msgstr "%1$s的狀態是%2$s" @@ -1870,12 +1866,12 @@ msgstr "" msgid "New message" msgstr "" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "無內容" @@ -1883,7 +1879,7 @@ msgstr "無內容" msgid "No recipient specified." msgstr "" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "" @@ -3911,6 +3907,21 @@ msgstr "" msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "無此通知" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "無法更新使用者" + +#: classes/Group_member.php:60 +#, fuzzy +msgid "Group leave failed." +msgstr "無此通知" + #: classes/Login_token.php:76 #, fuzzy, php-format msgid "Could not create login token for %s" @@ -3928,51 +3939,51 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:172 +#: classes/Notice.php:171 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:225 #, fuzzy msgid "Problem saving notice. Too long." msgstr "儲存使用者發生錯誤" -#: classes/Notice.php:230 +#: classes/Notice.php:229 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "儲存使用者發生錯誤" -#: classes/Notice.php:235 +#: classes/Notice.php:234 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:241 +#: classes/Notice.php:240 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:247 +#: classes/Notice.php:246 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:305 classes/Notice.php:330 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:1034 +#: classes/Notice.php:1052 #, php-format msgid "DB error inserting reply: %s" msgstr "增加回覆時,資料庫發生錯誤: %s" -#: classes/Notice.php:1359 +#: classes/Notice.php:1423 #, php-format msgid "RT @%1$s %2$s" msgstr "" -#: classes/User.php:368 +#: classes/User.php:382 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" @@ -4285,7 +4296,7 @@ msgid "Sorry, this command is not yet implemented." msgstr "" #: lib/command.php:88 -#, fuzzy, php-format +#, php-format msgid "Could not find a user with nickname %s" msgstr "無法更新使用者" @@ -4306,12 +4317,12 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: 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:415 lib/command.php:476 -#: lib/command.php:532 +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 #, fuzzy msgid "User has no last notice" msgstr "新訊息" @@ -4325,172 +4336,172 @@ msgstr "" msgid "You are already a member of that group" msgstr "無法連結到伺服器:%s" -#: lib/command.php:234 +#: lib/command.php:231 #, fuzzy, php-format msgid "Could not join user %s to group %s" msgstr "無法連結到伺服器:%s" -#: lib/command.php:239 +#: lib/command.php:236 #, fuzzy, php-format msgid "%s joined group %s" msgstr "%1$s的狀態是%2$s" -#: lib/command.php:284 +#: lib/command.php:275 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "無法從 %s 建立OpenID" -#: lib/command.php:289 +#: lib/command.php:280 #, fuzzy, php-format msgid "%s left group %s" msgstr "%1$s的狀態是%2$s" -#: lib/command.php:318 +#: lib/command.php:309 #, fuzzy, php-format msgid "Fullname: %s" msgstr "全名" -#: lib/command.php:321 lib/mail.php:254 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "" -#: lib/command.php:324 lib/mail.php:256 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "" -#: lib/command.php:358 +#: lib/command.php:349 #, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:376 +#: lib/command.php:367 #, php-format msgid "Direct message to %s sent" msgstr "" -#: lib/command.php:378 +#: lib/command.php:369 msgid "Error sending direct message." msgstr "" -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "儲存使用者發生錯誤" -#: lib/command.php:427 +#: lib/command.php:418 #, fuzzy msgid "Already repeated that notice" msgstr "無此使用者" -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "更新個人圖像" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "儲存使用者發生錯誤" -#: lib/command.php:491 +#: lib/command.php:482 #, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "&s的微型部落格" -#: lib/command.php:502 +#: lib/command.php:493 msgid "Error saving notice." msgstr "儲存使用者發生錯誤" -#: lib/command.php:556 +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "" -#: lib/command.php:563 +#: lib/command.php:554 #, php-format msgid "Subscribed to %s" msgstr "" -#: lib/command.php:584 +#: lib/command.php:575 msgid "Specify the name of the user to unsubscribe from" msgstr "" -#: lib/command.php:591 +#: lib/command.php:582 #, php-format msgid "Unsubscribed from %s" msgstr "" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:600 lib/command.php:623 msgid "Command not yet implemented." msgstr "" -#: lib/command.php:612 +#: lib/command.php:603 msgid "Notification off." msgstr "" -#: lib/command.php:614 +#: lib/command.php:605 msgid "Can't turn off notification." msgstr "" -#: lib/command.php:635 +#: lib/command.php:626 msgid "Notification on." msgstr "" -#: lib/command.php:637 +#: lib/command.php:628 msgid "Can't turn on notification." msgstr "" -#: lib/command.php:650 +#: lib/command.php:641 msgid "Login command is disabled" msgstr "" -#: lib/command.php:661 +#: lib/command.php:652 #, php-format msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:677 +#: lib/command.php:668 #, fuzzy msgid "You are not subscribed to anyone." msgstr "此帳號已註冊" -#: lib/command.php:679 +#: lib/command.php:670 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "此帳號已註冊" -#: lib/command.php:699 +#: lib/command.php:690 #, fuzzy msgid "No one is subscribed to you." msgstr "無此訂閱" -#: lib/command.php:701 +#: lib/command.php:692 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "無此訂閱" -#: lib/command.php:721 +#: lib/command.php:712 #, fuzzy msgid "You are not a member of any groups." msgstr "無法連結到伺服器:%s" -#: lib/command.php:723 +#: lib/command.php:714 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "無法連結到伺服器:%s" -#: lib/command.php:737 +#: lib/command.php:728 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4531,20 +4542,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:131 #, fuzzy msgid "No configuration file found. " msgstr "無確認碼" -#: lib/common.php:200 +#: lib/common.php:132 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:134 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:135 msgid "Go to the installer." msgstr "" @@ -4748,11 +4759,16 @@ msgstr "" msgid "kB" msgstr "" -#: lib/jabber.php:191 +#: lib/jabber.php:202 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:385 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 #, fuzzy msgid "Join" @@ -5067,15 +5083,21 @@ msgstr "" msgid "Share my location" msgstr "無法儲存個人資料" -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy msgid "Do not share my location" msgstr "無法儲存個人資料" -#: lib/noticeform.php:215 +#: lib/noticeform.php:216 msgid "Hide this info" msgstr "" +#: lib/noticeform.php:217 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"try again later" +msgstr "" + #: lib/noticelist.php:428 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" @@ -5344,25 +5366,25 @@ msgstr "" msgid "User has blocked you." msgstr "" -#: lib/subs.php:60 +#: lib/subs.php:63 msgid "Could not subscribe." msgstr "" -#: lib/subs.php:79 +#: lib/subs.php:82 msgid "Could not subscribe other to you." msgstr "" -#: lib/subs.php:128 +#: lib/subs.php:137 #, fuzzy msgid "Not subscribed!" msgstr "此帳號已註冊" -#: lib/subs.php:133 +#: lib/subs.php:142 #, fuzzy msgid "Couldn't delete self-subscription." msgstr "無法刪除帳號" -#: lib/subs.php:146 +#: lib/subs.php:158 msgid "Couldn't delete subscription." msgstr "無法刪除帳號" @@ -5440,47 +5462,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:884 +#: lib/util.php:877 msgid "a few seconds ago" msgstr "" -#: lib/util.php:886 +#: lib/util.php:879 msgid "about a minute ago" msgstr "" -#: lib/util.php:888 +#: lib/util.php:881 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:890 +#: lib/util.php:883 msgid "about an hour ago" msgstr "" -#: lib/util.php:892 +#: lib/util.php:885 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:894 +#: lib/util.php:887 msgid "about a day ago" msgstr "" -#: lib/util.php:896 +#: lib/util.php:889 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:898 +#: lib/util.php:891 msgid "about a month ago" msgstr "" -#: lib/util.php:900 +#: lib/util.php:893 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:902 +#: lib/util.php:895 msgid "about a year ago" msgstr "" From f7f82982ec9a8671195efdc278c2987aa92c083c Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Wed, 13 Jan 2010 23:09:49 +0100 Subject: [PATCH 3/4] Update line endings --- plugins/CasAuthentication/extlib/CAS.php | 2942 +++++------ .../extlib/CAS/PGTStorage/pgt-db.php | 378 +- .../extlib/CAS/PGTStorage/pgt-file.php | 496 +- .../extlib/CAS/PGTStorage/pgt-main.php | 374 +- .../CasAuthentication/extlib/CAS/client.php | 4588 ++++++++--------- .../extlib/CAS/domxml-php4-php5.php | 552 +- .../extlib/CAS/languages/catalan.php | 54 +- .../extlib/CAS/languages/english.php | 52 +- .../extlib/CAS/languages/french.php | 54 +- .../extlib/CAS/languages/german.php | 52 +- .../extlib/CAS/languages/greek.php | 52 +- .../extlib/CAS/languages/languages.php | 46 +- .../extlib/CAS/languages/spanish.php | 54 +- 13 files changed, 4847 insertions(+), 4847 deletions(-) diff --git a/plugins/CasAuthentication/extlib/CAS.php b/plugins/CasAuthentication/extlib/CAS.php index 59238eb813..f5ea0b12a7 100644 --- a/plugins/CasAuthentication/extlib/CAS.php +++ b/plugins/CasAuthentication/extlib/CAS.php @@ -1,1471 +1,1471 @@ -=')) { - require_once(dirname(__FILE__).'/CAS/domxml-php4-php5.php'); -} - -/** - * @file CAS/CAS.php - * Interface class of the phpCAS library - * - * @ingroup public - */ - -// ######################################################################## -// CONSTANTS -// ######################################################################## - -// ------------------------------------------------------------------------ -// CAS VERSIONS -// ------------------------------------------------------------------------ - -/** - * phpCAS version. accessible for the user by phpCAS::getVersion(). - */ -define('PHPCAS_VERSION','1.0.1'); - -// ------------------------------------------------------------------------ -// CAS VERSIONS -// ------------------------------------------------------------------------ - /** - * @addtogroup public - * @{ - */ - -/** - * CAS version 1.0 - */ -define("CAS_VERSION_1_0",'1.0'); -/*! - * CAS version 2.0 - */ -define("CAS_VERSION_2_0",'2.0'); - -/** @} */ - /** - * @addtogroup publicPGTStorage - * @{ - */ -// ------------------------------------------------------------------------ -// FILE PGT STORAGE -// ------------------------------------------------------------------------ - /** - * Default path used when storing PGT's to file - */ -define("CAS_PGT_STORAGE_FILE_DEFAULT_PATH",'/tmp'); -/** - * phpCAS::setPGTStorageFile()'s 2nd parameter to write plain text files - */ -define("CAS_PGT_STORAGE_FILE_FORMAT_PLAIN",'plain'); -/** - * phpCAS::setPGTStorageFile()'s 2nd parameter to write xml files - */ -define("CAS_PGT_STORAGE_FILE_FORMAT_XML",'xml'); -/** - * Default format used when storing PGT's to file - */ -define("CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT",CAS_PGT_STORAGE_FILE_FORMAT_PLAIN); -// ------------------------------------------------------------------------ -// DATABASE PGT STORAGE -// ------------------------------------------------------------------------ - /** - * default database type when storing PGT's to database - */ -define("CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE",'mysql'); -/** - * default host when storing PGT's to database - */ -define("CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME",'localhost'); -/** - * default port when storing PGT's to database - */ -define("CAS_PGT_STORAGE_DB_DEFAULT_PORT",''); -/** - * default database when storing PGT's to database - */ -define("CAS_PGT_STORAGE_DB_DEFAULT_DATABASE",'phpCAS'); -/** - * default table when storing PGT's to database - */ -define("CAS_PGT_STORAGE_DB_DEFAULT_TABLE",'pgt'); - -/** @} */ -// ------------------------------------------------------------------------ -// SERVICE ACCESS ERRORS -// ------------------------------------------------------------------------ - /** - * @addtogroup publicServices - * @{ - */ - -/** - * phpCAS::service() error code on success - */ -define("PHPCAS_SERVICE_OK",0); -/** - * phpCAS::service() error code when the PT could not retrieve because - * the CAS server did not respond. - */ -define("PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE",1); -/** - * phpCAS::service() error code when the PT could not retrieve because - * the response of the CAS server was ill-formed. - */ -define("PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE",2); -/** - * phpCAS::service() error code when the PT could not retrieve because - * the CAS server did not want to. - */ -define("PHPCAS_SERVICE_PT_FAILURE",3); -/** - * phpCAS::service() error code when the service was not available. - */ -define("PHPCAS_SERVICE_NOT AVAILABLE",4); - -/** @} */ -// ------------------------------------------------------------------------ -// LANGUAGES -// ------------------------------------------------------------------------ - /** - * @addtogroup publicLang - * @{ - */ - -define("PHPCAS_LANG_ENGLISH", 'english'); -define("PHPCAS_LANG_FRENCH", 'french'); -define("PHPCAS_LANG_GREEK", 'greek'); -define("PHPCAS_LANG_GERMAN", 'german'); -define("PHPCAS_LANG_JAPANESE", 'japanese'); -define("PHPCAS_LANG_SPANISH", 'spanish'); -define("PHPCAS_LANG_CATALAN", 'catalan'); - -/** @} */ - -/** - * @addtogroup internalLang - * @{ - */ - -/** - * phpCAS default language (when phpCAS::setLang() is not used) - */ -define("PHPCAS_LANG_DEFAULT", PHPCAS_LANG_ENGLISH); - -/** @} */ -// ------------------------------------------------------------------------ -// DEBUG -// ------------------------------------------------------------------------ - /** - * @addtogroup publicDebug - * @{ - */ - -/** - * The default directory for the debug file under Unix. - */ -define('DEFAULT_DEBUG_DIR','/tmp/'); - -/** @} */ -// ------------------------------------------------------------------------ -// MISC -// ------------------------------------------------------------------------ - /** - * @addtogroup internalMisc - * @{ - */ - -/** - * This global variable is used by the interface class phpCAS. - * - * @hideinitializer - */ -$GLOBALS['PHPCAS_CLIENT'] = null; - -/** - * This global variable is used to store where the initializer is called from - * (to print a comprehensive error in case of multiple calls). - * - * @hideinitializer - */ -$GLOBALS['PHPCAS_INIT_CALL'] = array('done' => FALSE, - 'file' => '?', - 'line' => -1, - 'method' => '?'); - -/** - * This global variable is used to store where the method checking - * the authentication is called from (to print comprehensive errors) - * - * @hideinitializer - */ -$GLOBALS['PHPCAS_AUTH_CHECK_CALL'] = array('done' => FALSE, - 'file' => '?', - 'line' => -1, - 'method' => '?', - 'result' => FALSE); - -/** - * This global variable is used to store phpCAS debug mode. - * - * @hideinitializer - */ -$GLOBALS['PHPCAS_DEBUG'] = array('filename' => FALSE, - 'indent' => 0, - 'unique_id' => ''); - -/** @} */ - -// ######################################################################## -// CLIENT CLASS -// ######################################################################## - -// include client class -include_once(dirname(__FILE__).'/CAS/client.php'); - -// ######################################################################## -// INTERFACE CLASS -// ######################################################################## - -/** - * @class phpCAS - * The phpCAS class is a simple container for the phpCAS library. It provides CAS - * authentication for web applications written in PHP. - * - * @ingroup public - * @author Pascal Aubry - * - * \internal All its methods access the same object ($PHPCAS_CLIENT, declared - * at the end of CAS/client.php). - */ - - - -class phpCAS -{ - - // ######################################################################## - // INITIALIZATION - // ######################################################################## - - /** - * @addtogroup publicInit - * @{ - */ - - /** - * phpCAS client initializer. - * @note Only one of the phpCAS::client() and phpCAS::proxy functions should be - * called, only once, and before all other methods (except phpCAS::getVersion() - * and phpCAS::setDebug()). - * - * @param $server_version the version of the CAS server - * @param $server_hostname the hostname of the CAS server - * @param $server_port the port the CAS server is running on - * @param $server_uri the URI the CAS server is responding on - * @param $start_session Have phpCAS start PHP sessions (default true) - * - * @return a newly created CASClient object - */ - function client($server_version, - $server_hostname, - $server_port, - $server_uri, - $start_session = true) - { - global $PHPCAS_CLIENT, $PHPCAS_INIT_CALL; - - phpCAS::traceBegin(); - if ( is_object($PHPCAS_CLIENT) ) { - phpCAS::error($PHPCAS_INIT_CALL['method'].'() has already been called (at '.$PHPCAS_INIT_CALL['file'].':'.$PHPCAS_INIT_CALL['line'].')'); - } - if ( gettype($server_version) != 'string' ) { - phpCAS::error('type mismatched for parameter $server_version (should be `string\')'); - } - if ( gettype($server_hostname) != 'string' ) { - phpCAS::error('type mismatched for parameter $server_hostname (should be `string\')'); - } - if ( gettype($server_port) != 'integer' ) { - phpCAS::error('type mismatched for parameter $server_port (should be `integer\')'); - } - if ( gettype($server_uri) != 'string' ) { - phpCAS::error('type mismatched for parameter $server_uri (should be `string\')'); - } - - // store where the initialzer is called from - $dbg = phpCAS::backtrace(); - $PHPCAS_INIT_CALL = array('done' => TRUE, - 'file' => $dbg[0]['file'], - 'line' => $dbg[0]['line'], - 'method' => __CLASS__.'::'.__FUNCTION__); - - // initialize the global object $PHPCAS_CLIENT - $PHPCAS_CLIENT = new CASClient($server_version,FALSE/*proxy*/,$server_hostname,$server_port,$server_uri,$start_session); - phpCAS::traceEnd(); - } - - /** - * phpCAS proxy initializer. - * @note Only one of the phpCAS::client() and phpCAS::proxy functions should be - * called, only once, and before all other methods (except phpCAS::getVersion() - * and phpCAS::setDebug()). - * - * @param $server_version the version of the CAS server - * @param $server_hostname the hostname of the CAS server - * @param $server_port the port the CAS server is running on - * @param $server_uri the URI the CAS server is responding on - * @param $start_session Have phpCAS start PHP sessions (default true) - * - * @return a newly created CASClient object - */ - function proxy($server_version, - $server_hostname, - $server_port, - $server_uri, - $start_session = true) - { - global $PHPCAS_CLIENT, $PHPCAS_INIT_CALL; - - phpCAS::traceBegin(); - if ( is_object($PHPCAS_CLIENT) ) { - phpCAS::error($PHPCAS_INIT_CALL['method'].'() has already been called (at '.$PHPCAS_INIT_CALL['file'].':'.$PHPCAS_INIT_CALL['line'].')'); - } - if ( gettype($server_version) != 'string' ) { - phpCAS::error('type mismatched for parameter $server_version (should be `string\')'); - } - if ( gettype($server_hostname) != 'string' ) { - phpCAS::error('type mismatched for parameter $server_hostname (should be `string\')'); - } - if ( gettype($server_port) != 'integer' ) { - phpCAS::error('type mismatched for parameter $server_port (should be `integer\')'); - } - if ( gettype($server_uri) != 'string' ) { - phpCAS::error('type mismatched for parameter $server_uri (should be `string\')'); - } - - // store where the initialzer is called from - $dbg = phpCAS::backtrace(); - $PHPCAS_INIT_CALL = array('done' => TRUE, - 'file' => $dbg[0]['file'], - 'line' => $dbg[0]['line'], - 'method' => __CLASS__.'::'.__FUNCTION__); - - // initialize the global object $PHPCAS_CLIENT - $PHPCAS_CLIENT = new CASClient($server_version,TRUE/*proxy*/,$server_hostname,$server_port,$server_uri,$start_session); - phpCAS::traceEnd(); - } - - /** @} */ - // ######################################################################## - // DEBUGGING - // ######################################################################## - - /** - * @addtogroup publicDebug - * @{ - */ - - /** - * Set/unset debug mode - * - * @param $filename the name of the file used for logging, or FALSE to stop debugging. - */ - function setDebug($filename='') - { - global $PHPCAS_DEBUG; - - if ( $filename != FALSE && gettype($filename) != 'string' ) { - phpCAS::error('type mismatched for parameter $dbg (should be FALSE or the name of the log file)'); - } - - if ( empty($filename) ) { - if ( preg_match('/^Win.*/',getenv('OS')) ) { - if ( isset($_ENV['TMP']) ) { - $debugDir = $_ENV['TMP'].'/'; - } else if ( isset($_ENV['TEMP']) ) { - $debugDir = $_ENV['TEMP'].'/'; - } else { - $debugDir = ''; - } - } else { - $debugDir = DEFAULT_DEBUG_DIR; - } - $filename = $debugDir . 'phpCAS.log'; - } - - if ( empty($PHPCAS_DEBUG['unique_id']) ) { - $PHPCAS_DEBUG['unique_id'] = substr(strtoupper(md5(uniqid(''))),0,4); - } - - $PHPCAS_DEBUG['filename'] = $filename; - - phpCAS::trace('START ******************'); - } - - /** @} */ - /** - * @addtogroup internalDebug - * @{ - */ - - /** - * This method is a wrapper for debug_backtrace() that is not available - * in all PHP versions (>= 4.3.0 only) - */ - function backtrace() - { - if ( function_exists('debug_backtrace') ) { - return debug_backtrace(); - } else { - // poor man's hack ... but it does work ... - return array(); - } - } - - /** - * Logs a string in debug mode. - * - * @param $str the string to write - * - * @private - */ - function log($str) - { - $indent_str = "."; - global $PHPCAS_DEBUG; - - if ( $PHPCAS_DEBUG['filename'] ) { - for ($i=0;$i<$PHPCAS_DEBUG['indent'];$i++) { - $indent_str .= '| '; - } - error_log($PHPCAS_DEBUG['unique_id'].' '.$indent_str.$str."\n",3,$PHPCAS_DEBUG['filename']); - } - - } - - /** - * This method is used by interface methods to print an error and where the function - * was originally called from. - * - * @param $msg the message to print - * - * @private - */ - function error($msg) - { - $dbg = phpCAS::backtrace(); - $function = '?'; - $file = '?'; - $line = '?'; - if ( is_array($dbg) ) { - for ( $i=1; $i\nphpCAS error: ".__CLASS__."::".$function.'(): '.htmlentities($msg)." in ".$file." on line ".$line."
\n"; - phpCAS::trace($msg); - phpCAS::traceExit(); - exit(); - } - - /** - * This method is used to log something in debug mode. - */ - function trace($str) - { - $dbg = phpCAS::backtrace(); - phpCAS::log($str.' ['.basename($dbg[1]['file']).':'.$dbg[1]['line'].']'); - } - - /** - * This method is used to indicate the start of the execution of a function in debug mode. - */ - function traceBegin() - { - global $PHPCAS_DEBUG; - - $dbg = phpCAS::backtrace(); - $str = '=> '; - if ( !empty($dbg[2]['class']) ) { - $str .= $dbg[2]['class'].'::'; - } - $str .= $dbg[2]['function'].'('; - if ( is_array($dbg[2]['args']) ) { - foreach ($dbg[2]['args'] as $index => $arg) { - if ( $index != 0 ) { - $str .= ', '; - } - $str .= str_replace("\n","",var_export($arg,TRUE)); - } - } - $str .= ') ['.basename($dbg[2]['file']).':'.$dbg[2]['line'].']'; - phpCAS::log($str); - $PHPCAS_DEBUG['indent'] ++; - } - - /** - * This method is used to indicate the end of the execution of a function in debug mode. - * - * @param $res the result of the function - */ - function traceEnd($res='') - { - global $PHPCAS_DEBUG; - - $PHPCAS_DEBUG['indent'] --; - $dbg = phpCAS::backtrace(); - $str = ''; - $str .= '<= '.str_replace("\n","",var_export($res,TRUE)); - phpCAS::log($str); - } - - /** - * This method is used to indicate the end of the execution of the program - */ - function traceExit() - { - global $PHPCAS_DEBUG; - - phpCAS::log('exit()'); - while ( $PHPCAS_DEBUG['indent'] > 0 ) { - phpCAS::log('-'); - $PHPCAS_DEBUG['indent'] --; - } - } - - /** @} */ - // ######################################################################## - // INTERNATIONALIZATION - // ######################################################################## - /** - * @addtogroup publicLang - * @{ - */ - - /** - * This method is used to set the language used by phpCAS. - * @note Can be called only once. - * - * @param $lang a string representing the language. - * - * @sa PHPCAS_LANG_FRENCH, PHPCAS_LANG_ENGLISH - */ - function setLang($lang) - { - global $PHPCAS_CLIENT; - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); - } - if ( gettype($lang) != 'string' ) { - phpCAS::error('type mismatched for parameter $lang (should be `string\')'); - } - $PHPCAS_CLIENT->setLang($lang); - } - - /** @} */ - // ######################################################################## - // VERSION - // ######################################################################## - /** - * @addtogroup public - * @{ - */ - - /** - * This method returns the phpCAS version. - * - * @return the phpCAS version. - */ - function getVersion() - { - return PHPCAS_VERSION; - } - - /** @} */ - // ######################################################################## - // HTML OUTPUT - // ######################################################################## - /** - * @addtogroup publicOutput - * @{ - */ - - /** - * This method sets the HTML header used for all outputs. - * - * @param $header the HTML header. - */ - function setHTMLHeader($header) - { - global $PHPCAS_CLIENT; - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); - } - if ( gettype($header) != 'string' ) { - phpCAS::error('type mismatched for parameter $header (should be `string\')'); - } - $PHPCAS_CLIENT->setHTMLHeader($header); - } - - /** - * This method sets the HTML footer used for all outputs. - * - * @param $footer the HTML footer. - */ - function setHTMLFooter($footer) - { - global $PHPCAS_CLIENT; - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); - } - if ( gettype($footer) != 'string' ) { - phpCAS::error('type mismatched for parameter $footer (should be `string\')'); - } - $PHPCAS_CLIENT->setHTMLFooter($footer); - } - - /** @} */ - // ######################################################################## - // PGT STORAGE - // ######################################################################## - /** - * @addtogroup publicPGTStorage - * @{ - */ - - /** - * This method is used to tell phpCAS to store the response of the - * CAS server to PGT requests onto the filesystem. - * - * @param $format the format used to store the PGT's (`plain' and `xml' allowed) - * @param $path the path where the PGT's should be stored - */ - function setPGTStorageFile($format='', - $path='') - { - global $PHPCAS_CLIENT,$PHPCAS_AUTH_CHECK_CALL; - - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); - } - if ( !$PHPCAS_CLIENT->isProxy() ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); - } - if ( $PHPCAS_AUTH_CHECK_CALL['done'] ) { - phpCAS::error('this method should only be called before '.$PHPCAS_AUTH_CHECK_CALL['method'].'() (called at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].')'); - } - if ( gettype($format) != 'string' ) { - phpCAS::error('type mismatched for parameter $format (should be `string\')'); - } - if ( gettype($path) != 'string' ) { - phpCAS::error('type mismatched for parameter $format (should be `string\')'); - } - $PHPCAS_CLIENT->setPGTStorageFile($format,$path); - phpCAS::traceEnd(); - } - - /** - * This method is used to tell phpCAS to store the response of the - * CAS server to PGT requests into a database. - * @note The connection to the database is done only when needed. - * As a consequence, bad parameters are detected only when - * initializing PGT storage, except in debug mode. - * - * @param $user the user to access the data with - * @param $password the user's password - * @param $database_type the type of the database hosting the data - * @param $hostname the server hosting the database - * @param $port the port the server is listening on - * @param $database the name of the database - * @param $table the name of the table storing the data - */ - function setPGTStorageDB($user, - $password, - $database_type='', - $hostname='', - $port=0, - $database='', - $table='') - { - global $PHPCAS_CLIENT,$PHPCAS_AUTH_CHECK_CALL; - - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); - } - if ( !$PHPCAS_CLIENT->isProxy() ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); - } - if ( $PHPCAS_AUTH_CHECK_CALL['done'] ) { - phpCAS::error('this method should only be called before '.$PHPCAS_AUTH_CHECK_CALL['method'].'() (called at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].')'); - } - if ( gettype($user) != 'string' ) { - phpCAS::error('type mismatched for parameter $user (should be `string\')'); - } - if ( gettype($password) != 'string' ) { - phpCAS::error('type mismatched for parameter $password (should be `string\')'); - } - if ( gettype($database_type) != 'string' ) { - phpCAS::error('type mismatched for parameter $database_type (should be `string\')'); - } - if ( gettype($hostname) != 'string' ) { - phpCAS::error('type mismatched for parameter $hostname (should be `string\')'); - } - if ( gettype($port) != 'integer' ) { - phpCAS::error('type mismatched for parameter $port (should be `integer\')'); - } - if ( gettype($database) != 'string' ) { - phpCAS::error('type mismatched for parameter $database (should be `string\')'); - } - if ( gettype($table) != 'string' ) { - phpCAS::error('type mismatched for parameter $table (should be `string\')'); - } - $PHPCAS_CLIENT->setPGTStorageDB($this,$user,$password,$hostname,$port,$database,$table); - phpCAS::traceEnd(); - } - - /** @} */ - // ######################################################################## - // ACCESS TO EXTERNAL SERVICES - // ######################################################################## - /** - * @addtogroup publicServices - * @{ - */ - - /** - * This method is used to access an HTTP[S] service. - * - * @param $url the service to access. - * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on - * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE, - * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE. - * @param $output the output of the service (also used to give an error - * message on failure). - * - * @return TRUE on success, FALSE otherwise (in this later case, $err_code - * gives the reason why it failed and $output contains an error message). - */ - function serviceWeb($url,&$err_code,&$output) - { - global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; - - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); - } - if ( !$PHPCAS_CLIENT->isProxy() ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); - } - if ( !$PHPCAS_AUTH_CHECK_CALL['done'] ) { - phpCAS::error('this method should only be called after the programmer is sure the user has been authenticated (by calling '.__CLASS__.'::checkAuthentication() or '.__CLASS__.'::forceAuthentication()'); - } - if ( !$PHPCAS_AUTH_CHECK_CALL['result'] ) { - phpCAS::error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE'); - } - if ( gettype($url) != 'string' ) { - phpCAS::error('type mismatched for parameter $url (should be `string\')'); - } - - $res = $PHPCAS_CLIENT->serviceWeb($url,$err_code,$output); - - phpCAS::traceEnd($res); - return $res; - } - - /** - * This method is used to access an IMAP/POP3/NNTP service. - * - * @param $url a string giving the URL of the service, including the mailing box - * for IMAP URLs, as accepted by imap_open(). - * @param $flags options given to imap_open(). - * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on - * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE, - * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE. - * @param $err_msg an error message on failure - * @param $pt the Proxy Ticket (PT) retrieved from the CAS server to access the URL - * on success, FALSE on error). - * - * @return an IMAP stream on success, FALSE otherwise (in this later case, $err_code - * gives the reason why it failed and $err_msg contains an error message). - */ - function serviceMail($url,$flags,&$err_code,&$err_msg,&$pt) - { - global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; - - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); - } - if ( !$PHPCAS_CLIENT->isProxy() ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); - } - if ( !$PHPCAS_AUTH_CHECK_CALL['done'] ) { - phpCAS::error('this method should only be called after the programmer is sure the user has been authenticated (by calling '.__CLASS__.'::checkAuthentication() or '.__CLASS__.'::forceAuthentication()'); - } - if ( !$PHPCAS_AUTH_CHECK_CALL['result'] ) { - phpCAS::error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE'); - } - if ( gettype($url) != 'string' ) { - phpCAS::error('type mismatched for parameter $url (should be `string\')'); - } - - if ( gettype($flags) != 'integer' ) { - phpCAS::error('type mismatched for parameter $flags (should be `integer\')'); - } - - $res = $PHPCAS_CLIENT->serviceMail($url,$flags,$err_code,$err_msg,$pt); - - phpCAS::traceEnd($res); - return $res; - } - - /** @} */ - // ######################################################################## - // AUTHENTICATION - // ######################################################################## - /** - * @addtogroup publicAuth - * @{ - */ - - /** - * Set the times authentication will be cached before really accessing the CAS server in gateway mode: - * - -1: check only once, and then never again (until you pree login) - * - 0: always check - * - n: check every "n" time - * - * @param $n an integer. - */ - function setCacheTimesForAuthRecheck($n) - { - global $PHPCAS_CLIENT; - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); - } - if ( gettype($n) != 'integer' ) { - phpCAS::error('type mismatched for parameter $header (should be `string\')'); - } - $PHPCAS_CLIENT->setCacheTimesForAuthRecheck($n); - } - - /** - * This method is called to check if the user is authenticated (use the gateway feature). - * @return TRUE when the user is authenticated; otherwise FALSE. - */ - function checkAuthentication() - { - global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; - - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); - } - - $auth = $PHPCAS_CLIENT->checkAuthentication(); - - // store where the authentication has been checked and the result - $dbg = phpCAS::backtrace(); - $PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE, - 'file' => $dbg[0]['file'], - 'line' => $dbg[0]['line'], - 'method' => __CLASS__.'::'.__FUNCTION__, - 'result' => $auth ); - phpCAS::traceEnd($auth); - return $auth; - } - - /** - * This method is called to force authentication if the user was not already - * authenticated. If the user is not authenticated, halt by redirecting to - * the CAS server. - */ - function forceAuthentication() - { - global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; - - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); - } - - $auth = $PHPCAS_CLIENT->forceAuthentication(); - - // store where the authentication has been checked and the result - $dbg = phpCAS::backtrace(); - $PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE, - 'file' => $dbg[0]['file'], - 'line' => $dbg[0]['line'], - 'method' => __CLASS__.'::'.__FUNCTION__, - 'result' => $auth ); - - if ( !$auth ) { - phpCAS::trace('user is not authenticated, redirecting to the CAS server'); - $PHPCAS_CLIENT->forceAuthentication(); - } else { - phpCAS::trace('no need to authenticate (user `'.phpCAS::getUser().'\' is already authenticated)'); - } - - phpCAS::traceEnd(); - return $auth; - } - - /** - * This method is called to renew the authentication. - **/ - function renewAuthentication() { - global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; - - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should not be called before'.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); - } - - // store where the authentication has been checked and the result - $dbg = phpCAS::backtrace(); - $PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE, 'file' => $dbg[0]['file'], 'line' => $dbg[0]['line'], 'method' => __CLASS__.'::'.__FUNCTION__, 'result' => $auth ); - - $PHPCAS_CLIENT->renewAuthentication(); - phpCAS::traceEnd(); - } - - /** - * This method has been left from version 0.4.1 for compatibility reasons. - */ - function authenticate() - { - phpCAS::error('this method is deprecated. You should use '.__CLASS__.'::forceAuthentication() instead'); - } - - /** - * This method is called to check if the user is authenticated (previously or by - * tickets given in the URL). - * - * @return TRUE when the user is authenticated. - */ - function isAuthenticated() - { - global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; - - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); - } - - // call the isAuthenticated method of the global $PHPCAS_CLIENT object - $auth = $PHPCAS_CLIENT->isAuthenticated(); - - // store where the authentication has been checked and the result - $dbg = phpCAS::backtrace(); - $PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE, - 'file' => $dbg[0]['file'], - 'line' => $dbg[0]['line'], - 'method' => __CLASS__.'::'.__FUNCTION__, - 'result' => $auth ); - phpCAS::traceEnd($auth); - return $auth; - } - - /** - * Checks whether authenticated based on $_SESSION. Useful to avoid - * server calls. - * @return true if authenticated, false otherwise. - * @since 0.4.22 by Brendan Arnold - */ - function isSessionAuthenticated () - { - global $PHPCAS_CLIENT; - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); - } - return($PHPCAS_CLIENT->isSessionAuthenticated()); - } - - /** - * This method returns the CAS user's login name. - * @warning should not be called only after phpCAS::forceAuthentication() - * or phpCAS::checkAuthentication(). - * - * @return the login name of the authenticated user - */ - function getUser() - { - global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); - } - if ( !$PHPCAS_AUTH_CHECK_CALL['done'] ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()'); - } - if ( !$PHPCAS_AUTH_CHECK_CALL['result'] ) { - phpCAS::error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE'); - } - return $PHPCAS_CLIENT->getUser(); - } - - /** - * Handle logout requests. - */ - function handleLogoutRequests($check_client=true, $allowed_clients=false) - { - global $PHPCAS_CLIENT; - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); - } - return($PHPCAS_CLIENT->handleLogoutRequests($check_client, $allowed_clients)); - } - - /** - * This method returns the URL to be used to login. - * or phpCAS::isAuthenticated(). - * - * @return the login name of the authenticated user - */ - function getServerLoginURL() - { - global $PHPCAS_CLIENT; - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); - } - return $PHPCAS_CLIENT->getServerLoginURL(); - } - - /** - * Set the login URL of the CAS server. - * @param $url the login URL - * @since 0.4.21 by Wyman Chan - */ - function setServerLoginURL($url='') - { - global $PHPCAS_CLIENT; - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should only be called after - '.__CLASS__.'::client()'); - } - if ( gettype($url) != 'string' ) { - phpCAS::error('type mismatched for parameter $url (should be - `string\')'); - } - $PHPCAS_CLIENT->setServerLoginURL($url); - phpCAS::traceEnd(); - } - - /** - * This method returns the URL to be used to login. - * or phpCAS::isAuthenticated(). - * - * @return the login name of the authenticated user - */ - function getServerLogoutURL() - { - global $PHPCAS_CLIENT; - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); - } - return $PHPCAS_CLIENT->getServerLogoutURL(); - } - - /** - * Set the logout URL of the CAS server. - * @param $url the logout URL - * @since 0.4.21 by Wyman Chan - */ - function setServerLogoutURL($url='') - { - global $PHPCAS_CLIENT; - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should only be called after - '.__CLASS__.'::client()'); - } - if ( gettype($url) != 'string' ) { - phpCAS::error('type mismatched for parameter $url (should be - `string\')'); - } - $PHPCAS_CLIENT->setServerLogoutURL($url); - phpCAS::traceEnd(); - } - - /** - * This method is used to logout from CAS. - * @params $params an array that contains the optional url and service parameters that will be passed to the CAS server - * @public - */ - function logout($params = "") { - global $PHPCAS_CLIENT; - phpCAS::traceBegin(); - if (!is_object($PHPCAS_CLIENT)) { - phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); - } - $parsedParams = array(); - if ($params != "") { - if (is_string($params)) { - phpCAS::error('method `phpCAS::logout($url)\' is now deprecated, use `phpCAS::logoutWithUrl($url)\' instead'); - } - if (!is_array($params)) { - phpCAS::error('type mismatched for parameter $params (should be `array\')'); - } - foreach ($params as $key => $value) { - if ($key != "service" && $key != "url") { - phpCAS::error('only `url\' and `service\' parameters are allowed for method `phpCAS::logout($params)\''); - } - $parsedParams[$key] = $value; - } - } - $PHPCAS_CLIENT->logout($parsedParams); - // never reached - phpCAS::traceEnd(); - } - - /** - * This method is used to logout from CAS. Halts by redirecting to the CAS server. - * @param $service a URL that will be transmitted to the CAS server - */ - function logoutWithRedirectService($service) { - global $PHPCAS_CLIENT; - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); - } - if (!is_string($service)) { - phpCAS::error('type mismatched for parameter $service (should be `string\')'); - } - $PHPCAS_CLIENT->logout(array("service" => $service)); - // never reached - phpCAS::traceEnd(); - } - - /** - * This method is used to logout from CAS. Halts by redirecting to the CAS server. - * @param $url a URL that will be transmitted to the CAS server - */ - function logoutWithUrl($url) { - global $PHPCAS_CLIENT; - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); - } - if (!is_string($url)) { - phpCAS::error('type mismatched for parameter $url (should be `string\')'); - } - $PHPCAS_CLIENT->logout(array("url" => $url)); - // never reached - phpCAS::traceEnd(); - } - - /** - * This method is used to logout from CAS. Halts by redirecting to the CAS server. - * @param $service a URL that will be transmitted to the CAS server - * @param $url a URL that will be transmitted to the CAS server - */ - function logoutWithRedirectServiceAndUrl($service, $url) { - global $PHPCAS_CLIENT; - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); - } - if (!is_string($service)) { - phpCAS::error('type mismatched for parameter $service (should be `string\')'); - } - if (!is_string($url)) { - phpCAS::error('type mismatched for parameter $url (should be `string\')'); - } - $PHPCAS_CLIENT->logout(array("service" => $service, "url" => $url)); - // never reached - phpCAS::traceEnd(); - } - - /** - * Set the fixed URL that will be used by the CAS server to transmit the PGT. - * When this method is not called, a phpCAS script uses its own URL for the callback. - * - * @param $url the URL - */ - function setFixedCallbackURL($url='') - { - global $PHPCAS_CLIENT; - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); - } - if ( !$PHPCAS_CLIENT->isProxy() ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); - } - if ( gettype($url) != 'string' ) { - phpCAS::error('type mismatched for parameter $url (should be `string\')'); - } - $PHPCAS_CLIENT->setCallbackURL($url); - phpCAS::traceEnd(); - } - - /** - * Set the fixed URL that will be set as the CAS service parameter. When this - * method is not called, a phpCAS script uses its own URL. - * - * @param $url the URL - */ - function setFixedServiceURL($url) - { - global $PHPCAS_CLIENT; - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); - } - if ( gettype($url) != 'string' ) { - phpCAS::error('type mismatched for parameter $url (should be `string\')'); - } - $PHPCAS_CLIENT->setURL($url); - phpCAS::traceEnd(); - } - - /** - * Get the URL that is set as the CAS service parameter. - */ - function getServiceURL() - { - global $PHPCAS_CLIENT; - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); - } - return($PHPCAS_CLIENT->getURL()); - } - - /** - * Retrieve a Proxy Ticket from the CAS server. - */ - function retrievePT($target_service,&$err_code,&$err_msg) - { - global $PHPCAS_CLIENT; - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); - } - if ( gettype($target_service) != 'string' ) { - phpCAS::error('type mismatched for parameter $target_service(should be `string\')'); - } - return($PHPCAS_CLIENT->retrievePT($target_service,$err_code,$err_msg)); - } - - /** - * Set the certificate of the CAS server. - * - * @param $cert the PEM certificate - */ - function setCasServerCert($cert) - { - global $PHPCAS_CLIENT; - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); - } - if ( gettype($cert) != 'string' ) { - phpCAS::error('type mismatched for parameter $cert (should be `string\')'); - } - $PHPCAS_CLIENT->setCasServerCert($cert); - phpCAS::traceEnd(); - } - - /** - * Set the certificate of the CAS server CA. - * - * @param $cert the CA certificate - */ - function setCasServerCACert($cert) - { - global $PHPCAS_CLIENT; - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); - } - if ( gettype($cert) != 'string' ) { - phpCAS::error('type mismatched for parameter $cert (should be `string\')'); - } - $PHPCAS_CLIENT->setCasServerCACert($cert); - phpCAS::traceEnd(); - } - - /** - * Set no SSL validation for the CAS server. - */ - function setNoCasServerValidation() - { - global $PHPCAS_CLIENT; - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); - } - $PHPCAS_CLIENT->setNoCasServerValidation(); - phpCAS::traceEnd(); - } - - /** @} */ - - /** - * Change CURL options. - * CURL is used to connect through HTTPS to CAS server - * @param $key the option key - * @param $value the value to set - */ - function setExtraCurlOption($key, $value) - { - global $PHPCAS_CLIENT; - phpCAS::traceBegin(); - if ( !is_object($PHPCAS_CLIENT) ) { - phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); - } - $PHPCAS_CLIENT->setExtraCurlOption($key, $value); - phpCAS::traceEnd(); - } - -} - -// ######################################################################## -// DOCUMENTATION -// ######################################################################## - -// ######################################################################## -// MAIN PAGE - -/** - * @mainpage - * - * The following pages only show the source documentation. - * - */ - -// ######################################################################## -// MODULES DEFINITION - -/** @defgroup public User interface */ - -/** @defgroup publicInit Initialization - * @ingroup public */ - -/** @defgroup publicAuth Authentication - * @ingroup public */ - -/** @defgroup publicServices Access to external services - * @ingroup public */ - -/** @defgroup publicConfig Configuration - * @ingroup public */ - -/** @defgroup publicLang Internationalization - * @ingroup publicConfig */ - -/** @defgroup publicOutput HTML output - * @ingroup publicConfig */ - -/** @defgroup publicPGTStorage PGT storage - * @ingroup publicConfig */ - -/** @defgroup publicDebug Debugging - * @ingroup public */ - - -/** @defgroup internal Implementation */ - -/** @defgroup internalAuthentication Authentication - * @ingroup internal */ - -/** @defgroup internalBasic CAS Basic client features (CAS 1.0, Service Tickets) - * @ingroup internal */ - -/** @defgroup internalProxy CAS Proxy features (CAS 2.0, Proxy Granting Tickets) - * @ingroup internal */ - -/** @defgroup internalPGTStorage PGT storage - * @ingroup internalProxy */ - -/** @defgroup internalPGTStorageDB PGT storage in a database - * @ingroup internalPGTStorage */ - -/** @defgroup internalPGTStorageFile PGT storage on the filesystem - * @ingroup internalPGTStorage */ - -/** @defgroup internalCallback Callback from the CAS server - * @ingroup internalProxy */ - -/** @defgroup internalProxied CAS proxied client features (CAS 2.0, Proxy Tickets) - * @ingroup internal */ - -/** @defgroup internalConfig Configuration - * @ingroup internal */ - -/** @defgroup internalOutput HTML output - * @ingroup internalConfig */ - -/** @defgroup internalLang Internationalization - * @ingroup internalConfig - * - * To add a new language: - * - 1. define a new constant PHPCAS_LANG_XXXXXX in CAS/CAS.php - * - 2. copy any file from CAS/languages to CAS/languages/XXXXXX.php - * - 3. Make the translations - */ - -/** @defgroup internalDebug Debugging - * @ingroup internal */ - -/** @defgroup internalMisc Miscellaneous - * @ingroup internal */ - -// ######################################################################## -// EXAMPLES - -/** - * @example example_simple.php - */ - /** - * @example example_proxy.php - */ - /** - * @example example_proxy2.php - */ - /** - * @example example_lang.php - */ - /** - * @example example_html.php - */ - /** - * @example example_file.php - */ - /** - * @example example_db.php - */ - /** - * @example example_service.php - */ - /** - * @example example_session_proxy.php - */ - /** - * @example example_session_service.php - */ - /** - * @example example_gateway.php - */ - - - -?> +=')) { + require_once(dirname(__FILE__).'/CAS/domxml-php4-php5.php'); +} + +/** + * @file CAS/CAS.php + * Interface class of the phpCAS library + * + * @ingroup public + */ + +// ######################################################################## +// CONSTANTS +// ######################################################################## + +// ------------------------------------------------------------------------ +// CAS VERSIONS +// ------------------------------------------------------------------------ + +/** + * phpCAS version. accessible for the user by phpCAS::getVersion(). + */ +define('PHPCAS_VERSION','1.0.1'); + +// ------------------------------------------------------------------------ +// CAS VERSIONS +// ------------------------------------------------------------------------ + /** + * @addtogroup public + * @{ + */ + +/** + * CAS version 1.0 + */ +define("CAS_VERSION_1_0",'1.0'); +/*! + * CAS version 2.0 + */ +define("CAS_VERSION_2_0",'2.0'); + +/** @} */ + /** + * @addtogroup publicPGTStorage + * @{ + */ +// ------------------------------------------------------------------------ +// FILE PGT STORAGE +// ------------------------------------------------------------------------ + /** + * Default path used when storing PGT's to file + */ +define("CAS_PGT_STORAGE_FILE_DEFAULT_PATH",'/tmp'); +/** + * phpCAS::setPGTStorageFile()'s 2nd parameter to write plain text files + */ +define("CAS_PGT_STORAGE_FILE_FORMAT_PLAIN",'plain'); +/** + * phpCAS::setPGTStorageFile()'s 2nd parameter to write xml files + */ +define("CAS_PGT_STORAGE_FILE_FORMAT_XML",'xml'); +/** + * Default format used when storing PGT's to file + */ +define("CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT",CAS_PGT_STORAGE_FILE_FORMAT_PLAIN); +// ------------------------------------------------------------------------ +// DATABASE PGT STORAGE +// ------------------------------------------------------------------------ + /** + * default database type when storing PGT's to database + */ +define("CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE",'mysql'); +/** + * default host when storing PGT's to database + */ +define("CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME",'localhost'); +/** + * default port when storing PGT's to database + */ +define("CAS_PGT_STORAGE_DB_DEFAULT_PORT",''); +/** + * default database when storing PGT's to database + */ +define("CAS_PGT_STORAGE_DB_DEFAULT_DATABASE",'phpCAS'); +/** + * default table when storing PGT's to database + */ +define("CAS_PGT_STORAGE_DB_DEFAULT_TABLE",'pgt'); + +/** @} */ +// ------------------------------------------------------------------------ +// SERVICE ACCESS ERRORS +// ------------------------------------------------------------------------ + /** + * @addtogroup publicServices + * @{ + */ + +/** + * phpCAS::service() error code on success + */ +define("PHPCAS_SERVICE_OK",0); +/** + * phpCAS::service() error code when the PT could not retrieve because + * the CAS server did not respond. + */ +define("PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE",1); +/** + * phpCAS::service() error code when the PT could not retrieve because + * the response of the CAS server was ill-formed. + */ +define("PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE",2); +/** + * phpCAS::service() error code when the PT could not retrieve because + * the CAS server did not want to. + */ +define("PHPCAS_SERVICE_PT_FAILURE",3); +/** + * phpCAS::service() error code when the service was not available. + */ +define("PHPCAS_SERVICE_NOT AVAILABLE",4); + +/** @} */ +// ------------------------------------------------------------------------ +// LANGUAGES +// ------------------------------------------------------------------------ + /** + * @addtogroup publicLang + * @{ + */ + +define("PHPCAS_LANG_ENGLISH", 'english'); +define("PHPCAS_LANG_FRENCH", 'french'); +define("PHPCAS_LANG_GREEK", 'greek'); +define("PHPCAS_LANG_GERMAN", 'german'); +define("PHPCAS_LANG_JAPANESE", 'japanese'); +define("PHPCAS_LANG_SPANISH", 'spanish'); +define("PHPCAS_LANG_CATALAN", 'catalan'); + +/** @} */ + +/** + * @addtogroup internalLang + * @{ + */ + +/** + * phpCAS default language (when phpCAS::setLang() is not used) + */ +define("PHPCAS_LANG_DEFAULT", PHPCAS_LANG_ENGLISH); + +/** @} */ +// ------------------------------------------------------------------------ +// DEBUG +// ------------------------------------------------------------------------ + /** + * @addtogroup publicDebug + * @{ + */ + +/** + * The default directory for the debug file under Unix. + */ +define('DEFAULT_DEBUG_DIR','/tmp/'); + +/** @} */ +// ------------------------------------------------------------------------ +// MISC +// ------------------------------------------------------------------------ + /** + * @addtogroup internalMisc + * @{ + */ + +/** + * This global variable is used by the interface class phpCAS. + * + * @hideinitializer + */ +$GLOBALS['PHPCAS_CLIENT'] = null; + +/** + * This global variable is used to store where the initializer is called from + * (to print a comprehensive error in case of multiple calls). + * + * @hideinitializer + */ +$GLOBALS['PHPCAS_INIT_CALL'] = array('done' => FALSE, + 'file' => '?', + 'line' => -1, + 'method' => '?'); + +/** + * This global variable is used to store where the method checking + * the authentication is called from (to print comprehensive errors) + * + * @hideinitializer + */ +$GLOBALS['PHPCAS_AUTH_CHECK_CALL'] = array('done' => FALSE, + 'file' => '?', + 'line' => -1, + 'method' => '?', + 'result' => FALSE); + +/** + * This global variable is used to store phpCAS debug mode. + * + * @hideinitializer + */ +$GLOBALS['PHPCAS_DEBUG'] = array('filename' => FALSE, + 'indent' => 0, + 'unique_id' => ''); + +/** @} */ + +// ######################################################################## +// CLIENT CLASS +// ######################################################################## + +// include client class +include_once(dirname(__FILE__).'/CAS/client.php'); + +// ######################################################################## +// INTERFACE CLASS +// ######################################################################## + +/** + * @class phpCAS + * The phpCAS class is a simple container for the phpCAS library. It provides CAS + * authentication for web applications written in PHP. + * + * @ingroup public + * @author Pascal Aubry + * + * \internal All its methods access the same object ($PHPCAS_CLIENT, declared + * at the end of CAS/client.php). + */ + + + +class phpCAS +{ + + // ######################################################################## + // INITIALIZATION + // ######################################################################## + + /** + * @addtogroup publicInit + * @{ + */ + + /** + * phpCAS client initializer. + * @note Only one of the phpCAS::client() and phpCAS::proxy functions should be + * called, only once, and before all other methods (except phpCAS::getVersion() + * and phpCAS::setDebug()). + * + * @param $server_version the version of the CAS server + * @param $server_hostname the hostname of the CAS server + * @param $server_port the port the CAS server is running on + * @param $server_uri the URI the CAS server is responding on + * @param $start_session Have phpCAS start PHP sessions (default true) + * + * @return a newly created CASClient object + */ + function client($server_version, + $server_hostname, + $server_port, + $server_uri, + $start_session = true) + { + global $PHPCAS_CLIENT, $PHPCAS_INIT_CALL; + + phpCAS::traceBegin(); + if ( is_object($PHPCAS_CLIENT) ) { + phpCAS::error($PHPCAS_INIT_CALL['method'].'() has already been called (at '.$PHPCAS_INIT_CALL['file'].':'.$PHPCAS_INIT_CALL['line'].')'); + } + if ( gettype($server_version) != 'string' ) { + phpCAS::error('type mismatched for parameter $server_version (should be `string\')'); + } + if ( gettype($server_hostname) != 'string' ) { + phpCAS::error('type mismatched for parameter $server_hostname (should be `string\')'); + } + if ( gettype($server_port) != 'integer' ) { + phpCAS::error('type mismatched for parameter $server_port (should be `integer\')'); + } + if ( gettype($server_uri) != 'string' ) { + phpCAS::error('type mismatched for parameter $server_uri (should be `string\')'); + } + + // store where the initialzer is called from + $dbg = phpCAS::backtrace(); + $PHPCAS_INIT_CALL = array('done' => TRUE, + 'file' => $dbg[0]['file'], + 'line' => $dbg[0]['line'], + 'method' => __CLASS__.'::'.__FUNCTION__); + + // initialize the global object $PHPCAS_CLIENT + $PHPCAS_CLIENT = new CASClient($server_version,FALSE/*proxy*/,$server_hostname,$server_port,$server_uri,$start_session); + phpCAS::traceEnd(); + } + + /** + * phpCAS proxy initializer. + * @note Only one of the phpCAS::client() and phpCAS::proxy functions should be + * called, only once, and before all other methods (except phpCAS::getVersion() + * and phpCAS::setDebug()). + * + * @param $server_version the version of the CAS server + * @param $server_hostname the hostname of the CAS server + * @param $server_port the port the CAS server is running on + * @param $server_uri the URI the CAS server is responding on + * @param $start_session Have phpCAS start PHP sessions (default true) + * + * @return a newly created CASClient object + */ + function proxy($server_version, + $server_hostname, + $server_port, + $server_uri, + $start_session = true) + { + global $PHPCAS_CLIENT, $PHPCAS_INIT_CALL; + + phpCAS::traceBegin(); + if ( is_object($PHPCAS_CLIENT) ) { + phpCAS::error($PHPCAS_INIT_CALL['method'].'() has already been called (at '.$PHPCAS_INIT_CALL['file'].':'.$PHPCAS_INIT_CALL['line'].')'); + } + if ( gettype($server_version) != 'string' ) { + phpCAS::error('type mismatched for parameter $server_version (should be `string\')'); + } + if ( gettype($server_hostname) != 'string' ) { + phpCAS::error('type mismatched for parameter $server_hostname (should be `string\')'); + } + if ( gettype($server_port) != 'integer' ) { + phpCAS::error('type mismatched for parameter $server_port (should be `integer\')'); + } + if ( gettype($server_uri) != 'string' ) { + phpCAS::error('type mismatched for parameter $server_uri (should be `string\')'); + } + + // store where the initialzer is called from + $dbg = phpCAS::backtrace(); + $PHPCAS_INIT_CALL = array('done' => TRUE, + 'file' => $dbg[0]['file'], + 'line' => $dbg[0]['line'], + 'method' => __CLASS__.'::'.__FUNCTION__); + + // initialize the global object $PHPCAS_CLIENT + $PHPCAS_CLIENT = new CASClient($server_version,TRUE/*proxy*/,$server_hostname,$server_port,$server_uri,$start_session); + phpCAS::traceEnd(); + } + + /** @} */ + // ######################################################################## + // DEBUGGING + // ######################################################################## + + /** + * @addtogroup publicDebug + * @{ + */ + + /** + * Set/unset debug mode + * + * @param $filename the name of the file used for logging, or FALSE to stop debugging. + */ + function setDebug($filename='') + { + global $PHPCAS_DEBUG; + + if ( $filename != FALSE && gettype($filename) != 'string' ) { + phpCAS::error('type mismatched for parameter $dbg (should be FALSE or the name of the log file)'); + } + + if ( empty($filename) ) { + if ( preg_match('/^Win.*/',getenv('OS')) ) { + if ( isset($_ENV['TMP']) ) { + $debugDir = $_ENV['TMP'].'/'; + } else if ( isset($_ENV['TEMP']) ) { + $debugDir = $_ENV['TEMP'].'/'; + } else { + $debugDir = ''; + } + } else { + $debugDir = DEFAULT_DEBUG_DIR; + } + $filename = $debugDir . 'phpCAS.log'; + } + + if ( empty($PHPCAS_DEBUG['unique_id']) ) { + $PHPCAS_DEBUG['unique_id'] = substr(strtoupper(md5(uniqid(''))),0,4); + } + + $PHPCAS_DEBUG['filename'] = $filename; + + phpCAS::trace('START ******************'); + } + + /** @} */ + /** + * @addtogroup internalDebug + * @{ + */ + + /** + * This method is a wrapper for debug_backtrace() that is not available + * in all PHP versions (>= 4.3.0 only) + */ + function backtrace() + { + if ( function_exists('debug_backtrace') ) { + return debug_backtrace(); + } else { + // poor man's hack ... but it does work ... + return array(); + } + } + + /** + * Logs a string in debug mode. + * + * @param $str the string to write + * + * @private + */ + function log($str) + { + $indent_str = "."; + global $PHPCAS_DEBUG; + + if ( $PHPCAS_DEBUG['filename'] ) { + for ($i=0;$i<$PHPCAS_DEBUG['indent'];$i++) { + $indent_str .= '| '; + } + error_log($PHPCAS_DEBUG['unique_id'].' '.$indent_str.$str."\n",3,$PHPCAS_DEBUG['filename']); + } + + } + + /** + * This method is used by interface methods to print an error and where the function + * was originally called from. + * + * @param $msg the message to print + * + * @private + */ + function error($msg) + { + $dbg = phpCAS::backtrace(); + $function = '?'; + $file = '?'; + $line = '?'; + if ( is_array($dbg) ) { + for ( $i=1; $i\nphpCAS error: ".__CLASS__."::".$function.'(): '.htmlentities($msg)." in ".$file." on line ".$line."
\n"; + phpCAS::trace($msg); + phpCAS::traceExit(); + exit(); + } + + /** + * This method is used to log something in debug mode. + */ + function trace($str) + { + $dbg = phpCAS::backtrace(); + phpCAS::log($str.' ['.basename($dbg[1]['file']).':'.$dbg[1]['line'].']'); + } + + /** + * This method is used to indicate the start of the execution of a function in debug mode. + */ + function traceBegin() + { + global $PHPCAS_DEBUG; + + $dbg = phpCAS::backtrace(); + $str = '=> '; + if ( !empty($dbg[2]['class']) ) { + $str .= $dbg[2]['class'].'::'; + } + $str .= $dbg[2]['function'].'('; + if ( is_array($dbg[2]['args']) ) { + foreach ($dbg[2]['args'] as $index => $arg) { + if ( $index != 0 ) { + $str .= ', '; + } + $str .= str_replace("\n","",var_export($arg,TRUE)); + } + } + $str .= ') ['.basename($dbg[2]['file']).':'.$dbg[2]['line'].']'; + phpCAS::log($str); + $PHPCAS_DEBUG['indent'] ++; + } + + /** + * This method is used to indicate the end of the execution of a function in debug mode. + * + * @param $res the result of the function + */ + function traceEnd($res='') + { + global $PHPCAS_DEBUG; + + $PHPCAS_DEBUG['indent'] --; + $dbg = phpCAS::backtrace(); + $str = ''; + $str .= '<= '.str_replace("\n","",var_export($res,TRUE)); + phpCAS::log($str); + } + + /** + * This method is used to indicate the end of the execution of the program + */ + function traceExit() + { + global $PHPCAS_DEBUG; + + phpCAS::log('exit()'); + while ( $PHPCAS_DEBUG['indent'] > 0 ) { + phpCAS::log('-'); + $PHPCAS_DEBUG['indent'] --; + } + } + + /** @} */ + // ######################################################################## + // INTERNATIONALIZATION + // ######################################################################## + /** + * @addtogroup publicLang + * @{ + */ + + /** + * This method is used to set the language used by phpCAS. + * @note Can be called only once. + * + * @param $lang a string representing the language. + * + * @sa PHPCAS_LANG_FRENCH, PHPCAS_LANG_ENGLISH + */ + function setLang($lang) + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + if ( gettype($lang) != 'string' ) { + phpCAS::error('type mismatched for parameter $lang (should be `string\')'); + } + $PHPCAS_CLIENT->setLang($lang); + } + + /** @} */ + // ######################################################################## + // VERSION + // ######################################################################## + /** + * @addtogroup public + * @{ + */ + + /** + * This method returns the phpCAS version. + * + * @return the phpCAS version. + */ + function getVersion() + { + return PHPCAS_VERSION; + } + + /** @} */ + // ######################################################################## + // HTML OUTPUT + // ######################################################################## + /** + * @addtogroup publicOutput + * @{ + */ + + /** + * This method sets the HTML header used for all outputs. + * + * @param $header the HTML header. + */ + function setHTMLHeader($header) + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + if ( gettype($header) != 'string' ) { + phpCAS::error('type mismatched for parameter $header (should be `string\')'); + } + $PHPCAS_CLIENT->setHTMLHeader($header); + } + + /** + * This method sets the HTML footer used for all outputs. + * + * @param $footer the HTML footer. + */ + function setHTMLFooter($footer) + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + if ( gettype($footer) != 'string' ) { + phpCAS::error('type mismatched for parameter $footer (should be `string\')'); + } + $PHPCAS_CLIENT->setHTMLFooter($footer); + } + + /** @} */ + // ######################################################################## + // PGT STORAGE + // ######################################################################## + /** + * @addtogroup publicPGTStorage + * @{ + */ + + /** + * This method is used to tell phpCAS to store the response of the + * CAS server to PGT requests onto the filesystem. + * + * @param $format the format used to store the PGT's (`plain' and `xml' allowed) + * @param $path the path where the PGT's should be stored + */ + function setPGTStorageFile($format='', + $path='') + { + global $PHPCAS_CLIENT,$PHPCAS_AUTH_CHECK_CALL; + + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( !$PHPCAS_CLIENT->isProxy() ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( $PHPCAS_AUTH_CHECK_CALL['done'] ) { + phpCAS::error('this method should only be called before '.$PHPCAS_AUTH_CHECK_CALL['method'].'() (called at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].')'); + } + if ( gettype($format) != 'string' ) { + phpCAS::error('type mismatched for parameter $format (should be `string\')'); + } + if ( gettype($path) != 'string' ) { + phpCAS::error('type mismatched for parameter $format (should be `string\')'); + } + $PHPCAS_CLIENT->setPGTStorageFile($format,$path); + phpCAS::traceEnd(); + } + + /** + * This method is used to tell phpCAS to store the response of the + * CAS server to PGT requests into a database. + * @note The connection to the database is done only when needed. + * As a consequence, bad parameters are detected only when + * initializing PGT storage, except in debug mode. + * + * @param $user the user to access the data with + * @param $password the user's password + * @param $database_type the type of the database hosting the data + * @param $hostname the server hosting the database + * @param $port the port the server is listening on + * @param $database the name of the database + * @param $table the name of the table storing the data + */ + function setPGTStorageDB($user, + $password, + $database_type='', + $hostname='', + $port=0, + $database='', + $table='') + { + global $PHPCAS_CLIENT,$PHPCAS_AUTH_CHECK_CALL; + + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( !$PHPCAS_CLIENT->isProxy() ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( $PHPCAS_AUTH_CHECK_CALL['done'] ) { + phpCAS::error('this method should only be called before '.$PHPCAS_AUTH_CHECK_CALL['method'].'() (called at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].')'); + } + if ( gettype($user) != 'string' ) { + phpCAS::error('type mismatched for parameter $user (should be `string\')'); + } + if ( gettype($password) != 'string' ) { + phpCAS::error('type mismatched for parameter $password (should be `string\')'); + } + if ( gettype($database_type) != 'string' ) { + phpCAS::error('type mismatched for parameter $database_type (should be `string\')'); + } + if ( gettype($hostname) != 'string' ) { + phpCAS::error('type mismatched for parameter $hostname (should be `string\')'); + } + if ( gettype($port) != 'integer' ) { + phpCAS::error('type mismatched for parameter $port (should be `integer\')'); + } + if ( gettype($database) != 'string' ) { + phpCAS::error('type mismatched for parameter $database (should be `string\')'); + } + if ( gettype($table) != 'string' ) { + phpCAS::error('type mismatched for parameter $table (should be `string\')'); + } + $PHPCAS_CLIENT->setPGTStorageDB($this,$user,$password,$hostname,$port,$database,$table); + phpCAS::traceEnd(); + } + + /** @} */ + // ######################################################################## + // ACCESS TO EXTERNAL SERVICES + // ######################################################################## + /** + * @addtogroup publicServices + * @{ + */ + + /** + * This method is used to access an HTTP[S] service. + * + * @param $url the service to access. + * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on + * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE, + * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE. + * @param $output the output of the service (also used to give an error + * message on failure). + * + * @return TRUE on success, FALSE otherwise (in this later case, $err_code + * gives the reason why it failed and $output contains an error message). + */ + function serviceWeb($url,&$err_code,&$output) + { + global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; + + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( !$PHPCAS_CLIENT->isProxy() ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( !$PHPCAS_AUTH_CHECK_CALL['done'] ) { + phpCAS::error('this method should only be called after the programmer is sure the user has been authenticated (by calling '.__CLASS__.'::checkAuthentication() or '.__CLASS__.'::forceAuthentication()'); + } + if ( !$PHPCAS_AUTH_CHECK_CALL['result'] ) { + phpCAS::error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE'); + } + if ( gettype($url) != 'string' ) { + phpCAS::error('type mismatched for parameter $url (should be `string\')'); + } + + $res = $PHPCAS_CLIENT->serviceWeb($url,$err_code,$output); + + phpCAS::traceEnd($res); + return $res; + } + + /** + * This method is used to access an IMAP/POP3/NNTP service. + * + * @param $url a string giving the URL of the service, including the mailing box + * for IMAP URLs, as accepted by imap_open(). + * @param $flags options given to imap_open(). + * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on + * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE, + * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE. + * @param $err_msg an error message on failure + * @param $pt the Proxy Ticket (PT) retrieved from the CAS server to access the URL + * on success, FALSE on error). + * + * @return an IMAP stream on success, FALSE otherwise (in this later case, $err_code + * gives the reason why it failed and $err_msg contains an error message). + */ + function serviceMail($url,$flags,&$err_code,&$err_msg,&$pt) + { + global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; + + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( !$PHPCAS_CLIENT->isProxy() ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( !$PHPCAS_AUTH_CHECK_CALL['done'] ) { + phpCAS::error('this method should only be called after the programmer is sure the user has been authenticated (by calling '.__CLASS__.'::checkAuthentication() or '.__CLASS__.'::forceAuthentication()'); + } + if ( !$PHPCAS_AUTH_CHECK_CALL['result'] ) { + phpCAS::error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE'); + } + if ( gettype($url) != 'string' ) { + phpCAS::error('type mismatched for parameter $url (should be `string\')'); + } + + if ( gettype($flags) != 'integer' ) { + phpCAS::error('type mismatched for parameter $flags (should be `integer\')'); + } + + $res = $PHPCAS_CLIENT->serviceMail($url,$flags,$err_code,$err_msg,$pt); + + phpCAS::traceEnd($res); + return $res; + } + + /** @} */ + // ######################################################################## + // AUTHENTICATION + // ######################################################################## + /** + * @addtogroup publicAuth + * @{ + */ + + /** + * Set the times authentication will be cached before really accessing the CAS server in gateway mode: + * - -1: check only once, and then never again (until you pree login) + * - 0: always check + * - n: check every "n" time + * + * @param $n an integer. + */ + function setCacheTimesForAuthRecheck($n) + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + if ( gettype($n) != 'integer' ) { + phpCAS::error('type mismatched for parameter $header (should be `string\')'); + } + $PHPCAS_CLIENT->setCacheTimesForAuthRecheck($n); + } + + /** + * This method is called to check if the user is authenticated (use the gateway feature). + * @return TRUE when the user is authenticated; otherwise FALSE. + */ + function checkAuthentication() + { + global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; + + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + + $auth = $PHPCAS_CLIENT->checkAuthentication(); + + // store where the authentication has been checked and the result + $dbg = phpCAS::backtrace(); + $PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE, + 'file' => $dbg[0]['file'], + 'line' => $dbg[0]['line'], + 'method' => __CLASS__.'::'.__FUNCTION__, + 'result' => $auth ); + phpCAS::traceEnd($auth); + return $auth; + } + + /** + * This method is called to force authentication if the user was not already + * authenticated. If the user is not authenticated, halt by redirecting to + * the CAS server. + */ + function forceAuthentication() + { + global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; + + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + + $auth = $PHPCAS_CLIENT->forceAuthentication(); + + // store where the authentication has been checked and the result + $dbg = phpCAS::backtrace(); + $PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE, + 'file' => $dbg[0]['file'], + 'line' => $dbg[0]['line'], + 'method' => __CLASS__.'::'.__FUNCTION__, + 'result' => $auth ); + + if ( !$auth ) { + phpCAS::trace('user is not authenticated, redirecting to the CAS server'); + $PHPCAS_CLIENT->forceAuthentication(); + } else { + phpCAS::trace('no need to authenticate (user `'.phpCAS::getUser().'\' is already authenticated)'); + } + + phpCAS::traceEnd(); + return $auth; + } + + /** + * This method is called to renew the authentication. + **/ + function renewAuthentication() { + global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; + + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before'.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + + // store where the authentication has been checked and the result + $dbg = phpCAS::backtrace(); + $PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE, 'file' => $dbg[0]['file'], 'line' => $dbg[0]['line'], 'method' => __CLASS__.'::'.__FUNCTION__, 'result' => $auth ); + + $PHPCAS_CLIENT->renewAuthentication(); + phpCAS::traceEnd(); + } + + /** + * This method has been left from version 0.4.1 for compatibility reasons. + */ + function authenticate() + { + phpCAS::error('this method is deprecated. You should use '.__CLASS__.'::forceAuthentication() instead'); + } + + /** + * This method is called to check if the user is authenticated (previously or by + * tickets given in the URL). + * + * @return TRUE when the user is authenticated. + */ + function isAuthenticated() + { + global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; + + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + + // call the isAuthenticated method of the global $PHPCAS_CLIENT object + $auth = $PHPCAS_CLIENT->isAuthenticated(); + + // store where the authentication has been checked and the result + $dbg = phpCAS::backtrace(); + $PHPCAS_AUTH_CHECK_CALL = array('done' => TRUE, + 'file' => $dbg[0]['file'], + 'line' => $dbg[0]['line'], + 'method' => __CLASS__.'::'.__FUNCTION__, + 'result' => $auth ); + phpCAS::traceEnd($auth); + return $auth; + } + + /** + * Checks whether authenticated based on $_SESSION. Useful to avoid + * server calls. + * @return true if authenticated, false otherwise. + * @since 0.4.22 by Brendan Arnold + */ + function isSessionAuthenticated () + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + return($PHPCAS_CLIENT->isSessionAuthenticated()); + } + + /** + * This method returns the CAS user's login name. + * @warning should not be called only after phpCAS::forceAuthentication() + * or phpCAS::checkAuthentication(). + * + * @return the login name of the authenticated user + */ + function getUser() + { + global $PHPCAS_CLIENT, $PHPCAS_AUTH_CHECK_CALL; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + if ( !$PHPCAS_AUTH_CHECK_CALL['done'] ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()'); + } + if ( !$PHPCAS_AUTH_CHECK_CALL['result'] ) { + phpCAS::error('authentication was checked (by '.$PHPCAS_AUTH_CHECK_CALL['method'].'() at '.$PHPCAS_AUTH_CHECK_CALL['file'].':'.$PHPCAS_AUTH_CHECK_CALL['line'].') but the method returned FALSE'); + } + return $PHPCAS_CLIENT->getUser(); + } + + /** + * Handle logout requests. + */ + function handleLogoutRequests($check_client=true, $allowed_clients=false) + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + return($PHPCAS_CLIENT->handleLogoutRequests($check_client, $allowed_clients)); + } + + /** + * This method returns the URL to be used to login. + * or phpCAS::isAuthenticated(). + * + * @return the login name of the authenticated user + */ + function getServerLoginURL() + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + return $PHPCAS_CLIENT->getServerLoginURL(); + } + + /** + * Set the login URL of the CAS server. + * @param $url the login URL + * @since 0.4.21 by Wyman Chan + */ + function setServerLoginURL($url='') + { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after + '.__CLASS__.'::client()'); + } + if ( gettype($url) != 'string' ) { + phpCAS::error('type mismatched for parameter $url (should be + `string\')'); + } + $PHPCAS_CLIENT->setServerLoginURL($url); + phpCAS::traceEnd(); + } + + /** + * This method returns the URL to be used to login. + * or phpCAS::isAuthenticated(). + * + * @return the login name of the authenticated user + */ + function getServerLogoutURL() + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should not be called before '.__CLASS__.'::client() or '.__CLASS__.'::proxy()'); + } + return $PHPCAS_CLIENT->getServerLogoutURL(); + } + + /** + * Set the logout URL of the CAS server. + * @param $url the logout URL + * @since 0.4.21 by Wyman Chan + */ + function setServerLogoutURL($url='') + { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after + '.__CLASS__.'::client()'); + } + if ( gettype($url) != 'string' ) { + phpCAS::error('type mismatched for parameter $url (should be + `string\')'); + } + $PHPCAS_CLIENT->setServerLogoutURL($url); + phpCAS::traceEnd(); + } + + /** + * This method is used to logout from CAS. + * @params $params an array that contains the optional url and service parameters that will be passed to the CAS server + * @public + */ + function logout($params = "") { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if (!is_object($PHPCAS_CLIENT)) { + phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); + } + $parsedParams = array(); + if ($params != "") { + if (is_string($params)) { + phpCAS::error('method `phpCAS::logout($url)\' is now deprecated, use `phpCAS::logoutWithUrl($url)\' instead'); + } + if (!is_array($params)) { + phpCAS::error('type mismatched for parameter $params (should be `array\')'); + } + foreach ($params as $key => $value) { + if ($key != "service" && $key != "url") { + phpCAS::error('only `url\' and `service\' parameters are allowed for method `phpCAS::logout($params)\''); + } + $parsedParams[$key] = $value; + } + } + $PHPCAS_CLIENT->logout($parsedParams); + // never reached + phpCAS::traceEnd(); + } + + /** + * This method is used to logout from CAS. Halts by redirecting to the CAS server. + * @param $service a URL that will be transmitted to the CAS server + */ + function logoutWithRedirectService($service) { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); + } + if (!is_string($service)) { + phpCAS::error('type mismatched for parameter $service (should be `string\')'); + } + $PHPCAS_CLIENT->logout(array("service" => $service)); + // never reached + phpCAS::traceEnd(); + } + + /** + * This method is used to logout from CAS. Halts by redirecting to the CAS server. + * @param $url a URL that will be transmitted to the CAS server + */ + function logoutWithUrl($url) { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); + } + if (!is_string($url)) { + phpCAS::error('type mismatched for parameter $url (should be `string\')'); + } + $PHPCAS_CLIENT->logout(array("url" => $url)); + // never reached + phpCAS::traceEnd(); + } + + /** + * This method is used to logout from CAS. Halts by redirecting to the CAS server. + * @param $service a URL that will be transmitted to the CAS server + * @param $url a URL that will be transmitted to the CAS server + */ + function logoutWithRedirectServiceAndUrl($service, $url) { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); + } + if (!is_string($service)) { + phpCAS::error('type mismatched for parameter $service (should be `string\')'); + } + if (!is_string($url)) { + phpCAS::error('type mismatched for parameter $url (should be `string\')'); + } + $PHPCAS_CLIENT->logout(array("service" => $service, "url" => $url)); + // never reached + phpCAS::traceEnd(); + } + + /** + * Set the fixed URL that will be used by the CAS server to transmit the PGT. + * When this method is not called, a phpCAS script uses its own URL for the callback. + * + * @param $url the URL + */ + function setFixedCallbackURL($url='') + { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( !$PHPCAS_CLIENT->isProxy() ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( gettype($url) != 'string' ) { + phpCAS::error('type mismatched for parameter $url (should be `string\')'); + } + $PHPCAS_CLIENT->setCallbackURL($url); + phpCAS::traceEnd(); + } + + /** + * Set the fixed URL that will be set as the CAS service parameter. When this + * method is not called, a phpCAS script uses its own URL. + * + * @param $url the URL + */ + function setFixedServiceURL($url) + { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( gettype($url) != 'string' ) { + phpCAS::error('type mismatched for parameter $url (should be `string\')'); + } + $PHPCAS_CLIENT->setURL($url); + phpCAS::traceEnd(); + } + + /** + * Get the URL that is set as the CAS service parameter. + */ + function getServiceURL() + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + return($PHPCAS_CLIENT->getURL()); + } + + /** + * Retrieve a Proxy Ticket from the CAS server. + */ + function retrievePT($target_service,&$err_code,&$err_msg) + { + global $PHPCAS_CLIENT; + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::proxy()'); + } + if ( gettype($target_service) != 'string' ) { + phpCAS::error('type mismatched for parameter $target_service(should be `string\')'); + } + return($PHPCAS_CLIENT->retrievePT($target_service,$err_code,$err_msg)); + } + + /** + * Set the certificate of the CAS server. + * + * @param $cert the PEM certificate + */ + function setCasServerCert($cert) + { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); + } + if ( gettype($cert) != 'string' ) { + phpCAS::error('type mismatched for parameter $cert (should be `string\')'); + } + $PHPCAS_CLIENT->setCasServerCert($cert); + phpCAS::traceEnd(); + } + + /** + * Set the certificate of the CAS server CA. + * + * @param $cert the CA certificate + */ + function setCasServerCACert($cert) + { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); + } + if ( gettype($cert) != 'string' ) { + phpCAS::error('type mismatched for parameter $cert (should be `string\')'); + } + $PHPCAS_CLIENT->setCasServerCACert($cert); + phpCAS::traceEnd(); + } + + /** + * Set no SSL validation for the CAS server. + */ + function setNoCasServerValidation() + { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); + } + $PHPCAS_CLIENT->setNoCasServerValidation(); + phpCAS::traceEnd(); + } + + /** @} */ + + /** + * Change CURL options. + * CURL is used to connect through HTTPS to CAS server + * @param $key the option key + * @param $value the value to set + */ + function setExtraCurlOption($key, $value) + { + global $PHPCAS_CLIENT; + phpCAS::traceBegin(); + if ( !is_object($PHPCAS_CLIENT) ) { + phpCAS::error('this method should only be called after '.__CLASS__.'::client() or'.__CLASS__.'::proxy()'); + } + $PHPCAS_CLIENT->setExtraCurlOption($key, $value); + phpCAS::traceEnd(); + } + +} + +// ######################################################################## +// DOCUMENTATION +// ######################################################################## + +// ######################################################################## +// MAIN PAGE + +/** + * @mainpage + * + * The following pages only show the source documentation. + * + */ + +// ######################################################################## +// MODULES DEFINITION + +/** @defgroup public User interface */ + +/** @defgroup publicInit Initialization + * @ingroup public */ + +/** @defgroup publicAuth Authentication + * @ingroup public */ + +/** @defgroup publicServices Access to external services + * @ingroup public */ + +/** @defgroup publicConfig Configuration + * @ingroup public */ + +/** @defgroup publicLang Internationalization + * @ingroup publicConfig */ + +/** @defgroup publicOutput HTML output + * @ingroup publicConfig */ + +/** @defgroup publicPGTStorage PGT storage + * @ingroup publicConfig */ + +/** @defgroup publicDebug Debugging + * @ingroup public */ + + +/** @defgroup internal Implementation */ + +/** @defgroup internalAuthentication Authentication + * @ingroup internal */ + +/** @defgroup internalBasic CAS Basic client features (CAS 1.0, Service Tickets) + * @ingroup internal */ + +/** @defgroup internalProxy CAS Proxy features (CAS 2.0, Proxy Granting Tickets) + * @ingroup internal */ + +/** @defgroup internalPGTStorage PGT storage + * @ingroup internalProxy */ + +/** @defgroup internalPGTStorageDB PGT storage in a database + * @ingroup internalPGTStorage */ + +/** @defgroup internalPGTStorageFile PGT storage on the filesystem + * @ingroup internalPGTStorage */ + +/** @defgroup internalCallback Callback from the CAS server + * @ingroup internalProxy */ + +/** @defgroup internalProxied CAS proxied client features (CAS 2.0, Proxy Tickets) + * @ingroup internal */ + +/** @defgroup internalConfig Configuration + * @ingroup internal */ + +/** @defgroup internalOutput HTML output + * @ingroup internalConfig */ + +/** @defgroup internalLang Internationalization + * @ingroup internalConfig + * + * To add a new language: + * - 1. define a new constant PHPCAS_LANG_XXXXXX in CAS/CAS.php + * - 2. copy any file from CAS/languages to CAS/languages/XXXXXX.php + * - 3. Make the translations + */ + +/** @defgroup internalDebug Debugging + * @ingroup internal */ + +/** @defgroup internalMisc Miscellaneous + * @ingroup internal */ + +// ######################################################################## +// EXAMPLES + +/** + * @example example_simple.php + */ + /** + * @example example_proxy.php + */ + /** + * @example example_proxy2.php + */ + /** + * @example example_lang.php + */ + /** + * @example example_html.php + */ + /** + * @example example_file.php + */ + /** + * @example example_db.php + */ + /** + * @example example_service.php + */ + /** + * @example example_session_proxy.php + */ + /** + * @example example_session_service.php + */ + /** + * @example example_gateway.php + */ + + + +?> diff --git a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-db.php b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-db.php index 5a589e4b28..00797b9c56 100644 --- a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-db.php +++ b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-db.php @@ -1,190 +1,190 @@ - - * - * @ingroup internalPGTStorageDB - */ - -class PGTStorageDB extends PGTStorage -{ - /** - * @addtogroup internalPGTStorageDB - * @{ - */ - - /** - * a string representing a PEAR DB URL to connect to the database. Written by - * PGTStorageDB::PGTStorageDB(), read by getURL(). - * - * @hideinitializer - * @private - */ - var $_url=''; - - /** - * This method returns the PEAR DB URL to use to connect to the database. - * - * @return a PEAR DB URL - * - * @private - */ - function getURL() - { - return $this->_url; - } - - /** - * The handle of the connection to the database where PGT's are stored. Written by - * PGTStorageDB::init(), read by getLink(). - * - * @hideinitializer - * @private - */ - var $_link = null; - - /** - * This method returns the handle of the connection to the database where PGT's are - * stored. - * - * @return a handle of connection. - * - * @private - */ - function getLink() - { - return $this->_link; - } - - /** - * The name of the table where PGT's are stored. Written by - * PGTStorageDB::PGTStorageDB(), read by getTable(). - * - * @hideinitializer - * @private - */ - var $_table = ''; - - /** - * This method returns the name of the table where PGT's are stored. - * - * @return the name of a table. - * - * @private - */ - function getTable() - { - return $this->_table; - } - - // ######################################################################## - // DEBUGGING - // ######################################################################## - - /** - * This method returns an informational string giving the type of storage - * used by the object (used for debugging purposes). - * - * @return an informational string. - * @public - */ - function getStorageType() - { - return "database"; - } - - /** - * This method returns an informational string giving informations on the - * parameters of the storage.(used for debugging purposes). - * - * @public - */ - function getStorageInfo() - { - return 'url=`'.$this->getURL().'\', table=`'.$this->getTable().'\''; - } - - // ######################################################################## - // CONSTRUCTOR - // ######################################################################## - - /** - * The class constructor, called by CASClient::SetPGTStorageDB(). - * - * @param $cas_parent the CASClient instance that creates the object. - * @param $user the user to access the data with - * @param $password the user's password - * @param $database_type the type of the database hosting the data - * @param $hostname the server hosting the database - * @param $port the port the server is listening on - * @param $database the name of the database - * @param $table the name of the table storing the data - * - * @public - */ - function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table) - { - phpCAS::traceBegin(); - - // call the ancestor's constructor - $this->PGTStorage($cas_parent); - - if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE; - if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME; - if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT; - if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE; - if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE; - - // build and store the PEAR DB URL - $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database; - - // XXX should use setURL and setTable - phpCAS::traceEnd(); - } - - // ######################################################################## - // INITIALIZATION - // ######################################################################## - - /** - * This method is used to initialize the storage. Halts on error. - * - * @public - */ - function init() - { - phpCAS::traceBegin(); - // if the storage has already been initialized, return immediatly - if ( $this->isInitialized() ) - return; - // call the ancestor's method (mark as initialized) - parent::init(); - - //include phpDB library (the test was introduced in release 0.4.8 for - //the integration into Tikiwiki). - if (!class_exists('DB')) { - include_once('DB.php'); - } - - // try to connect to the database - $this->_link = DB::connect($this->getURL()); - if ( DB::isError($this->_link) ) { - phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')'); - } - var_dump($this->_link); - phpCAS::traceBEnd(); - } - - /** @} */ -} - + + * + * @ingroup internalPGTStorageDB + */ + +class PGTStorageDB extends PGTStorage +{ + /** + * @addtogroup internalPGTStorageDB + * @{ + */ + + /** + * a string representing a PEAR DB URL to connect to the database. Written by + * PGTStorageDB::PGTStorageDB(), read by getURL(). + * + * @hideinitializer + * @private + */ + var $_url=''; + + /** + * This method returns the PEAR DB URL to use to connect to the database. + * + * @return a PEAR DB URL + * + * @private + */ + function getURL() + { + return $this->_url; + } + + /** + * The handle of the connection to the database where PGT's are stored. Written by + * PGTStorageDB::init(), read by getLink(). + * + * @hideinitializer + * @private + */ + var $_link = null; + + /** + * This method returns the handle of the connection to the database where PGT's are + * stored. + * + * @return a handle of connection. + * + * @private + */ + function getLink() + { + return $this->_link; + } + + /** + * The name of the table where PGT's are stored. Written by + * PGTStorageDB::PGTStorageDB(), read by getTable(). + * + * @hideinitializer + * @private + */ + var $_table = ''; + + /** + * This method returns the name of the table where PGT's are stored. + * + * @return the name of a table. + * + * @private + */ + function getTable() + { + return $this->_table; + } + + // ######################################################################## + // DEBUGGING + // ######################################################################## + + /** + * This method returns an informational string giving the type of storage + * used by the object (used for debugging purposes). + * + * @return an informational string. + * @public + */ + function getStorageType() + { + return "database"; + } + + /** + * This method returns an informational string giving informations on the + * parameters of the storage.(used for debugging purposes). + * + * @public + */ + function getStorageInfo() + { + return 'url=`'.$this->getURL().'\', table=`'.$this->getTable().'\''; + } + + // ######################################################################## + // CONSTRUCTOR + // ######################################################################## + + /** + * The class constructor, called by CASClient::SetPGTStorageDB(). + * + * @param $cas_parent the CASClient instance that creates the object. + * @param $user the user to access the data with + * @param $password the user's password + * @param $database_type the type of the database hosting the data + * @param $hostname the server hosting the database + * @param $port the port the server is listening on + * @param $database the name of the database + * @param $table the name of the table storing the data + * + * @public + */ + function PGTStorageDB($cas_parent,$user,$password,$database_type,$hostname,$port,$database,$table) + { + phpCAS::traceBegin(); + + // call the ancestor's constructor + $this->PGTStorage($cas_parent); + + if ( empty($database_type) ) $database_type = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE_TYPE; + if ( empty($hostname) ) $hostname = CAS_PGT_STORAGE_DB_DEFAULT_HOSTNAME; + if ( $port==0 ) $port = CAS_PGT_STORAGE_DB_DEFAULT_PORT; + if ( empty($database) ) $database = CAS_PGT_STORAGE_DB_DEFAULT_DATABASE; + if ( empty($table) ) $table = CAS_PGT_STORAGE_DB_DEFAULT_TABLE; + + // build and store the PEAR DB URL + $this->_url = $database_type.':'.'//'.$user.':'.$password.'@'.$hostname.':'.$port.'/'.$database; + + // XXX should use setURL and setTable + phpCAS::traceEnd(); + } + + // ######################################################################## + // INITIALIZATION + // ######################################################################## + + /** + * This method is used to initialize the storage. Halts on error. + * + * @public + */ + function init() + { + phpCAS::traceBegin(); + // if the storage has already been initialized, return immediatly + if ( $this->isInitialized() ) + return; + // call the ancestor's method (mark as initialized) + parent::init(); + + //include phpDB library (the test was introduced in release 0.4.8 for + //the integration into Tikiwiki). + if (!class_exists('DB')) { + include_once('DB.php'); + } + + // try to connect to the database + $this->_link = DB::connect($this->getURL()); + if ( DB::isError($this->_link) ) { + phpCAS::error('could not connect to database ('.DB::errorMessage($this->_link).')'); + } + var_dump($this->_link); + phpCAS::traceBEnd(); + } + + /** @} */ +} + ?> \ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-file.php b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-file.php index bc07485b8f..d48a60d670 100644 --- a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-file.php +++ b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-file.php @@ -1,249 +1,249 @@ - - * - * @ingroup internalPGTStorageFile - */ - -class PGTStorageFile extends PGTStorage -{ - /** - * @addtogroup internalPGTStorageFile - * @{ - */ - - /** - * a string telling where PGT's should be stored on the filesystem. Written by - * PGTStorageFile::PGTStorageFile(), read by getPath(). - * - * @private - */ - var $_path; - - /** - * This method returns the name of the directory where PGT's should be stored - * on the filesystem. - * - * @return the name of a directory (with leading and trailing '/') - * - * @private - */ - function getPath() - { - return $this->_path; - } - - /** - * a string telling the format to use to store PGT's (plain or xml). Written by - * PGTStorageFile::PGTStorageFile(), read by getFormat(). - * - * @private - */ - var $_format; - - /** - * This method returns the format to use when storing PGT's on the filesystem. - * - * @return a string corresponding to the format used (plain or xml). - * - * @private - */ - function getFormat() - { - return $this->_format; - } - - // ######################################################################## - // DEBUGGING - // ######################################################################## - - /** - * This method returns an informational string giving the type of storage - * used by the object (used for debugging purposes). - * - * @return an informational string. - * @public - */ - function getStorageType() - { - return "file"; - } - - /** - * This method returns an informational string giving informations on the - * parameters of the storage.(used for debugging purposes). - * - * @return an informational string. - * @public - */ - function getStorageInfo() - { - return 'path=`'.$this->getPath().'\', format=`'.$this->getFormat().'\''; - } - - // ######################################################################## - // CONSTRUCTOR - // ######################################################################## - - /** - * The class constructor, called by CASClient::SetPGTStorageFile(). - * - * @param $cas_parent the CASClient instance that creates the object. - * @param $format the format used to store the PGT's (`plain' and `xml' allowed). - * @param $path the path where the PGT's should be stored - * - * @public - */ - function PGTStorageFile($cas_parent,$format,$path) - { - phpCAS::traceBegin(); - // call the ancestor's constructor - $this->PGTStorage($cas_parent); - - if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT; - if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH; - - // check that the path is an absolute path - if (getenv("OS")=="Windows_NT"){ - - if (!preg_match('`^[a-zA-Z]:`', $path)) { - phpCAS::error('an absolute path is needed for PGT storage to file'); - } - - } - else - { - - if ( $path[0] != '/' ) { - phpCAS::error('an absolute path is needed for PGT storage to file'); - } - - // store the path (with a leading and trailing '/') - $path = preg_replace('|[/]*$|','/',$path); - $path = preg_replace('|^[/]*|','/',$path); - } - - $this->_path = $path; - // check the format and store it - switch ($format) { - case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN: - case CAS_PGT_STORAGE_FILE_FORMAT_XML: - $this->_format = $format; - break; - default: - phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)'); - } - phpCAS::traceEnd(); - } - - // ######################################################################## - // INITIALIZATION - // ######################################################################## - - /** - * This method is used to initialize the storage. Halts on error. - * - * @public - */ - function init() - { - phpCAS::traceBegin(); - // if the storage has already been initialized, return immediatly - if ( $this->isInitialized() ) - return; - // call the ancestor's method (mark as initialized) - parent::init(); - phpCAS::traceEnd(); - } - - // ######################################################################## - // PGT I/O - // ######################################################################## - - /** - * This method returns the filename corresponding to a PGT Iou. - * - * @param $pgt_iou the PGT iou. - * - * @return a filename - * @private - */ - function getPGTIouFilename($pgt_iou) - { - phpCAS::traceBegin(); - $filename = $this->getPath().$pgt_iou.'.'.$this->getFormat(); - phpCAS::traceEnd($filename); - return $filename; - } - - /** - * This method stores a PGT and its corresponding PGT Iou into a file. Echoes a - * warning on error. - * - * @param $pgt the PGT - * @param $pgt_iou the PGT iou - * - * @public - */ - function write($pgt,$pgt_iou) - { - phpCAS::traceBegin(); - $fname = $this->getPGTIouFilename($pgt_iou); - if ( $f=fopen($fname,"w") ) { - if ( fputs($f,$pgt) === FALSE ) { - phpCAS::error('could not write PGT to `'.$fname.'\''); - } - fclose($f); - } else { - phpCAS::error('could not open `'.$fname.'\''); - } - phpCAS::traceEnd(); - } - - /** - * This method reads a PGT corresponding to a PGT Iou and deletes the - * corresponding file. - * - * @param $pgt_iou the PGT iou - * - * @return the corresponding PGT, or FALSE on error - * - * @public - */ - function read($pgt_iou) - { - phpCAS::traceBegin(); - $pgt = FALSE; - $fname = $this->getPGTIouFilename($pgt_iou); - if ( !($f=fopen($fname,"r")) ) { - phpCAS::trace('could not open `'.$fname.'\''); - } else { - if ( ($pgt=fgets($f)) === FALSE ) { - phpCAS::trace('could not read PGT from `'.$fname.'\''); - } - fclose($f); - } - - // delete the PGT file - @unlink($fname); - - phpCAS::traceEnd($pgt); - return $pgt; - } - - /** @} */ - -} - - + + * + * @ingroup internalPGTStorageFile + */ + +class PGTStorageFile extends PGTStorage +{ + /** + * @addtogroup internalPGTStorageFile + * @{ + */ + + /** + * a string telling where PGT's should be stored on the filesystem. Written by + * PGTStorageFile::PGTStorageFile(), read by getPath(). + * + * @private + */ + var $_path; + + /** + * This method returns the name of the directory where PGT's should be stored + * on the filesystem. + * + * @return the name of a directory (with leading and trailing '/') + * + * @private + */ + function getPath() + { + return $this->_path; + } + + /** + * a string telling the format to use to store PGT's (plain or xml). Written by + * PGTStorageFile::PGTStorageFile(), read by getFormat(). + * + * @private + */ + var $_format; + + /** + * This method returns the format to use when storing PGT's on the filesystem. + * + * @return a string corresponding to the format used (plain or xml). + * + * @private + */ + function getFormat() + { + return $this->_format; + } + + // ######################################################################## + // DEBUGGING + // ######################################################################## + + /** + * This method returns an informational string giving the type of storage + * used by the object (used for debugging purposes). + * + * @return an informational string. + * @public + */ + function getStorageType() + { + return "file"; + } + + /** + * This method returns an informational string giving informations on the + * parameters of the storage.(used for debugging purposes). + * + * @return an informational string. + * @public + */ + function getStorageInfo() + { + return 'path=`'.$this->getPath().'\', format=`'.$this->getFormat().'\''; + } + + // ######################################################################## + // CONSTRUCTOR + // ######################################################################## + + /** + * The class constructor, called by CASClient::SetPGTStorageFile(). + * + * @param $cas_parent the CASClient instance that creates the object. + * @param $format the format used to store the PGT's (`plain' and `xml' allowed). + * @param $path the path where the PGT's should be stored + * + * @public + */ + function PGTStorageFile($cas_parent,$format,$path) + { + phpCAS::traceBegin(); + // call the ancestor's constructor + $this->PGTStorage($cas_parent); + + if (empty($format) ) $format = CAS_PGT_STORAGE_FILE_DEFAULT_FORMAT; + if (empty($path) ) $path = CAS_PGT_STORAGE_FILE_DEFAULT_PATH; + + // check that the path is an absolute path + if (getenv("OS")=="Windows_NT"){ + + if (!preg_match('`^[a-zA-Z]:`', $path)) { + phpCAS::error('an absolute path is needed for PGT storage to file'); + } + + } + else + { + + if ( $path[0] != '/' ) { + phpCAS::error('an absolute path is needed for PGT storage to file'); + } + + // store the path (with a leading and trailing '/') + $path = preg_replace('|[/]*$|','/',$path); + $path = preg_replace('|^[/]*|','/',$path); + } + + $this->_path = $path; + // check the format and store it + switch ($format) { + case CAS_PGT_STORAGE_FILE_FORMAT_PLAIN: + case CAS_PGT_STORAGE_FILE_FORMAT_XML: + $this->_format = $format; + break; + default: + phpCAS::error('unknown PGT file storage format (`'.CAS_PGT_STORAGE_FILE_FORMAT_PLAIN.'\' and `'.CAS_PGT_STORAGE_FILE_FORMAT_XML.'\' allowed)'); + } + phpCAS::traceEnd(); + } + + // ######################################################################## + // INITIALIZATION + // ######################################################################## + + /** + * This method is used to initialize the storage. Halts on error. + * + * @public + */ + function init() + { + phpCAS::traceBegin(); + // if the storage has already been initialized, return immediatly + if ( $this->isInitialized() ) + return; + // call the ancestor's method (mark as initialized) + parent::init(); + phpCAS::traceEnd(); + } + + // ######################################################################## + // PGT I/O + // ######################################################################## + + /** + * This method returns the filename corresponding to a PGT Iou. + * + * @param $pgt_iou the PGT iou. + * + * @return a filename + * @private + */ + function getPGTIouFilename($pgt_iou) + { + phpCAS::traceBegin(); + $filename = $this->getPath().$pgt_iou.'.'.$this->getFormat(); + phpCAS::traceEnd($filename); + return $filename; + } + + /** + * This method stores a PGT and its corresponding PGT Iou into a file. Echoes a + * warning on error. + * + * @param $pgt the PGT + * @param $pgt_iou the PGT iou + * + * @public + */ + function write($pgt,$pgt_iou) + { + phpCAS::traceBegin(); + $fname = $this->getPGTIouFilename($pgt_iou); + if ( $f=fopen($fname,"w") ) { + if ( fputs($f,$pgt) === FALSE ) { + phpCAS::error('could not write PGT to `'.$fname.'\''); + } + fclose($f); + } else { + phpCAS::error('could not open `'.$fname.'\''); + } + phpCAS::traceEnd(); + } + + /** + * This method reads a PGT corresponding to a PGT Iou and deletes the + * corresponding file. + * + * @param $pgt_iou the PGT iou + * + * @return the corresponding PGT, or FALSE on error + * + * @public + */ + function read($pgt_iou) + { + phpCAS::traceBegin(); + $pgt = FALSE; + $fname = $this->getPGTIouFilename($pgt_iou); + if ( !($f=fopen($fname,"r")) ) { + phpCAS::trace('could not open `'.$fname.'\''); + } else { + if ( ($pgt=fgets($f)) === FALSE ) { + phpCAS::trace('could not read PGT from `'.$fname.'\''); + } + fclose($f); + } + + // delete the PGT file + @unlink($fname); + + phpCAS::traceEnd($pgt); + return $pgt; + } + + /** @} */ + +} + + ?> \ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-main.php b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-main.php index cd9b499671..8fd3c9e12b 100644 --- a/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-main.php +++ b/plugins/CasAuthentication/extlib/CAS/PGTStorage/pgt-main.php @@ -1,188 +1,188 @@ - - * - * @ingroup internalPGTStorage - */ - -class PGTStorage -{ - /** - * @addtogroup internalPGTStorage - * @{ - */ - - // ######################################################################## - // CONSTRUCTOR - // ######################################################################## - - /** - * The constructor of the class, should be called only by inherited classes. - * - * @param $cas_parent the CASclient instance that creates the current object. - * - * @protected - */ - function PGTStorage($cas_parent) - { - phpCAS::traceBegin(); - if ( !$cas_parent->isProxy() ) { - phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy'); - } - phpCAS::traceEnd(); - } - - // ######################################################################## - // DEBUGGING - // ######################################################################## - - /** - * This virtual method returns an informational string giving the type of storage - * used by the object (used for debugging purposes). - * - * @public - */ - function getStorageType() - { - phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); - } - - /** - * This virtual method returns an informational string giving informations on the - * parameters of the storage.(used for debugging purposes). - * - * @public - */ - function getStorageInfo() - { - phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); - } - - // ######################################################################## - // ERROR HANDLING - // ######################################################################## - - /** - * string used to store an error message. Written by PGTStorage::setErrorMessage(), - * read by PGTStorage::getErrorMessage(). - * - * @hideinitializer - * @private - * @deprecated not used. - */ - var $_error_message=FALSE; - - /** - * This method sets en error message, which can be read later by - * PGTStorage::getErrorMessage(). - * - * @param $error_message an error message - * - * @protected - * @deprecated not used. - */ - function setErrorMessage($error_message) - { - $this->_error_message = $error_message; - } - - /** - * This method returns an error message set by PGTStorage::setErrorMessage(). - * - * @return an error message when set by PGTStorage::setErrorMessage(), FALSE - * otherwise. - * - * @public - * @deprecated not used. - */ - function getErrorMessage() - { - return $this->_error_message; - } - - // ######################################################################## - // INITIALIZATION - // ######################################################################## - - /** - * a boolean telling if the storage has already been initialized. Written by - * PGTStorage::init(), read by PGTStorage::isInitialized(). - * - * @hideinitializer - * @private - */ - var $_initialized = FALSE; - - /** - * This method tells if the storage has already been intialized. - * - * @return a boolean - * - * @protected - */ - function isInitialized() - { - return $this->_initialized; - } - - /** - * This virtual method initializes the object. - * - * @protected - */ - function init() - { - $this->_initialized = TRUE; - } - - // ######################################################################## - // PGT I/O - // ######################################################################## - - /** - * This virtual method stores a PGT and its corresponding PGT Iuo. - * @note Should never be called. - * - * @param $pgt the PGT - * @param $pgt_iou the PGT iou - * - * @protected - */ - function write($pgt,$pgt_iou) - { - phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); - } - - /** - * This virtual method reads a PGT corresponding to a PGT Iou and deletes - * the corresponding storage entry. - * @note Should never be called. - * - * @param $pgt_iou the PGT iou - * - * @protected - */ - function read($pgt_iou) - { - phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); - } - - /** @} */ - -} - -// include specific PGT storage classes -include_once(dirname(__FILE__).'/pgt-file.php'); -include_once(dirname(__FILE__).'/pgt-db.php'); - + + * + * @ingroup internalPGTStorage + */ + +class PGTStorage +{ + /** + * @addtogroup internalPGTStorage + * @{ + */ + + // ######################################################################## + // CONSTRUCTOR + // ######################################################################## + + /** + * The constructor of the class, should be called only by inherited classes. + * + * @param $cas_parent the CASclient instance that creates the current object. + * + * @protected + */ + function PGTStorage($cas_parent) + { + phpCAS::traceBegin(); + if ( !$cas_parent->isProxy() ) { + phpCAS::error('defining PGT storage makes no sense when not using a CAS proxy'); + } + phpCAS::traceEnd(); + } + + // ######################################################################## + // DEBUGGING + // ######################################################################## + + /** + * This virtual method returns an informational string giving the type of storage + * used by the object (used for debugging purposes). + * + * @public + */ + function getStorageType() + { + phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); + } + + /** + * This virtual method returns an informational string giving informations on the + * parameters of the storage.(used for debugging purposes). + * + * @public + */ + function getStorageInfo() + { + phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); + } + + // ######################################################################## + // ERROR HANDLING + // ######################################################################## + + /** + * string used to store an error message. Written by PGTStorage::setErrorMessage(), + * read by PGTStorage::getErrorMessage(). + * + * @hideinitializer + * @private + * @deprecated not used. + */ + var $_error_message=FALSE; + + /** + * This method sets en error message, which can be read later by + * PGTStorage::getErrorMessage(). + * + * @param $error_message an error message + * + * @protected + * @deprecated not used. + */ + function setErrorMessage($error_message) + { + $this->_error_message = $error_message; + } + + /** + * This method returns an error message set by PGTStorage::setErrorMessage(). + * + * @return an error message when set by PGTStorage::setErrorMessage(), FALSE + * otherwise. + * + * @public + * @deprecated not used. + */ + function getErrorMessage() + { + return $this->_error_message; + } + + // ######################################################################## + // INITIALIZATION + // ######################################################################## + + /** + * a boolean telling if the storage has already been initialized. Written by + * PGTStorage::init(), read by PGTStorage::isInitialized(). + * + * @hideinitializer + * @private + */ + var $_initialized = FALSE; + + /** + * This method tells if the storage has already been intialized. + * + * @return a boolean + * + * @protected + */ + function isInitialized() + { + return $this->_initialized; + } + + /** + * This virtual method initializes the object. + * + * @protected + */ + function init() + { + $this->_initialized = TRUE; + } + + // ######################################################################## + // PGT I/O + // ######################################################################## + + /** + * This virtual method stores a PGT and its corresponding PGT Iuo. + * @note Should never be called. + * + * @param $pgt the PGT + * @param $pgt_iou the PGT iou + * + * @protected + */ + function write($pgt,$pgt_iou) + { + phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); + } + + /** + * This virtual method reads a PGT corresponding to a PGT Iou and deletes + * the corresponding storage entry. + * @note Should never be called. + * + * @param $pgt_iou the PGT iou + * + * @protected + */ + function read($pgt_iou) + { + phpCAS::error(__CLASS__.'::'.__FUNCTION__.'() should never be called'); + } + + /** @} */ + +} + +// include specific PGT storage classes +include_once(dirname(__FILE__).'/pgt-file.php'); +include_once(dirname(__FILE__).'/pgt-db.php'); + ?> \ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/client.php b/plugins/CasAuthentication/extlib/CAS/client.php index bfea59052d..bbde55a284 100644 --- a/plugins/CasAuthentication/extlib/CAS/client.php +++ b/plugins/CasAuthentication/extlib/CAS/client.php @@ -1,2297 +1,2297 @@ - - */ - -class CASClient -{ - - // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - // XX XX - // XX CONFIGURATION XX - // XX XX - // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - - // ######################################################################## - // HTML OUTPUT - // ######################################################################## - /** - * @addtogroup internalOutput - * @{ - */ - - /** - * This method filters a string by replacing special tokens by appropriate values - * and prints it. The corresponding tokens are taken into account: - * - __CAS_VERSION__ - * - __PHPCAS_VERSION__ - * - __SERVER_BASE_URL__ - * - * Used by CASClient::PrintHTMLHeader() and CASClient::printHTMLFooter(). - * - * @param $str the string to filter and output - * - * @private - */ - function HTMLFilterOutput($str) - { - $str = str_replace('__CAS_VERSION__',$this->getServerVersion(),$str); - $str = str_replace('__PHPCAS_VERSION__',phpCAS::getVersion(),$str); - $str = str_replace('__SERVER_BASE_URL__',$this->getServerBaseURL(),$str); - echo $str; - } - - /** - * A string used to print the header of HTML pages. Written by CASClient::setHTMLHeader(), - * read by CASClient::printHTMLHeader(). - * - * @hideinitializer - * @private - * @see CASClient::setHTMLHeader, CASClient::printHTMLHeader() - */ - var $_output_header = ''; - - /** - * This method prints the header of the HTML output (after filtering). If - * CASClient::setHTMLHeader() was not used, a default header is output. - * - * @param $title the title of the page - * - * @see HTMLFilterOutput() - * @private - */ - function printHTMLHeader($title) - { - $this->HTMLFilterOutput(str_replace('__TITLE__', - $title, - (empty($this->_output_header) - ? '__TITLE__

__TITLE__

' - : $this->_output_header) - ) - ); - } - - /** - * A string used to print the footer of HTML pages. Written by CASClient::setHTMLFooter(), - * read by printHTMLFooter(). - * - * @hideinitializer - * @private - * @see CASClient::setHTMLFooter, CASClient::printHTMLFooter() - */ - var $_output_footer = ''; - - /** - * This method prints the footer of the HTML output (after filtering). If - * CASClient::setHTMLFooter() was not used, a default footer is output. - * - * @see HTMLFilterOutput() - * @private - */ - function printHTMLFooter() - { - $this->HTMLFilterOutput(empty($this->_output_footer) - ?('
phpCAS __PHPCAS_VERSION__ '.$this->getString(CAS_STR_USING_SERVER).' __SERVER_BASE_URL__ (CAS __CAS_VERSION__)
') - :$this->_output_footer); - } - - /** - * This method set the HTML header used for all outputs. - * - * @param $header the HTML header. - * - * @public - */ - function setHTMLHeader($header) - { - $this->_output_header = $header; - } - - /** - * This method set the HTML footer used for all outputs. - * - * @param $footer the HTML footer. - * - * @public - */ - function setHTMLFooter($footer) - { - $this->_output_footer = $footer; - } - - /** @} */ - // ######################################################################## - // INTERNATIONALIZATION - // ######################################################################## - /** - * @addtogroup internalLang - * @{ - */ - /** - * A string corresponding to the language used by phpCAS. Written by - * CASClient::setLang(), read by CASClient::getLang(). - - * @note debugging information is always in english (debug purposes only). - * - * @hideinitializer - * @private - * @sa CASClient::_strings, CASClient::getString() - */ - var $_lang = ''; - - /** - * This method returns the language used by phpCAS. - * - * @return a string representing the language - * - * @private - */ - function getLang() - { - if ( empty($this->_lang) ) - $this->setLang(PHPCAS_LANG_DEFAULT); - return $this->_lang; - } - - /** - * array containing the strings used by phpCAS. Written by CASClient::setLang(), read by - * CASClient::getString() and used by CASClient::setLang(). - * - * @note This array is filled by instructions in CAS/languages/<$this->_lang>.php - * - * @private - * @see CASClient::_lang, CASClient::getString(), CASClient::setLang(), CASClient::getLang() - */ - var $_strings; - - /** - * This method returns a string depending on the language. - * - * @param $str the index of the string in $_string. - * - * @return the string corresponding to $index in $string. - * - * @private - */ - function getString($str) - { - // call CASclient::getLang() to be sure the language is initialized - $this->getLang(); - - if ( !isset($this->_strings[$str]) ) { - trigger_error('string `'.$str.'\' not defined for language `'.$this->getLang().'\'',E_USER_ERROR); - } - return $this->_strings[$str]; - } - - /** - * This method is used to set the language used by phpCAS. - * @note Can be called only once. - * - * @param $lang a string representing the language. - * - * @public - * @sa CAS_LANG_FRENCH, CAS_LANG_ENGLISH - */ - function setLang($lang) - { - // include the corresponding language file - include_once(dirname(__FILE__).'/languages/'.$lang.'.php'); - - if ( !is_array($this->_strings) ) { - trigger_error('language `'.$lang.'\' is not implemented',E_USER_ERROR); - } - $this->_lang = $lang; - } - - /** @} */ - // ######################################################################## - // CAS SERVER CONFIG - // ######################################################################## - /** - * @addtogroup internalConfig - * @{ - */ - - /** - * a record to store information about the CAS server. - * - $_server["version"]: the version of the CAS server - * - $_server["hostname"]: the hostname of the CAS server - * - $_server["port"]: the port the CAS server is running on - * - $_server["uri"]: the base URI the CAS server is responding on - * - $_server["base_url"]: the base URL of the CAS server - * - $_server["login_url"]: the login URL of the CAS server - * - $_server["service_validate_url"]: the service validating URL of the CAS server - * - $_server["proxy_url"]: the proxy URL of the CAS server - * - $_server["proxy_validate_url"]: the proxy validating URL of the CAS server - * - $_server["logout_url"]: the logout URL of the CAS server - * - * $_server["version"], $_server["hostname"], $_server["port"] and $_server["uri"] - * are written by CASClient::CASClient(), read by CASClient::getServerVersion(), - * CASClient::getServerHostname(), CASClient::getServerPort() and CASClient::getServerURI(). - * - * The other fields are written and read by CASClient::getServerBaseURL(), - * CASClient::getServerLoginURL(), CASClient::getServerServiceValidateURL(), - * CASClient::getServerProxyValidateURL() and CASClient::getServerLogoutURL(). - * - * @hideinitializer - * @private - */ - var $_server = array( - 'version' => -1, - 'hostname' => 'none', - 'port' => -1, - 'uri' => 'none' - ); - - /** - * This method is used to retrieve the version of the CAS server. - * @return the version of the CAS server. - * @private - */ - function getServerVersion() - { - return $this->_server['version']; - } - - /** - * This method is used to retrieve the hostname of the CAS server. - * @return the hostname of the CAS server. - * @private - */ - function getServerHostname() - { return $this->_server['hostname']; } - - /** - * This method is used to retrieve the port of the CAS server. - * @return the port of the CAS server. - * @private - */ - function getServerPort() - { return $this->_server['port']; } - - /** - * This method is used to retrieve the URI of the CAS server. - * @return a URI. - * @private - */ - function getServerURI() - { return $this->_server['uri']; } - - /** - * This method is used to retrieve the base URL of the CAS server. - * @return a URL. - * @private - */ - function getServerBaseURL() - { - // the URL is build only when needed - if ( empty($this->_server['base_url']) ) { - $this->_server['base_url'] = 'https://' - .$this->getServerHostname() - .':' - .$this->getServerPort() - .$this->getServerURI(); - } - return $this->_server['base_url']; - } - - /** - * This method is used to retrieve the login URL of the CAS server. - * @param $gateway true to check authentication, false to force it - * @param $renew true to force the authentication with the CAS server - * NOTE : It is recommended that CAS implementations ignore the - "gateway" parameter if "renew" is set - * @return a URL. - * @private - */ - function getServerLoginURL($gateway=false,$renew=false) { - phpCAS::traceBegin(); - // the URL is build only when needed - if ( empty($this->_server['login_url']) ) { - $this->_server['login_url'] = $this->getServerBaseURL(); - $this->_server['login_url'] .= 'login?service='; - // $this->_server['login_url'] .= preg_replace('/&/','%26',$this->getURL()); - $this->_server['login_url'] .= urlencode($this->getURL()); - if($renew) { - // It is recommended that when the "renew" parameter is set, its value be "true" - $this->_server['login_url'] .= '&renew=true'; - } elseif ($gateway) { - // It is recommended that when the "gateway" parameter is set, its value be "true" - $this->_server['login_url'] .= '&gateway=true'; - } - } - phpCAS::traceEnd($this->_server['login_url']); - return $this->_server['login_url']; - } - - /** - * This method sets the login URL of the CAS server. - * @param $url the login URL - * @private - * @since 0.4.21 by Wyman Chan - */ - function setServerLoginURL($url) - { - return $this->_server['login_url'] = $url; - } - - /** - * This method is used to retrieve the service validating URL of the CAS server. - * @return a URL. - * @private - */ - function getServerServiceValidateURL() - { - // the URL is build only when needed - if ( empty($this->_server['service_validate_url']) ) { - switch ($this->getServerVersion()) { - case CAS_VERSION_1_0: - $this->_server['service_validate_url'] = $this->getServerBaseURL().'validate'; - break; - case CAS_VERSION_2_0: - $this->_server['service_validate_url'] = $this->getServerBaseURL().'serviceValidate'; - break; - } - } - // return $this->_server['service_validate_url'].'?service='.preg_replace('/&/','%26',$this->getURL()); - return $this->_server['service_validate_url'].'?service='.urlencode($this->getURL()); - } - - /** - * This method is used to retrieve the proxy validating URL of the CAS server. - * @return a URL. - * @private - */ - function getServerProxyValidateURL() - { - // the URL is build only when needed - if ( empty($this->_server['proxy_validate_url']) ) { - switch ($this->getServerVersion()) { - case CAS_VERSION_1_0: - $this->_server['proxy_validate_url'] = ''; - break; - case CAS_VERSION_2_0: - $this->_server['proxy_validate_url'] = $this->getServerBaseURL().'proxyValidate'; - break; - } - } - // return $this->_server['proxy_validate_url'].'?service='.preg_replace('/&/','%26',$this->getURL()); - return $this->_server['proxy_validate_url'].'?service='.urlencode($this->getURL()); - } - - /** - * This method is used to retrieve the proxy URL of the CAS server. - * @return a URL. - * @private - */ - function getServerProxyURL() - { - // the URL is build only when needed - if ( empty($this->_server['proxy_url']) ) { - switch ($this->getServerVersion()) { - case CAS_VERSION_1_0: - $this->_server['proxy_url'] = ''; - break; - case CAS_VERSION_2_0: - $this->_server['proxy_url'] = $this->getServerBaseURL().'proxy'; - break; - } - } - return $this->_server['proxy_url']; - } - - /** - * This method is used to retrieve the logout URL of the CAS server. - * @return a URL. - * @private - */ - function getServerLogoutURL() - { - // the URL is build only when needed - if ( empty($this->_server['logout_url']) ) { - $this->_server['logout_url'] = $this->getServerBaseURL().'logout'; - } - return $this->_server['logout_url']; - } - - /** - * This method sets the logout URL of the CAS server. - * @param $url the logout URL - * @private - * @since 0.4.21 by Wyman Chan - */ - function setServerLogoutURL($url) - { - return $this->_server['logout_url'] = $url; - } - - /** - * An array to store extra curl options. - */ - var $_curl_options = array(); - - /** - * This method is used to set additional user curl options. - */ - function setExtraCurlOption($key, $value) - { - $this->_curl_options[$key] = $value; - } - - /** - * This method checks to see if the request is secured via HTTPS - * @return true if https, false otherwise - * @private - */ - function isHttps() { - //if ( isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) ) { - //0.4.24 by Hinnack - if ( isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') { - return true; - } else { - return false; - } - } - - // ######################################################################## - // CONSTRUCTOR - // ######################################################################## - /** - * CASClient constructor. - * - * @param $server_version the version of the CAS server - * @param $proxy TRUE if the CAS client is a CAS proxy, FALSE otherwise - * @param $server_hostname the hostname of the CAS server - * @param $server_port the port the CAS server is running on - * @param $server_uri the URI the CAS server is responding on - * @param $start_session Have phpCAS start PHP sessions (default true) - * - * @return a newly created CASClient object - * - * @public - */ - function CASClient( - $server_version, - $proxy, - $server_hostname, - $server_port, - $server_uri, - $start_session = true) { - - phpCAS::traceBegin(); - - if (!$this->isLogoutRequest() && !empty($_GET['ticket']) && $start_session) { - // copy old session vars and destroy the current session - if (!isset($_SESSION)) { - session_start(); - } - $old_session = $_SESSION; - session_destroy(); - // set up a new session, of name based on the ticket - $session_id = preg_replace('/[^\w]/','',$_GET['ticket']); - phpCAS::LOG("Session ID: " . $session_id); - session_id($session_id); - if (!isset($_SESSION)) { - session_start(); - } - // restore old session vars + + */ + +class CASClient +{ + + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + // XX XX + // XX CONFIGURATION XX + // XX XX + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + // ######################################################################## + // HTML OUTPUT + // ######################################################################## + /** + * @addtogroup internalOutput + * @{ + */ + + /** + * This method filters a string by replacing special tokens by appropriate values + * and prints it. The corresponding tokens are taken into account: + * - __CAS_VERSION__ + * - __PHPCAS_VERSION__ + * - __SERVER_BASE_URL__ + * + * Used by CASClient::PrintHTMLHeader() and CASClient::printHTMLFooter(). + * + * @param $str the string to filter and output + * + * @private + */ + function HTMLFilterOutput($str) + { + $str = str_replace('__CAS_VERSION__',$this->getServerVersion(),$str); + $str = str_replace('__PHPCAS_VERSION__',phpCAS::getVersion(),$str); + $str = str_replace('__SERVER_BASE_URL__',$this->getServerBaseURL(),$str); + echo $str; + } + + /** + * A string used to print the header of HTML pages. Written by CASClient::setHTMLHeader(), + * read by CASClient::printHTMLHeader(). + * + * @hideinitializer + * @private + * @see CASClient::setHTMLHeader, CASClient::printHTMLHeader() + */ + var $_output_header = ''; + + /** + * This method prints the header of the HTML output (after filtering). If + * CASClient::setHTMLHeader() was not used, a default header is output. + * + * @param $title the title of the page + * + * @see HTMLFilterOutput() + * @private + */ + function printHTMLHeader($title) + { + $this->HTMLFilterOutput(str_replace('__TITLE__', + $title, + (empty($this->_output_header) + ? '__TITLE__

__TITLE__

' + : $this->_output_header) + ) + ); + } + + /** + * A string used to print the footer of HTML pages. Written by CASClient::setHTMLFooter(), + * read by printHTMLFooter(). + * + * @hideinitializer + * @private + * @see CASClient::setHTMLFooter, CASClient::printHTMLFooter() + */ + var $_output_footer = ''; + + /** + * This method prints the footer of the HTML output (after filtering). If + * CASClient::setHTMLFooter() was not used, a default footer is output. + * + * @see HTMLFilterOutput() + * @private + */ + function printHTMLFooter() + { + $this->HTMLFilterOutput(empty($this->_output_footer) + ?('
phpCAS __PHPCAS_VERSION__ '.$this->getString(CAS_STR_USING_SERVER).' __SERVER_BASE_URL__ (CAS __CAS_VERSION__)
') + :$this->_output_footer); + } + + /** + * This method set the HTML header used for all outputs. + * + * @param $header the HTML header. + * + * @public + */ + function setHTMLHeader($header) + { + $this->_output_header = $header; + } + + /** + * This method set the HTML footer used for all outputs. + * + * @param $footer the HTML footer. + * + * @public + */ + function setHTMLFooter($footer) + { + $this->_output_footer = $footer; + } + + /** @} */ + // ######################################################################## + // INTERNATIONALIZATION + // ######################################################################## + /** + * @addtogroup internalLang + * @{ + */ + /** + * A string corresponding to the language used by phpCAS. Written by + * CASClient::setLang(), read by CASClient::getLang(). + + * @note debugging information is always in english (debug purposes only). + * + * @hideinitializer + * @private + * @sa CASClient::_strings, CASClient::getString() + */ + var $_lang = ''; + + /** + * This method returns the language used by phpCAS. + * + * @return a string representing the language + * + * @private + */ + function getLang() + { + if ( empty($this->_lang) ) + $this->setLang(PHPCAS_LANG_DEFAULT); + return $this->_lang; + } + + /** + * array containing the strings used by phpCAS. Written by CASClient::setLang(), read by + * CASClient::getString() and used by CASClient::setLang(). + * + * @note This array is filled by instructions in CAS/languages/<$this->_lang>.php + * + * @private + * @see CASClient::_lang, CASClient::getString(), CASClient::setLang(), CASClient::getLang() + */ + var $_strings; + + /** + * This method returns a string depending on the language. + * + * @param $str the index of the string in $_string. + * + * @return the string corresponding to $index in $string. + * + * @private + */ + function getString($str) + { + // call CASclient::getLang() to be sure the language is initialized + $this->getLang(); + + if ( !isset($this->_strings[$str]) ) { + trigger_error('string `'.$str.'\' not defined for language `'.$this->getLang().'\'',E_USER_ERROR); + } + return $this->_strings[$str]; + } + + /** + * This method is used to set the language used by phpCAS. + * @note Can be called only once. + * + * @param $lang a string representing the language. + * + * @public + * @sa CAS_LANG_FRENCH, CAS_LANG_ENGLISH + */ + function setLang($lang) + { + // include the corresponding language file + include_once(dirname(__FILE__).'/languages/'.$lang.'.php'); + + if ( !is_array($this->_strings) ) { + trigger_error('language `'.$lang.'\' is not implemented',E_USER_ERROR); + } + $this->_lang = $lang; + } + + /** @} */ + // ######################################################################## + // CAS SERVER CONFIG + // ######################################################################## + /** + * @addtogroup internalConfig + * @{ + */ + + /** + * a record to store information about the CAS server. + * - $_server["version"]: the version of the CAS server + * - $_server["hostname"]: the hostname of the CAS server + * - $_server["port"]: the port the CAS server is running on + * - $_server["uri"]: the base URI the CAS server is responding on + * - $_server["base_url"]: the base URL of the CAS server + * - $_server["login_url"]: the login URL of the CAS server + * - $_server["service_validate_url"]: the service validating URL of the CAS server + * - $_server["proxy_url"]: the proxy URL of the CAS server + * - $_server["proxy_validate_url"]: the proxy validating URL of the CAS server + * - $_server["logout_url"]: the logout URL of the CAS server + * + * $_server["version"], $_server["hostname"], $_server["port"] and $_server["uri"] + * are written by CASClient::CASClient(), read by CASClient::getServerVersion(), + * CASClient::getServerHostname(), CASClient::getServerPort() and CASClient::getServerURI(). + * + * The other fields are written and read by CASClient::getServerBaseURL(), + * CASClient::getServerLoginURL(), CASClient::getServerServiceValidateURL(), + * CASClient::getServerProxyValidateURL() and CASClient::getServerLogoutURL(). + * + * @hideinitializer + * @private + */ + var $_server = array( + 'version' => -1, + 'hostname' => 'none', + 'port' => -1, + 'uri' => 'none' + ); + + /** + * This method is used to retrieve the version of the CAS server. + * @return the version of the CAS server. + * @private + */ + function getServerVersion() + { + return $this->_server['version']; + } + + /** + * This method is used to retrieve the hostname of the CAS server. + * @return the hostname of the CAS server. + * @private + */ + function getServerHostname() + { return $this->_server['hostname']; } + + /** + * This method is used to retrieve the port of the CAS server. + * @return the port of the CAS server. + * @private + */ + function getServerPort() + { return $this->_server['port']; } + + /** + * This method is used to retrieve the URI of the CAS server. + * @return a URI. + * @private + */ + function getServerURI() + { return $this->_server['uri']; } + + /** + * This method is used to retrieve the base URL of the CAS server. + * @return a URL. + * @private + */ + function getServerBaseURL() + { + // the URL is build only when needed + if ( empty($this->_server['base_url']) ) { + $this->_server['base_url'] = 'https://' + .$this->getServerHostname() + .':' + .$this->getServerPort() + .$this->getServerURI(); + } + return $this->_server['base_url']; + } + + /** + * This method is used to retrieve the login URL of the CAS server. + * @param $gateway true to check authentication, false to force it + * @param $renew true to force the authentication with the CAS server + * NOTE : It is recommended that CAS implementations ignore the + "gateway" parameter if "renew" is set + * @return a URL. + * @private + */ + function getServerLoginURL($gateway=false,$renew=false) { + phpCAS::traceBegin(); + // the URL is build only when needed + if ( empty($this->_server['login_url']) ) { + $this->_server['login_url'] = $this->getServerBaseURL(); + $this->_server['login_url'] .= 'login?service='; + // $this->_server['login_url'] .= preg_replace('/&/','%26',$this->getURL()); + $this->_server['login_url'] .= urlencode($this->getURL()); + if($renew) { + // It is recommended that when the "renew" parameter is set, its value be "true" + $this->_server['login_url'] .= '&renew=true'; + } elseif ($gateway) { + // It is recommended that when the "gateway" parameter is set, its value be "true" + $this->_server['login_url'] .= '&gateway=true'; + } + } + phpCAS::traceEnd($this->_server['login_url']); + return $this->_server['login_url']; + } + + /** + * This method sets the login URL of the CAS server. + * @param $url the login URL + * @private + * @since 0.4.21 by Wyman Chan + */ + function setServerLoginURL($url) + { + return $this->_server['login_url'] = $url; + } + + /** + * This method is used to retrieve the service validating URL of the CAS server. + * @return a URL. + * @private + */ + function getServerServiceValidateURL() + { + // the URL is build only when needed + if ( empty($this->_server['service_validate_url']) ) { + switch ($this->getServerVersion()) { + case CAS_VERSION_1_0: + $this->_server['service_validate_url'] = $this->getServerBaseURL().'validate'; + break; + case CAS_VERSION_2_0: + $this->_server['service_validate_url'] = $this->getServerBaseURL().'serviceValidate'; + break; + } + } + // return $this->_server['service_validate_url'].'?service='.preg_replace('/&/','%26',$this->getURL()); + return $this->_server['service_validate_url'].'?service='.urlencode($this->getURL()); + } + + /** + * This method is used to retrieve the proxy validating URL of the CAS server. + * @return a URL. + * @private + */ + function getServerProxyValidateURL() + { + // the URL is build only when needed + if ( empty($this->_server['proxy_validate_url']) ) { + switch ($this->getServerVersion()) { + case CAS_VERSION_1_0: + $this->_server['proxy_validate_url'] = ''; + break; + case CAS_VERSION_2_0: + $this->_server['proxy_validate_url'] = $this->getServerBaseURL().'proxyValidate'; + break; + } + } + // return $this->_server['proxy_validate_url'].'?service='.preg_replace('/&/','%26',$this->getURL()); + return $this->_server['proxy_validate_url'].'?service='.urlencode($this->getURL()); + } + + /** + * This method is used to retrieve the proxy URL of the CAS server. + * @return a URL. + * @private + */ + function getServerProxyURL() + { + // the URL is build only when needed + if ( empty($this->_server['proxy_url']) ) { + switch ($this->getServerVersion()) { + case CAS_VERSION_1_0: + $this->_server['proxy_url'] = ''; + break; + case CAS_VERSION_2_0: + $this->_server['proxy_url'] = $this->getServerBaseURL().'proxy'; + break; + } + } + return $this->_server['proxy_url']; + } + + /** + * This method is used to retrieve the logout URL of the CAS server. + * @return a URL. + * @private + */ + function getServerLogoutURL() + { + // the URL is build only when needed + if ( empty($this->_server['logout_url']) ) { + $this->_server['logout_url'] = $this->getServerBaseURL().'logout'; + } + return $this->_server['logout_url']; + } + + /** + * This method sets the logout URL of the CAS server. + * @param $url the logout URL + * @private + * @since 0.4.21 by Wyman Chan + */ + function setServerLogoutURL($url) + { + return $this->_server['logout_url'] = $url; + } + + /** + * An array to store extra curl options. + */ + var $_curl_options = array(); + + /** + * This method is used to set additional user curl options. + */ + function setExtraCurlOption($key, $value) + { + $this->_curl_options[$key] = $value; + } + + /** + * This method checks to see if the request is secured via HTTPS + * @return true if https, false otherwise + * @private + */ + function isHttps() { + //if ( isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) ) { + //0.4.24 by Hinnack + if ( isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') { + return true; + } else { + return false; + } + } + + // ######################################################################## + // CONSTRUCTOR + // ######################################################################## + /** + * CASClient constructor. + * + * @param $server_version the version of the CAS server + * @param $proxy TRUE if the CAS client is a CAS proxy, FALSE otherwise + * @param $server_hostname the hostname of the CAS server + * @param $server_port the port the CAS server is running on + * @param $server_uri the URI the CAS server is responding on + * @param $start_session Have phpCAS start PHP sessions (default true) + * + * @return a newly created CASClient object + * + * @public + */ + function CASClient( + $server_version, + $proxy, + $server_hostname, + $server_port, + $server_uri, + $start_session = true) { + + phpCAS::traceBegin(); + + if (!$this->isLogoutRequest() && !empty($_GET['ticket']) && $start_session) { + // copy old session vars and destroy the current session + if (!isset($_SESSION)) { + session_start(); + } + $old_session = $_SESSION; + session_destroy(); + // set up a new session, of name based on the ticket + $session_id = preg_replace('/[^\w]/','',$_GET['ticket']); + phpCAS::LOG("Session ID: " . $session_id); + session_id($session_id); + if (!isset($_SESSION)) { + session_start(); + } + // restore old session vars $_SESSION = $old_session; // Redirect to location without ticket. - header('Location: '.$this->getURL()); - } - - //activate session mechanism if desired - if (!$this->isLogoutRequest() && $start_session) { - session_start(); - } - - $this->_proxy = $proxy; - - //check version - switch ($server_version) { - case CAS_VERSION_1_0: - if ( $this->isProxy() ) - phpCAS::error('CAS proxies are not supported in CAS ' - .$server_version); - break; - case CAS_VERSION_2_0: - break; - default: - phpCAS::error('this version of CAS (`' - .$server_version - .'\') is not supported by phpCAS ' - .phpCAS::getVersion()); - } - $this->_server['version'] = $server_version; - - //check hostname - if ( empty($server_hostname) - || !preg_match('/[\.\d\-abcdefghijklmnopqrstuvwxyz]*/',$server_hostname) ) { - phpCAS::error('bad CAS server hostname (`'.$server_hostname.'\')'); - } - $this->_server['hostname'] = $server_hostname; - - //check port - if ( $server_port == 0 - || !is_int($server_port) ) { - phpCAS::error('bad CAS server port (`'.$server_hostname.'\')'); - } - $this->_server['port'] = $server_port; - - //check URI - if ( !preg_match('/[\.\d\-_abcdefghijklmnopqrstuvwxyz\/]*/',$server_uri) ) { - phpCAS::error('bad CAS server URI (`'.$server_uri.'\')'); - } - //add leading and trailing `/' and remove doubles - $server_uri = preg_replace('/\/\//','/','/'.$server_uri.'/'); - $this->_server['uri'] = $server_uri; - - //set to callback mode if PgtIou and PgtId CGI GET parameters are provided - if ( $this->isProxy() ) { - $this->setCallbackMode(!empty($_GET['pgtIou'])&&!empty($_GET['pgtId'])); - } - - if ( $this->isCallbackMode() ) { - //callback mode: check that phpCAS is secured - if ( !$this->isHttps() ) { - phpCAS::error('CAS proxies must be secured to use phpCAS; PGT\'s will not be received from the CAS server'); - } - } else { - //normal mode: get ticket and remove it from CGI parameters for developpers - $ticket = (isset($_GET['ticket']) ? $_GET['ticket'] : null); - switch ($this->getServerVersion()) { - case CAS_VERSION_1_0: // check for a Service Ticket - if( preg_match('/^ST-/',$ticket) ) { - phpCAS::trace('ST \''.$ticket.'\' found'); - //ST present - $this->setST($ticket); - //ticket has been taken into account, unset it to hide it to applications - unset($_GET['ticket']); - } else if ( !empty($ticket) ) { - //ill-formed ticket, halt - phpCAS::error('ill-formed ticket found in the URL (ticket=`'.htmlentities($ticket).'\')'); - } - break; - case CAS_VERSION_2_0: // check for a Service or Proxy Ticket - if( preg_match('/^[SP]T-/',$ticket) ) { - phpCAS::trace('ST or PT \''.$ticket.'\' found'); - $this->setPT($ticket); - unset($_GET['ticket']); - } else if ( !empty($ticket) ) { - //ill-formed ticket, halt - phpCAS::error('ill-formed ticket found in the URL (ticket=`'.htmlentities($ticket).'\')'); - } - break; - } - } - phpCAS::traceEnd(); - } - - /** @} */ - - // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - // XX XX - // XX AUTHENTICATION XX - // XX XX - // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - - /** - * @addtogroup internalAuthentication - * @{ - */ - - /** - * The Authenticated user. Written by CASClient::setUser(), read by CASClient::getUser(). - * @attention client applications should use phpCAS::getUser(). - * - * @hideinitializer - * @private - */ - var $_user = ''; - - /** - * This method sets the CAS user's login name. - * - * @param $user the login name of the authenticated user. - * - * @private - */ - function setUser($user) - { - $this->_user = $user; - } - - /** - * This method returns the CAS user's login name. - * @warning should be called only after CASClient::forceAuthentication() or - * CASClient::isAuthenticated(), otherwise halt with an error. - * - * @return the login name of the authenticated user - */ - function getUser() - { - if ( empty($this->_user) ) { - phpCAS::error('this method should be used only after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()'); - } - return $this->_user; - } - - /** - * This method is called to renew the authentication of the user - * If the user is authenticated, renew the connection - * If not, redirect to CAS - * @public - */ - function renewAuthentication(){ - phpCAS::traceBegin(); - // Either way, the user is authenticated by CAS - if( isset( $_SESSION['phpCAS']['auth_checked'] ) ) - unset($_SESSION['phpCAS']['auth_checked']); - if ( $this->isAuthenticated() ) { - phpCAS::trace('user already authenticated; renew'); - $this->redirectToCas(false,true); - } else { - $this->redirectToCas(); - } - phpCAS::traceEnd(); - } - - /** - * This method is called to be sure that the user is authenticated. When not - * authenticated, halt by redirecting to the CAS server; otherwise return TRUE. - * @return TRUE when the user is authenticated; otherwise halt. - * @public - */ - function forceAuthentication() - { - phpCAS::traceBegin(); - - if ( $this->isAuthenticated() ) { - // the user is authenticated, nothing to be done. - phpCAS::trace('no need to authenticate'); - $res = TRUE; - } else { - // the user is not authenticated, redirect to the CAS server - if (isset($_SESSION['phpCAS']['auth_checked'])) { - unset($_SESSION['phpCAS']['auth_checked']); - } - $this->redirectToCas(FALSE/* no gateway */); - // never reached - $res = FALSE; - } - phpCAS::traceEnd($res); - return $res; - } - - /** - * An integer that gives the number of times authentication will be cached before rechecked. - * - * @hideinitializer - * @private - */ - var $_cache_times_for_auth_recheck = 0; - - /** - * Set the number of times authentication will be cached before rechecked. - * - * @param $n an integer. - * - * @public - */ - function setCacheTimesForAuthRecheck($n) - { - $this->_cache_times_for_auth_recheck = $n; - } - - /** - * This method is called to check whether the user is authenticated or not. - * @return TRUE when the user is authenticated, FALSE otherwise. - * @public - */ - function checkAuthentication() - { - phpCAS::traceBegin(); - - if ( $this->isAuthenticated() ) { - phpCAS::trace('user is authenticated'); - $res = TRUE; - } else if (isset($_SESSION['phpCAS']['auth_checked'])) { - // the previous request has redirected the client to the CAS server with gateway=true - unset($_SESSION['phpCAS']['auth_checked']); - $res = FALSE; - } else { - // $_SESSION['phpCAS']['auth_checked'] = true; - // $this->redirectToCas(TRUE/* gateway */); - // // never reached - // $res = FALSE; - // avoid a check against CAS on every request - if (! isset($_SESSION['phpCAS']['unauth_count']) ) - $_SESSION['phpCAS']['unauth_count'] = -2; // uninitialized - - if (($_SESSION['phpCAS']['unauth_count'] != -2 && $this->_cache_times_for_auth_recheck == -1) - || ($_SESSION['phpCAS']['unauth_count'] >= 0 && $_SESSION['phpCAS']['unauth_count'] < $this->_cache_times_for_auth_recheck)) - { - $res = FALSE; - - if ($this->_cache_times_for_auth_recheck != -1) - { - $_SESSION['phpCAS']['unauth_count']++; - phpCAS::trace('user is not authenticated (cached for '.$_SESSION['phpCAS']['unauth_count'].' times of '.$this->_cache_times_for_auth_recheck.')'); - } - else - { - phpCAS::trace('user is not authenticated (cached for until login pressed)'); - } - } - else - { - $_SESSION['phpCAS']['unauth_count'] = 0; - $_SESSION['phpCAS']['auth_checked'] = true; - phpCAS::trace('user is not authenticated (cache reset)'); - $this->redirectToCas(TRUE/* gateway */); - // never reached - $res = FALSE; - } - } - phpCAS::traceEnd($res); - return $res; - } - - /** - * This method is called to check if the user is authenticated (previously or by - * tickets given in the URL). - * - * @return TRUE when the user is authenticated. - * - * @public - */ - function isAuthenticated() - { - phpCAS::traceBegin(); - $res = FALSE; - $validate_url = ''; - - if ( $this->wasPreviouslyAuthenticated() ) { - // the user has already (previously during the session) been - // authenticated, nothing to be done. - phpCAS::trace('user was already authenticated, no need to look for tickets'); - $res = TRUE; - } - elseif ( $this->hasST() ) { - // if a Service Ticket was given, validate it - phpCAS::trace('ST `'.$this->getST().'\' is present'); - $this->validateST($validate_url,$text_response,$tree_response); // if it fails, it halts - phpCAS::trace('ST `'.$this->getST().'\' was validated'); - if ( $this->isProxy() ) { - $this->validatePGT($validate_url,$text_response,$tree_response); // idem - phpCAS::trace('PGT `'.$this->getPGT().'\' was validated'); - $_SESSION['phpCAS']['pgt'] = $this->getPGT(); - } - $_SESSION['phpCAS']['user'] = $this->getUser(); - $res = TRUE; - } - elseif ( $this->hasPT() ) { - // if a Proxy Ticket was given, validate it - phpCAS::trace('PT `'.$this->getPT().'\' is present'); - $this->validatePT($validate_url,$text_response,$tree_response); // note: if it fails, it halts - phpCAS::trace('PT `'.$this->getPT().'\' was validated'); - if ( $this->isProxy() ) { - $this->validatePGT($validate_url,$text_response,$tree_response); // idem - phpCAS::trace('PGT `'.$this->getPGT().'\' was validated'); - $_SESSION['phpCAS']['pgt'] = $this->getPGT(); - } - $_SESSION['phpCAS']['user'] = $this->getUser(); - $res = TRUE; - } - else { - // no ticket given, not authenticated - phpCAS::trace('no ticket found'); - } - - phpCAS::traceEnd($res); - return $res; - } - - /** - * This method tells if the current session is authenticated. - * @return true if authenticated based soley on $_SESSION variable - * @since 0.4.22 by Brendan Arnold - */ - function isSessionAuthenticated () - { - return !empty($_SESSION['phpCAS']['user']); - } - - /** - * This method tells if the user has already been (previously) authenticated - * by looking into the session variables. - * - * @note This function switches to callback mode when needed. - * - * @return TRUE when the user has already been authenticated; FALSE otherwise. - * - * @private - */ - function wasPreviouslyAuthenticated() - { - phpCAS::traceBegin(); - - if ( $this->isCallbackMode() ) { - $this->callback(); - } - - $auth = FALSE; - - if ( $this->isProxy() ) { - // CAS proxy: username and PGT must be present - if ( $this->isSessionAuthenticated() && !empty($_SESSION['phpCAS']['pgt']) ) { - // authentication already done - $this->setUser($_SESSION['phpCAS']['user']); - $this->setPGT($_SESSION['phpCAS']['pgt']); - phpCAS::trace('user = `'.$_SESSION['phpCAS']['user'].'\', PGT = `'.$_SESSION['phpCAS']['pgt'].'\''); - $auth = TRUE; - } elseif ( $this->isSessionAuthenticated() && empty($_SESSION['phpCAS']['pgt']) ) { - // these two variables should be empty or not empty at the same time - phpCAS::trace('username found (`'.$_SESSION['phpCAS']['user'].'\') but PGT is empty'); - // unset all tickets to enforce authentication - unset($_SESSION['phpCAS']); - $this->setST(''); - $this->setPT(''); - } elseif ( !$this->isSessionAuthenticated() && !empty($_SESSION['phpCAS']['pgt']) ) { - // these two variables should be empty or not empty at the same time - phpCAS::trace('PGT found (`'.$_SESSION['phpCAS']['pgt'].'\') but username is empty'); - // unset all tickets to enforce authentication - unset($_SESSION['phpCAS']); - $this->setST(''); - $this->setPT(''); - } else { - phpCAS::trace('neither user not PGT found'); - } - } else { - // `simple' CAS client (not a proxy): username must be present - if ( $this->isSessionAuthenticated() ) { - // authentication already done - $this->setUser($_SESSION['phpCAS']['user']); - phpCAS::trace('user = `'.$_SESSION['phpCAS']['user'].'\''); - $auth = TRUE; - } else { - phpCAS::trace('no user found'); - } - } - - phpCAS::traceEnd($auth); - return $auth; - } - - /** - * This method is used to redirect the client to the CAS server. - * It is used by CASClient::forceAuthentication() and CASClient::checkAuthentication(). - * @param $gateway true to check authentication, false to force it - * @param $renew true to force the authentication with the CAS server - * @public - */ - function redirectToCas($gateway=false,$renew=false){ - phpCAS::traceBegin(); - $cas_url = $this->getServerLoginURL($gateway,$renew); - header('Location: '.$cas_url); - phpCAS::log( "Redirect to : ".$cas_url ); - - $this->printHTMLHeader($this->getString(CAS_STR_AUTHENTICATION_WANTED)); - - printf('

'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'

',$cas_url); - $this->printHTMLFooter(); - phpCAS::traceExit(); - exit(); - } - -// /** -// * This method is used to logout from CAS. -// * @param $url a URL that will be transmitted to the CAS server (to come back to when logged out) -// * @public -// */ -// function logout($url = "") { -// phpCAS::traceBegin(); -// $cas_url = $this->getServerLogoutURL(); -// // v0.4.14 sebastien.gougeon at univ-rennes1.fr -// // header('Location: '.$cas_url); -// if ( $url != "" ) { -// // Adam Moore 1.0.0RC2 -// $url = '?service=' . $url . '&url=' . $url; -// } -// header('Location: '.$cas_url . $url); -// session_unset(); -// session_destroy(); -// $this->printHTMLHeader($this->getString(CAS_STR_LOGOUT)); -// printf('

'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'

',$cas_url); -// $this->printHTMLFooter(); -// phpCAS::traceExit(); -// exit(); -// } - - /** - * This method is used to logout from CAS. - * @params $params an array that contains the optional url and service parameters that will be passed to the CAS server - * @public - */ - function logout($params) { - phpCAS::traceBegin(); - $cas_url = $this->getServerLogoutURL(); - $paramSeparator = '?'; - if (isset($params['url'])) { - $cas_url = $cas_url . $paramSeparator . "url=" . urlencode($params['url']); - $paramSeparator = '&'; - } - if (isset($params['service'])) { - $cas_url = $cas_url . $paramSeparator . "service=" . urlencode($params['service']); - } - header('Location: '.$cas_url); - session_unset(); - session_destroy(); - $this->printHTMLHeader($this->getString(CAS_STR_LOGOUT)); - printf('

'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'

',$cas_url); - $this->printHTMLFooter(); - phpCAS::traceExit(); - exit(); - } - - /** - * @return true if the current request is a logout request. - * @private - */ - function isLogoutRequest() { - return !empty($_POST['logoutRequest']); - } - - /** - * @return true if a logout request is allowed. - * @private - */ - function isLogoutRequestAllowed() { - } - - /** - * This method handles logout requests. - * @param $check_client true to check the client bofore handling the request, - * false not to perform any access control. True by default. - * @param $allowed_clients an array of host names allowed to send logout requests. - * By default, only the CAs server (declared in the constructor) will be allowed. - * @public - */ - function handleLogoutRequests($check_client=true, $allowed_clients=false) { - phpCAS::traceBegin(); - if (!$this->isLogoutRequest()) { - phpCAS::log("Not a logout request"); - phpCAS::traceEnd(); - return; - } - phpCAS::log("Logout requested"); - phpCAS::log("SAML REQUEST: ".$_POST['logoutRequest']); - if ($check_client) { - if (!$allowed_clients) { - $allowed_clients = array( $this->getServerHostname() ); - } - $client_ip = $_SERVER['REMOTE_ADDR']; - $client = gethostbyaddr($client_ip); - phpCAS::log("Client: ".$client); - $allowed = false; - foreach ($allowed_clients as $allowed_client) { - if ($client == $allowed_client) { - phpCAS::log("Allowed client '".$allowed_client."' matches, logout request is allowed"); - $allowed = true; - break; - } else { - phpCAS::log("Allowed client '".$allowed_client."' does not match"); - } - } - if (!$allowed) { - phpCAS::error("Unauthorized logout request from client '".$client."'"); - printf("Unauthorized!"); - phpCAS::traceExit(); - exit(); - } - } else { - phpCAS::log("No access control set"); - } - // Extract the ticket from the SAML Request - preg_match("|(.*)|", $_POST['logoutRequest'], $tick, PREG_OFFSET_CAPTURE, 3); - $wrappedSamlSessionIndex = preg_replace('||','',$tick[0][0]); - $ticket2logout = preg_replace('||','',$wrappedSamlSessionIndex); - phpCAS::log("Ticket to logout: ".$ticket2logout); - $session_id = preg_replace('/[^\w]/','',$ticket2logout); - phpCAS::log("Session id: ".$session_id); - - // fix New session ID - session_id($session_id); - $_COOKIE[session_name()]=$session_id; - $_GET[session_name()]=$session_id; - - // Overwrite session - session_start(); - session_unset(); - session_destroy(); - printf("Disconnected!"); - phpCAS::traceExit(); - exit(); - } - - /** @} */ - - // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - // XX XX - // XX BASIC CLIENT FEATURES (CAS 1.0) XX - // XX XX - // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - - // ######################################################################## - // ST - // ######################################################################## - /** - * @addtogroup internalBasic - * @{ - */ - - /** - * the Service Ticket provided in the URL of the request if present - * (empty otherwise). Written by CASClient::CASClient(), read by - * CASClient::getST() and CASClient::hasPGT(). - * - * @hideinitializer - * @private - */ - var $_st = ''; - - /** - * This method returns the Service Ticket provided in the URL of the request. - * @return The service ticket. - * @private - */ - function getST() - { return $this->_st; } - - /** - * This method stores the Service Ticket. - * @param $st The Service Ticket. - * @private - */ - function setST($st) - { $this->_st = $st; } - - /** - * This method tells if a Service Ticket was stored. - * @return TRUE if a Service Ticket has been stored. - * @private - */ - function hasST() - { return !empty($this->_st); } - - /** @} */ - - // ######################################################################## - // ST VALIDATION - // ######################################################################## - /** - * @addtogroup internalBasic - * @{ - */ - - /** - * the certificate of the CAS server. - * - * @hideinitializer - * @private - */ - var $_cas_server_cert = ''; - - /** - * the certificate of the CAS server CA. - * - * @hideinitializer - * @private - */ - var $_cas_server_ca_cert = ''; - - /** - * Set to true not to validate the CAS server. - * - * @hideinitializer - * @private - */ - var $_no_cas_server_validation = false; - - /** - * Set the certificate of the CAS server. - * - * @param $cert the PEM certificate - */ - function setCasServerCert($cert) - { - $this->_cas_server_cert = $cert; - } - - /** - * Set the CA certificate of the CAS server. - * - * @param $cert the PEM certificate of the CA that emited the cert of the server - */ - function setCasServerCACert($cert) - { - $this->_cas_server_ca_cert = $cert; - } - - /** - * Set no SSL validation for the CAS server. - */ - function setNoCasServerValidation() - { - $this->_no_cas_server_validation = true; - } - - /** - * This method is used to validate a ST; halt on failure, and sets $validate_url, - * $text_reponse and $tree_response on success. These parameters are used later - * by CASClient::validatePGT() for CAS proxies. - * - * @param $validate_url the URL of the request to the CAS server. - * @param $text_response the response of the CAS server, as is (XML text). - * @param $tree_response the response of the CAS server, as a DOM XML tree. - * - * @return bool TRUE when successfull, halt otherwise by calling CASClient::authError(). - * - * @private - */ - function validateST($validate_url,&$text_response,&$tree_response) - { - phpCAS::traceBegin(); - // build the URL to validate the ticket - $validate_url = $this->getServerServiceValidateURL().'&ticket='.$this->getST(); - if ( $this->isProxy() ) { - // pass the callback url for CAS proxies - $validate_url .= '&pgtUrl='.$this->getCallbackURL(); - } - - // open and read the URL - if ( !$this->readURL($validate_url,''/*cookies*/,$headers,$text_response,$err_msg) ) { - phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')'); - $this->authError('ST not validated', - $validate_url, - TRUE/*$no_response*/); - } - - // analyze the result depending on the version - switch ($this->getServerVersion()) { - case CAS_VERSION_1_0: - if (preg_match('/^no\n/',$text_response)) { - phpCAS::trace('ST has not been validated'); - $this->authError('ST not validated', - $validate_url, - FALSE/*$no_response*/, - FALSE/*$bad_response*/, - $text_response); - } - if (!preg_match('/^yes\n/',$text_response)) { - phpCAS::trace('ill-formed response'); - $this->authError('ST not validated', - $validate_url, - FALSE/*$no_response*/, - TRUE/*$bad_response*/, - $text_response); - } - // ST has been validated, extract the user name - $arr = preg_split('/\n/',$text_response); - $this->setUser(trim($arr[1])); - break; - case CAS_VERSION_2_0: - // read the response of the CAS server into a DOM object - if ( !($dom = domxml_open_mem($text_response))) { - phpCAS::trace('domxml_open_mem() failed'); - $this->authError('ST not validated', - $validate_url, - FALSE/*$no_response*/, - TRUE/*$bad_response*/, - $text_response); - } - // read the root node of the XML tree - if ( !($tree_response = $dom->document_element()) ) { - phpCAS::trace('document_element() failed'); - $this->authError('ST not validated', - $validate_url, - FALSE/*$no_response*/, - TRUE/*$bad_response*/, - $text_response); - } - // insure that tag name is 'serviceResponse' - if ( $tree_response->node_name() != 'serviceResponse' ) { - phpCAS::trace('bad XML root node (should be `serviceResponse\' instead of `'.$tree_response->node_name().'\''); - $this->authError('ST not validated', - $validate_url, - FALSE/*$no_response*/, - TRUE/*$bad_response*/, - $text_response); - } - if ( sizeof($success_elements = $tree_response->get_elements_by_tagname("authenticationSuccess")) != 0) { - // authentication succeded, extract the user name - if ( sizeof($user_elements = $success_elements[0]->get_elements_by_tagname("user")) == 0) { - phpCAS::trace(' found, but no '); - $this->authError('ST not validated', - $validate_url, - FALSE/*$no_response*/, - TRUE/*$bad_response*/, - $text_response); - } - $user = trim($user_elements[0]->get_content()); - phpCAS::trace('user = `'.$user); - $this->setUser($user); - - } else if ( sizeof($failure_elements = $tree_response->get_elements_by_tagname("authenticationFailure")) != 0) { - phpCAS::trace(' found'); - // authentication failed, extract the error code and message - $this->authError('ST not validated', - $validate_url, - FALSE/*$no_response*/, - FALSE/*$bad_response*/, - $text_response, - $failure_elements[0]->get_attribute('code')/*$err_code*/, - trim($failure_elements[0]->get_content())/*$err_msg*/); - } else { - phpCAS::trace('neither nor found'); - $this->authError('ST not validated', - $validate_url, - FALSE/*$no_response*/, - TRUE/*$bad_response*/, - $text_response); - } - break; - } - - // at this step, ST has been validated and $this->_user has been set, - phpCAS::traceEnd(TRUE); - return TRUE; - } - - /** @} */ - - // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - // XX XX - // XX PROXY FEATURES (CAS 2.0) XX - // XX XX - // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - - // ######################################################################## - // PROXYING - // ######################################################################## - /** - * @addtogroup internalProxy - * @{ - */ - - /** - * A boolean telling if the client is a CAS proxy or not. Written by CASClient::CASClient(), - * read by CASClient::isProxy(). - * - * @private - */ - var $_proxy; - - /** - * Tells if a CAS client is a CAS proxy or not - * - * @return TRUE when the CAS client is a CAs proxy, FALSE otherwise - * - * @private - */ - function isProxy() - { - return $this->_proxy; - } - - /** @} */ - // ######################################################################## - // PGT - // ######################################################################## - /** - * @addtogroup internalProxy - * @{ - */ - - /** - * the Proxy Grnting Ticket given by the CAS server (empty otherwise). - * Written by CASClient::setPGT(), read by CASClient::getPGT() and CASClient::hasPGT(). - * - * @hideinitializer - * @private - */ - var $_pgt = ''; - - /** - * This method returns the Proxy Granting Ticket given by the CAS server. - * @return The Proxy Granting Ticket. - * @private - */ - function getPGT() - { return $this->_pgt; } - - /** - * This method stores the Proxy Granting Ticket. - * @param $pgt The Proxy Granting Ticket. - * @private - */ - function setPGT($pgt) - { $this->_pgt = $pgt; } - - /** - * This method tells if a Proxy Granting Ticket was stored. - * @return TRUE if a Proxy Granting Ticket has been stored. - * @private - */ - function hasPGT() - { return !empty($this->_pgt); } - - /** @} */ - - // ######################################################################## - // CALLBACK MODE - // ######################################################################## - /** - * @addtogroup internalCallback - * @{ - */ - /** - * each PHP script using phpCAS in proxy mode is its own callback to get the - * PGT back from the CAS server. callback_mode is detected by the constructor - * thanks to the GET parameters. - */ - - /** - * a boolean to know if the CAS client is running in callback mode. Written by - * CASClient::setCallBackMode(), read by CASClient::isCallbackMode(). - * - * @hideinitializer - * @private - */ - var $_callback_mode = FALSE; - - /** - * This method sets/unsets callback mode. - * - * @param $callback_mode TRUE to set callback mode, FALSE otherwise. - * - * @private - */ - function setCallbackMode($callback_mode) - { - $this->_callback_mode = $callback_mode; - } - - /** - * This method returns TRUE when the CAs client is running i callback mode, - * FALSE otherwise. - * - * @return A boolean. - * - * @private - */ - function isCallbackMode() - { - return $this->_callback_mode; - } - - /** - * the URL that should be used for the PGT callback (in fact the URL of the - * current request without any CGI parameter). Written and read by - * CASClient::getCallbackURL(). - * - * @hideinitializer - * @private - */ - var $_callback_url = ''; - - /** - * This method returns the URL that should be used for the PGT callback (in - * fact the URL of the current request without any CGI parameter, except if - * phpCAS::setFixedCallbackURL() was used). - * - * @return The callback URL - * - * @private - */ - function getCallbackURL() - { - // the URL is built when needed only - if ( empty($this->_callback_url) ) { - $final_uri = ''; - // remove the ticket if present in the URL - $final_uri = 'https://'; - /* replaced by Julien Marchal - v0.4.6 - * $this->uri .= $_SERVER['SERVER_NAME']; - */ - if(empty($_SERVER['HTTP_X_FORWARDED_SERVER'])){ - /* replaced by teedog - v0.4.12 - * $final_uri .= $_SERVER['SERVER_NAME']; - */ - if (empty($_SERVER['SERVER_NAME'])) { - $final_uri .= $_SERVER['HTTP_HOST']; - } else { - $final_uri .= $_SERVER['SERVER_NAME']; - } - } else { - $final_uri .= $_SERVER['HTTP_X_FORWARDED_SERVER']; - } - if ( ($this->isHttps() && $_SERVER['SERVER_PORT']!=443) - || (!$this->isHttps() && $_SERVER['SERVER_PORT']!=80) ) { - $final_uri .= ':'; - $final_uri .= $_SERVER['SERVER_PORT']; - } - $request_uri = $_SERVER['REQUEST_URI']; - $request_uri = preg_replace('/\?.*$/','',$request_uri); - $final_uri .= $request_uri; - $this->setCallbackURL($final_uri); - } - return $this->_callback_url; - } - - /** - * This method sets the callback url. - * - * @param $callback_url url to set callback - * - * @private - */ - function setCallbackURL($url) - { - return $this->_callback_url = $url; - } - - /** - * This method is called by CASClient::CASClient() when running in callback - * mode. It stores the PGT and its PGT Iou, prints its output and halts. - * - * @private - */ - function callback() - { - phpCAS::traceBegin(); - $this->printHTMLHeader('phpCAS callback'); - $pgt_iou = $_GET['pgtIou']; - $pgt = $_GET['pgtId']; - phpCAS::trace('Storing PGT `'.$pgt.'\' (id=`'.$pgt_iou.'\')'); - echo '

Storing PGT `'.$pgt.'\' (id=`'.$pgt_iou.'\').

'; - $this->storePGT($pgt,$pgt_iou); - $this->printHTMLFooter(); - phpCAS::traceExit(); - } - - /** @} */ - - // ######################################################################## - // PGT STORAGE - // ######################################################################## - /** - * @addtogroup internalPGTStorage - * @{ - */ - - /** - * an instance of a class inheriting of PGTStorage, used to deal with PGT - * storage. Created by CASClient::setPGTStorageFile() or CASClient::setPGTStorageDB(), used - * by CASClient::setPGTStorageFile(), CASClient::setPGTStorageDB() and CASClient::initPGTStorage(). - * - * @hideinitializer - * @private - */ - var $_pgt_storage = null; - - /** - * This method is used to initialize the storage of PGT's. - * Halts on error. - * - * @private - */ - function initPGTStorage() - { - // if no SetPGTStorageXxx() has been used, default to file - if ( !is_object($this->_pgt_storage) ) { - $this->setPGTStorageFile(); - } - - // initializes the storage - $this->_pgt_storage->init(); - } - - /** - * This method stores a PGT. Halts on error. - * - * @param $pgt the PGT to store - * @param $pgt_iou its corresponding Iou - * - * @private - */ - function storePGT($pgt,$pgt_iou) - { - // ensure that storage is initialized - $this->initPGTStorage(); - // writes the PGT - $this->_pgt_storage->write($pgt,$pgt_iou); - } - - /** - * This method reads a PGT from its Iou and deletes the corresponding storage entry. - * - * @param $pgt_iou the PGT Iou - * - * @return The PGT corresponding to the Iou, FALSE when not found. - * - * @private - */ - function loadPGT($pgt_iou) - { - // ensure that storage is initialized - $this->initPGTStorage(); - // read the PGT - return $this->_pgt_storage->read($pgt_iou); - } - - /** - * This method is used to tell phpCAS to store the response of the - * CAS server to PGT requests onto the filesystem. - * - * @param $format the format used to store the PGT's (`plain' and `xml' allowed) - * @param $path the path where the PGT's should be stored - * - * @public - */ - function setPGTStorageFile($format='', - $path='') - { - // check that the storage has not already been set - if ( is_object($this->_pgt_storage) ) { - phpCAS::error('PGT storage already defined'); - } - - // create the storage object - $this->_pgt_storage = &new PGTStorageFile($this,$format,$path); - } - - /** - * This method is used to tell phpCAS to store the response of the - * CAS server to PGT requests into a database. - * @note The connection to the database is done only when needed. - * As a consequence, bad parameters are detected only when - * initializing PGT storage. - * - * @param $user the user to access the data with - * @param $password the user's password - * @param $database_type the type of the database hosting the data - * @param $hostname the server hosting the database - * @param $port the port the server is listening on - * @param $database the name of the database - * @param $table the name of the table storing the data - * - * @public - */ - function setPGTStorageDB($user, - $password, - $database_type, - $hostname, - $port, - $database, - $table) - { - // check that the storage has not already been set - if ( is_object($this->_pgt_storage) ) { - phpCAS::error('PGT storage already defined'); - } - - // warn the user that he should use file storage... - trigger_error('PGT storage into database is an experimental feature, use at your own risk',E_USER_WARNING); - - // create the storage object - $this->_pgt_storage = & new PGTStorageDB($this,$user,$password,$database_type,$hostname,$port,$database,$table); - } - - // ######################################################################## - // PGT VALIDATION - // ######################################################################## - /** - * This method is used to validate a PGT; halt on failure. - * - * @param $validate_url the URL of the request to the CAS server. - * @param $text_response the response of the CAS server, as is (XML text); result - * of CASClient::validateST() or CASClient::validatePT(). - * @param $tree_response the response of the CAS server, as a DOM XML tree; result - * of CASClient::validateST() or CASClient::validatePT(). - * - * @return bool TRUE when successfull, halt otherwise by calling CASClient::authError(). - * - * @private - */ - function validatePGT(&$validate_url,$text_response,$tree_response) - { - phpCAS::traceBegin(); - if ( sizeof($arr = $tree_response->get_elements_by_tagname("proxyGrantingTicket")) == 0) { - phpCAS::trace(' not found'); - // authentication succeded, but no PGT Iou was transmitted - $this->authError('Ticket validated but no PGT Iou transmitted', - $validate_url, - FALSE/*$no_response*/, - FALSE/*$bad_response*/, - $text_response); - } else { - // PGT Iou transmitted, extract it - $pgt_iou = trim($arr[0]->get_content()); - $pgt = $this->loadPGT($pgt_iou); - if ( $pgt == FALSE ) { - phpCAS::trace('could not load PGT'); - $this->authError('PGT Iou was transmitted but PGT could not be retrieved', - $validate_url, - FALSE/*$no_response*/, - FALSE/*$bad_response*/, - $text_response); - } - $this->setPGT($pgt); - } - phpCAS::traceEnd(TRUE); - return TRUE; - } - - // ######################################################################## - // PGT VALIDATION - // ######################################################################## - - /** - * This method is used to retrieve PT's from the CAS server thanks to a PGT. - * - * @param $target_service the service to ask for with the PT. - * @param $err_code an error code (PHPCAS_SERVICE_OK on success). - * @param $err_msg an error message (empty on success). - * - * @return a Proxy Ticket, or FALSE on error. - * - * @private - */ - function retrievePT($target_service,&$err_code,&$err_msg) - { - phpCAS::traceBegin(); - - // by default, $err_msg is set empty and $pt to TRUE. On error, $pt is - // set to false and $err_msg to an error message. At the end, if $pt is FALSE - // and $error_msg is still empty, it is set to 'invalid response' (the most - // commonly encountered error). - $err_msg = ''; - - // build the URL to retrieve the PT - // $cas_url = $this->getServerProxyURL().'?targetService='.preg_replace('/&/','%26',$target_service).'&pgt='.$this->getPGT(); - $cas_url = $this->getServerProxyURL().'?targetService='.urlencode($target_service).'&pgt='.$this->getPGT(); - - // open and read the URL - if ( !$this->readURL($cas_url,''/*cookies*/,$headers,$cas_response,$err_msg) ) { - phpCAS::trace('could not open URL \''.$cas_url.'\' to validate ('.$err_msg.')'); - $err_code = PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE; - $err_msg = 'could not retrieve PT (no response from the CAS server)'; - phpCAS::traceEnd(FALSE); - return FALSE; - } - - $bad_response = FALSE; - - if ( !$bad_response ) { - // read the response of the CAS server into a DOM object - if ( !($dom = @domxml_open_mem($cas_response))) { - phpCAS::trace('domxml_open_mem() failed'); - // read failed - $bad_response = TRUE; - } - } - - if ( !$bad_response ) { - // read the root node of the XML tree - if ( !($root = $dom->document_element()) ) { - phpCAS::trace('document_element() failed'); - // read failed - $bad_response = TRUE; - } - } - - if ( !$bad_response ) { - // insure that tag name is 'serviceResponse' - if ( $root->node_name() != 'serviceResponse' ) { - phpCAS::trace('node_name() failed'); - // bad root node - $bad_response = TRUE; - } - } - - if ( !$bad_response ) { - // look for a proxySuccess tag - if ( sizeof($arr = $root->get_elements_by_tagname("proxySuccess")) != 0) { - // authentication succeded, look for a proxyTicket tag - if ( sizeof($arr = $root->get_elements_by_tagname("proxyTicket")) != 0) { - $err_code = PHPCAS_SERVICE_OK; - $err_msg = ''; - phpCAS::trace('original PT: '.trim($arr[0]->get_content())); - $pt = trim($arr[0]->get_content()); - phpCAS::traceEnd($pt); - return $pt; - } else { - phpCAS::trace(' was found, but not '); - } - } - // look for a proxyFailure tag - else if ( sizeof($arr = $root->get_elements_by_tagname("proxyFailure")) != 0) { - // authentication failed, extract the error - $err_code = PHPCAS_SERVICE_PT_FAILURE; - $err_msg = 'PT retrieving failed (code=`' - .$arr[0]->get_attribute('code') - .'\', message=`' - .trim($arr[0]->get_content()) - .'\')'; - phpCAS::traceEnd(FALSE); - return FALSE; - } else { - phpCAS::trace('neither nor found'); - } - } - - // at this step, we are sure that the response of the CAS server was ill-formed - $err_code = PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE; - $err_msg = 'Invalid response from the CAS server (response=`'.$cas_response.'\')'; - - phpCAS::traceEnd(FALSE); - return FALSE; - } - - // ######################################################################## - // ACCESS TO EXTERNAL SERVICES - // ######################################################################## - - /** - * This method is used to acces a remote URL. - * - * @param $url the URL to access. - * @param $cookies an array containing cookies strings such as 'name=val' - * @param $headers an array containing the HTTP header lines of the response - * (an empty array on failure). - * @param $body the body of the response, as a string (empty on failure). - * @param $err_msg an error message, filled on failure. - * - * @return TRUE on success, FALSE otherwise (in this later case, $err_msg - * contains an error message). - * - * @private - */ - function readURL($url,$cookies,&$headers,&$body,&$err_msg) - { - phpCAS::traceBegin(); - $headers = ''; - $body = ''; - $err_msg = ''; - - $res = TRUE; - - // initialize the CURL session - $ch = curl_init($url); - - if (version_compare(PHP_VERSION,'5.1.3','>=')) { - //only avaible in php5 - curl_setopt_array($ch, $this->_curl_options); - } else { - foreach ($this->_curl_options as $key => $value) { - curl_setopt($ch, $key, $value); - } - } - - if ($this->_cas_server_cert == '' && $this->_cas_server_ca_cert == '' && !$this->_no_cas_server_validation) { - phpCAS::error('one of the methods phpCAS::setCasServerCert(), phpCAS::setCasServerCACert() or phpCAS::setNoCasServerValidation() must be called.'); - } - if ($this->_cas_server_cert != '' ) { - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1); - curl_setopt($ch, CURLOPT_SSLCERT, $this->_cas_server_cert); - } else if ($this->_cas_server_ca_cert != '') { - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1); - curl_setopt($ch, CURLOPT_CAINFO, $this->_cas_server_ca_cert); - } else { - curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); - } - - // return the CURL output into a variable - curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); - // get the HTTP header with a callback - $this->_curl_headers = array(); // empty the headers array - curl_setopt($ch, CURLOPT_HEADERFUNCTION, array($this, '_curl_read_headers')); - // add cookies headers - if ( is_array($cookies) ) { - curl_setopt($ch,CURLOPT_COOKIE,implode(';',$cookies)); - } - // perform the query - $buf = curl_exec ($ch); - if ( $buf === FALSE ) { - phpCAS::trace('curl_exec() failed'); - $err_msg = 'CURL error #'.curl_errno($ch).': '.curl_error($ch); - // close the CURL session - curl_close ($ch); - $res = FALSE; - } else { - // close the CURL session - curl_close ($ch); - - $headers = $this->_curl_headers; - $body = $buf; - } - - phpCAS::traceEnd($res); - return $res; - } - - /** - * This method is the callback used by readURL method to request HTTP headers. - */ - var $_curl_headers = array(); - function _curl_read_headers($ch, $header) - { - $this->_curl_headers[] = $header; - return strlen($header); - } - - /** - * This method is used to access an HTTP[S] service. - * - * @param $url the service to access. - * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on - * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE, - * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE. - * @param $output the output of the service (also used to give an error - * message on failure). - * - * @return TRUE on success, FALSE otherwise (in this later case, $err_code - * gives the reason why it failed and $output contains an error message). - * - * @public - */ - function serviceWeb($url,&$err_code,&$output) - { - phpCAS::traceBegin(); - // at first retrieve a PT - $pt = $this->retrievePT($url,$err_code,$output); - - $res = TRUE; - - // test if PT was retrieved correctly - if ( !$pt ) { - // note: $err_code and $err_msg are filled by CASClient::retrievePT() - phpCAS::trace('PT was not retrieved correctly'); - $res = FALSE; - } else { - // add cookies if necessary - if ( is_array($_SESSION['phpCAS']['services'][$url]['cookies']) ) { - foreach ( $_SESSION['phpCAS']['services'][$url]['cookies'] as $name => $val ) { - $cookies[] = $name.'='.$val; - } - } - - // build the URL including the PT - if ( strstr($url,'?') === FALSE ) { - $service_url = $url.'?ticket='.$pt; - } else { - $service_url = $url.'&ticket='.$pt; - } - - phpCAS::trace('reading URL`'.$service_url.'\''); - if ( !$this->readURL($service_url,$cookies,$headers,$output,$err_msg) ) { - phpCAS::trace('could not read URL`'.$service_url.'\''); - $err_code = PHPCAS_SERVICE_NOT_AVAILABLE; - // give an error message - $output = sprintf($this->getString(CAS_STR_SERVICE_UNAVAILABLE), - $service_url, - $err_msg); - $res = FALSE; - } else { - // URL has been fetched, extract the cookies - phpCAS::trace('URL`'.$service_url.'\' has been read, storing cookies:'); - foreach ( $headers as $header ) { - // test if the header is a cookie - if ( preg_match('/^Set-Cookie:/',$header) ) { - // the header is a cookie, remove the beginning - $header_val = preg_replace('/^Set-Cookie: */','',$header); - // extract interesting information - $name_val = strtok($header_val,'; '); - // extract the name and the value of the cookie - $cookie_name = strtok($name_val,'='); - $cookie_val = strtok('='); - // store the cookie - $_SESSION['phpCAS']['services'][$url]['cookies'][$cookie_name] = $cookie_val; - phpCAS::trace($cookie_name.' -> '.$cookie_val); - } - } - } - } - - phpCAS::traceEnd($res); - return $res; - } - - /** - * This method is used to access an IMAP/POP3/NNTP service. - * - * @param $url a string giving the URL of the service, including the mailing box - * for IMAP URLs, as accepted by imap_open(). - * @param $flags options given to imap_open(). - * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on - * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE, - * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE. - * @param $err_msg an error message on failure - * @param $pt the Proxy Ticket (PT) retrieved from the CAS server to access the URL - * on success, FALSE on error). - * - * @return an IMAP stream on success, FALSE otherwise (in this later case, $err_code - * gives the reason why it failed and $err_msg contains an error message). - * - * @public - */ - function serviceMail($url,$flags,&$err_code,&$err_msg,&$pt) - { - phpCAS::traceBegin(); - // at first retrieve a PT - $pt = $this->retrievePT($target_service,$err_code,$output); - - $stream = FALSE; - - // test if PT was retrieved correctly - if ( !$pt ) { - // note: $err_code and $err_msg are filled by CASClient::retrievePT() - phpCAS::trace('PT was not retrieved correctly'); - } else { - phpCAS::trace('opening IMAP URL `'.$url.'\'...'); - $stream = @imap_open($url,$this->getUser(),$pt,$flags); - if ( !$stream ) { - phpCAS::trace('could not open URL'); - $err_code = PHPCAS_SERVICE_NOT_AVAILABLE; - // give an error message - $err_msg = sprintf($this->getString(CAS_STR_SERVICE_UNAVAILABLE), - $service_url, - var_export(imap_errors(),TRUE)); - $pt = FALSE; - $stream = FALSE; - } else { - phpCAS::trace('ok'); - } - } - - phpCAS::traceEnd($stream); - return $stream; - } - - /** @} */ - - // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - // XX XX - // XX PROXIED CLIENT FEATURES (CAS 2.0) XX - // XX XX - // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - - // ######################################################################## - // PT - // ######################################################################## - /** - * @addtogroup internalProxied - * @{ - */ - - /** - * the Proxy Ticket provided in the URL of the request if present - * (empty otherwise). Written by CASClient::CASClient(), read by - * CASClient::getPT() and CASClient::hasPGT(). - * - * @hideinitializer - * @private - */ - var $_pt = ''; - - /** - * This method returns the Proxy Ticket provided in the URL of the request. - * @return The proxy ticket. - * @private - */ - function getPT() - { - // return 'ST'.substr($this->_pt, 2); - return $this->_pt; - } - - /** - * This method stores the Proxy Ticket. - * @param $pt The Proxy Ticket. - * @private - */ - function setPT($pt) - { $this->_pt = $pt; } - - /** - * This method tells if a Proxy Ticket was stored. - * @return TRUE if a Proxy Ticket has been stored. - * @private - */ - function hasPT() - { return !empty($this->_pt); } - - /** @} */ - // ######################################################################## - // PT VALIDATION - // ######################################################################## - /** - * @addtogroup internalProxied - * @{ - */ - - /** - * This method is used to validate a PT; halt on failure - * - * @return bool TRUE when successfull, halt otherwise by calling CASClient::authError(). - * - * @private - */ - function validatePT(&$validate_url,&$text_response,&$tree_response) - { - phpCAS::traceBegin(); - // build the URL to validate the ticket - $validate_url = $this->getServerProxyValidateURL().'&ticket='.$this->getPT(); - - if ( $this->isProxy() ) { - // pass the callback url for CAS proxies - $validate_url .= '&pgtUrl='.$this->getCallbackURL(); - } - - // open and read the URL - if ( !$this->readURL($validate_url,''/*cookies*/,$headers,$text_response,$err_msg) ) { - phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')'); - $this->authError('PT not validated', - $validate_url, - TRUE/*$no_response*/); - } - - // read the response of the CAS server into a DOM object - if ( !($dom = domxml_open_mem($text_response))) { - // read failed - $this->authError('PT not validated', - $validate_url, - FALSE/*$no_response*/, - TRUE/*$bad_response*/, - $text_response); - } - // read the root node of the XML tree - if ( !($tree_response = $dom->document_element()) ) { - // read failed - $this->authError('PT not validated', - $validate_url, - FALSE/*$no_response*/, - TRUE/*$bad_response*/, - $text_response); - } - // insure that tag name is 'serviceResponse' - if ( $tree_response->node_name() != 'serviceResponse' ) { - // bad root node - $this->authError('PT not validated', - $validate_url, - FALSE/*$no_response*/, - TRUE/*$bad_response*/, - $text_response); - } - if ( sizeof($arr = $tree_response->get_elements_by_tagname("authenticationSuccess")) != 0) { - // authentication succeded, extract the user name - if ( sizeof($arr = $tree_response->get_elements_by_tagname("user")) == 0) { - // no user specified => error - $this->authError('PT not validated', - $validate_url, - FALSE/*$no_response*/, - TRUE/*$bad_response*/, - $text_response); - } - $this->setUser(trim($arr[0]->get_content())); - - } else if ( sizeof($arr = $tree_response->get_elements_by_tagname("authenticationFailure")) != 0) { - // authentication succeded, extract the error code and message - $this->authError('PT not validated', - $validate_url, - FALSE/*$no_response*/, - FALSE/*$bad_response*/, - $text_response, - $arr[0]->get_attribute('code')/*$err_code*/, - trim($arr[0]->get_content())/*$err_msg*/); - } else { - $this->authError('PT not validated', - $validate_url, - FALSE/*$no_response*/, - TRUE/*$bad_response*/, - $text_response); - } - - // at this step, PT has been validated and $this->_user has been set, - - phpCAS::traceEnd(TRUE); - return TRUE; - } - - /** @} */ - - // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - // XX XX - // XX MISC XX - // XX XX - // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - - /** - * @addtogroup internalMisc - * @{ - */ - - // ######################################################################## - // URL - // ######################################################################## - /** - * the URL of the current request (without any ticket CGI parameter). Written - * and read by CASClient::getURL(). - * - * @hideinitializer - * @private - */ - var $_url = ''; - - /** - * This method returns the URL of the current request (without any ticket - * CGI parameter). - * - * @return The URL - * - * @private - */ - function getURL() - { - phpCAS::traceBegin(); - // the URL is built when needed only - if ( empty($this->_url) ) { - $final_uri = ''; - // remove the ticket if present in the URL - $final_uri = ($this->isHttps()) ? 'https' : 'http'; - $final_uri .= '://'; - /* replaced by Julien Marchal - v0.4.6 - * $this->_url .= $_SERVER['SERVER_NAME']; - */ - if(empty($_SERVER['HTTP_X_FORWARDED_SERVER'])){ - /* replaced by teedog - v0.4.12 - * $this->_url .= $_SERVER['SERVER_NAME']; - */ - if (empty($_SERVER['SERVER_NAME'])) { - $server_name = $_SERVER['HTTP_HOST']; - } else { - $server_name = $_SERVER['SERVER_NAME']; - } - } else { - $server_name = $_SERVER['HTTP_X_FORWARDED_SERVER']; - } - $final_uri .= $server_name; - if (!strpos($server_name, ':')) { - if ( ($this->isHttps() && $_SERVER['SERVER_PORT']!=443) - || (!$this->isHttps() && $_SERVER['SERVER_PORT']!=80) ) { - $final_uri .= ':'; - $final_uri .= $_SERVER['SERVER_PORT']; - } - } - - $final_uri .= strtok($_SERVER['REQUEST_URI'],"?"); - $cgi_params = '?'.strtok("?"); - // remove the ticket if present in the CGI parameters - $cgi_params = preg_replace('/&ticket=[^&]*/','',$cgi_params); - $cgi_params = preg_replace('/\?ticket=[^&;]*/','?',$cgi_params); - $cgi_params = preg_replace('/\?%26/','?',$cgi_params); - $cgi_params = preg_replace('/\?&/','?',$cgi_params); - $cgi_params = preg_replace('/\?$/','',$cgi_params); - $final_uri .= $cgi_params; - $this->setURL($final_uri); - } - phpCAS::traceEnd($this->_url); - return $this->_url; - } - - /** - * This method sets the URL of the current request - * - * @param $url url to set for service - * - * @private - */ - function setURL($url) - { - $this->_url = $url; - } - - // ######################################################################## - // AUTHENTICATION ERROR HANDLING - // ######################################################################## - /** - * This method is used to print the HTML output when the user was not authenticated. - * - * @param $failure the failure that occured - * @param $cas_url the URL the CAS server was asked for - * @param $no_response the response from the CAS server (other - * parameters are ignored if TRUE) - * @param $bad_response bad response from the CAS server ($err_code - * and $err_msg ignored if TRUE) - * @param $cas_response the response of the CAS server - * @param $err_code the error code given by the CAS server - * @param $err_msg the error message given by the CAS server - * - * @private - */ - function authError($failure,$cas_url,$no_response,$bad_response='',$cas_response='',$err_code='',$err_msg='') - { - phpCAS::traceBegin(); - - $this->printHTMLHeader($this->getString(CAS_STR_AUTHENTICATION_FAILED)); - printf($this->getString(CAS_STR_YOU_WERE_NOT_AUTHENTICATED),$this->getURL(),$_SERVER['SERVER_ADMIN']); - phpCAS::trace('CAS URL: '.$cas_url); - phpCAS::trace('Authentication failure: '.$failure); - if ( $no_response ) { - phpCAS::trace('Reason: no response from the CAS server'); - } else { - if ( $bad_response ) { - phpCAS::trace('Reason: bad response from the CAS server'); - } else { - switch ($this->getServerVersion()) { - case CAS_VERSION_1_0: - phpCAS::trace('Reason: CAS error'); - break; - case CAS_VERSION_2_0: - if ( empty($err_code) ) - phpCAS::trace('Reason: no CAS error'); - else - phpCAS::trace('Reason: ['.$err_code.'] CAS error: '.$err_msg); - break; - } - } - phpCAS::trace('CAS response: '.$cas_response); - } - $this->printHTMLFooter(); - phpCAS::traceExit(); - exit(); - } - - /** @} */ -} - + header('Location: '.$this->getURL()); + } + + //activate session mechanism if desired + if (!$this->isLogoutRequest() && $start_session) { + session_start(); + } + + $this->_proxy = $proxy; + + //check version + switch ($server_version) { + case CAS_VERSION_1_0: + if ( $this->isProxy() ) + phpCAS::error('CAS proxies are not supported in CAS ' + .$server_version); + break; + case CAS_VERSION_2_0: + break; + default: + phpCAS::error('this version of CAS (`' + .$server_version + .'\') is not supported by phpCAS ' + .phpCAS::getVersion()); + } + $this->_server['version'] = $server_version; + + //check hostname + if ( empty($server_hostname) + || !preg_match('/[\.\d\-abcdefghijklmnopqrstuvwxyz]*/',$server_hostname) ) { + phpCAS::error('bad CAS server hostname (`'.$server_hostname.'\')'); + } + $this->_server['hostname'] = $server_hostname; + + //check port + if ( $server_port == 0 + || !is_int($server_port) ) { + phpCAS::error('bad CAS server port (`'.$server_hostname.'\')'); + } + $this->_server['port'] = $server_port; + + //check URI + if ( !preg_match('/[\.\d\-_abcdefghijklmnopqrstuvwxyz\/]*/',$server_uri) ) { + phpCAS::error('bad CAS server URI (`'.$server_uri.'\')'); + } + //add leading and trailing `/' and remove doubles + $server_uri = preg_replace('/\/\//','/','/'.$server_uri.'/'); + $this->_server['uri'] = $server_uri; + + //set to callback mode if PgtIou and PgtId CGI GET parameters are provided + if ( $this->isProxy() ) { + $this->setCallbackMode(!empty($_GET['pgtIou'])&&!empty($_GET['pgtId'])); + } + + if ( $this->isCallbackMode() ) { + //callback mode: check that phpCAS is secured + if ( !$this->isHttps() ) { + phpCAS::error('CAS proxies must be secured to use phpCAS; PGT\'s will not be received from the CAS server'); + } + } else { + //normal mode: get ticket and remove it from CGI parameters for developpers + $ticket = (isset($_GET['ticket']) ? $_GET['ticket'] : null); + switch ($this->getServerVersion()) { + case CAS_VERSION_1_0: // check for a Service Ticket + if( preg_match('/^ST-/',$ticket) ) { + phpCAS::trace('ST \''.$ticket.'\' found'); + //ST present + $this->setST($ticket); + //ticket has been taken into account, unset it to hide it to applications + unset($_GET['ticket']); + } else if ( !empty($ticket) ) { + //ill-formed ticket, halt + phpCAS::error('ill-formed ticket found in the URL (ticket=`'.htmlentities($ticket).'\')'); + } + break; + case CAS_VERSION_2_0: // check for a Service or Proxy Ticket + if( preg_match('/^[SP]T-/',$ticket) ) { + phpCAS::trace('ST or PT \''.$ticket.'\' found'); + $this->setPT($ticket); + unset($_GET['ticket']); + } else if ( !empty($ticket) ) { + //ill-formed ticket, halt + phpCAS::error('ill-formed ticket found in the URL (ticket=`'.htmlentities($ticket).'\')'); + } + break; + } + } + phpCAS::traceEnd(); + } + + /** @} */ + + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + // XX XX + // XX AUTHENTICATION XX + // XX XX + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + /** + * @addtogroup internalAuthentication + * @{ + */ + + /** + * The Authenticated user. Written by CASClient::setUser(), read by CASClient::getUser(). + * @attention client applications should use phpCAS::getUser(). + * + * @hideinitializer + * @private + */ + var $_user = ''; + + /** + * This method sets the CAS user's login name. + * + * @param $user the login name of the authenticated user. + * + * @private + */ + function setUser($user) + { + $this->_user = $user; + } + + /** + * This method returns the CAS user's login name. + * @warning should be called only after CASClient::forceAuthentication() or + * CASClient::isAuthenticated(), otherwise halt with an error. + * + * @return the login name of the authenticated user + */ + function getUser() + { + if ( empty($this->_user) ) { + phpCAS::error('this method should be used only after '.__CLASS__.'::forceAuthentication() or '.__CLASS__.'::isAuthenticated()'); + } + return $this->_user; + } + + /** + * This method is called to renew the authentication of the user + * If the user is authenticated, renew the connection + * If not, redirect to CAS + * @public + */ + function renewAuthentication(){ + phpCAS::traceBegin(); + // Either way, the user is authenticated by CAS + if( isset( $_SESSION['phpCAS']['auth_checked'] ) ) + unset($_SESSION['phpCAS']['auth_checked']); + if ( $this->isAuthenticated() ) { + phpCAS::trace('user already authenticated; renew'); + $this->redirectToCas(false,true); + } else { + $this->redirectToCas(); + } + phpCAS::traceEnd(); + } + + /** + * This method is called to be sure that the user is authenticated. When not + * authenticated, halt by redirecting to the CAS server; otherwise return TRUE. + * @return TRUE when the user is authenticated; otherwise halt. + * @public + */ + function forceAuthentication() + { + phpCAS::traceBegin(); + + if ( $this->isAuthenticated() ) { + // the user is authenticated, nothing to be done. + phpCAS::trace('no need to authenticate'); + $res = TRUE; + } else { + // the user is not authenticated, redirect to the CAS server + if (isset($_SESSION['phpCAS']['auth_checked'])) { + unset($_SESSION['phpCAS']['auth_checked']); + } + $this->redirectToCas(FALSE/* no gateway */); + // never reached + $res = FALSE; + } + phpCAS::traceEnd($res); + return $res; + } + + /** + * An integer that gives the number of times authentication will be cached before rechecked. + * + * @hideinitializer + * @private + */ + var $_cache_times_for_auth_recheck = 0; + + /** + * Set the number of times authentication will be cached before rechecked. + * + * @param $n an integer. + * + * @public + */ + function setCacheTimesForAuthRecheck($n) + { + $this->_cache_times_for_auth_recheck = $n; + } + + /** + * This method is called to check whether the user is authenticated or not. + * @return TRUE when the user is authenticated, FALSE otherwise. + * @public + */ + function checkAuthentication() + { + phpCAS::traceBegin(); + + if ( $this->isAuthenticated() ) { + phpCAS::trace('user is authenticated'); + $res = TRUE; + } else if (isset($_SESSION['phpCAS']['auth_checked'])) { + // the previous request has redirected the client to the CAS server with gateway=true + unset($_SESSION['phpCAS']['auth_checked']); + $res = FALSE; + } else { + // $_SESSION['phpCAS']['auth_checked'] = true; + // $this->redirectToCas(TRUE/* gateway */); + // // never reached + // $res = FALSE; + // avoid a check against CAS on every request + if (! isset($_SESSION['phpCAS']['unauth_count']) ) + $_SESSION['phpCAS']['unauth_count'] = -2; // uninitialized + + if (($_SESSION['phpCAS']['unauth_count'] != -2 && $this->_cache_times_for_auth_recheck == -1) + || ($_SESSION['phpCAS']['unauth_count'] >= 0 && $_SESSION['phpCAS']['unauth_count'] < $this->_cache_times_for_auth_recheck)) + { + $res = FALSE; + + if ($this->_cache_times_for_auth_recheck != -1) + { + $_SESSION['phpCAS']['unauth_count']++; + phpCAS::trace('user is not authenticated (cached for '.$_SESSION['phpCAS']['unauth_count'].' times of '.$this->_cache_times_for_auth_recheck.')'); + } + else + { + phpCAS::trace('user is not authenticated (cached for until login pressed)'); + } + } + else + { + $_SESSION['phpCAS']['unauth_count'] = 0; + $_SESSION['phpCAS']['auth_checked'] = true; + phpCAS::trace('user is not authenticated (cache reset)'); + $this->redirectToCas(TRUE/* gateway */); + // never reached + $res = FALSE; + } + } + phpCAS::traceEnd($res); + return $res; + } + + /** + * This method is called to check if the user is authenticated (previously or by + * tickets given in the URL). + * + * @return TRUE when the user is authenticated. + * + * @public + */ + function isAuthenticated() + { + phpCAS::traceBegin(); + $res = FALSE; + $validate_url = ''; + + if ( $this->wasPreviouslyAuthenticated() ) { + // the user has already (previously during the session) been + // authenticated, nothing to be done. + phpCAS::trace('user was already authenticated, no need to look for tickets'); + $res = TRUE; + } + elseif ( $this->hasST() ) { + // if a Service Ticket was given, validate it + phpCAS::trace('ST `'.$this->getST().'\' is present'); + $this->validateST($validate_url,$text_response,$tree_response); // if it fails, it halts + phpCAS::trace('ST `'.$this->getST().'\' was validated'); + if ( $this->isProxy() ) { + $this->validatePGT($validate_url,$text_response,$tree_response); // idem + phpCAS::trace('PGT `'.$this->getPGT().'\' was validated'); + $_SESSION['phpCAS']['pgt'] = $this->getPGT(); + } + $_SESSION['phpCAS']['user'] = $this->getUser(); + $res = TRUE; + } + elseif ( $this->hasPT() ) { + // if a Proxy Ticket was given, validate it + phpCAS::trace('PT `'.$this->getPT().'\' is present'); + $this->validatePT($validate_url,$text_response,$tree_response); // note: if it fails, it halts + phpCAS::trace('PT `'.$this->getPT().'\' was validated'); + if ( $this->isProxy() ) { + $this->validatePGT($validate_url,$text_response,$tree_response); // idem + phpCAS::trace('PGT `'.$this->getPGT().'\' was validated'); + $_SESSION['phpCAS']['pgt'] = $this->getPGT(); + } + $_SESSION['phpCAS']['user'] = $this->getUser(); + $res = TRUE; + } + else { + // no ticket given, not authenticated + phpCAS::trace('no ticket found'); + } + + phpCAS::traceEnd($res); + return $res; + } + + /** + * This method tells if the current session is authenticated. + * @return true if authenticated based soley on $_SESSION variable + * @since 0.4.22 by Brendan Arnold + */ + function isSessionAuthenticated () + { + return !empty($_SESSION['phpCAS']['user']); + } + + /** + * This method tells if the user has already been (previously) authenticated + * by looking into the session variables. + * + * @note This function switches to callback mode when needed. + * + * @return TRUE when the user has already been authenticated; FALSE otherwise. + * + * @private + */ + function wasPreviouslyAuthenticated() + { + phpCAS::traceBegin(); + + if ( $this->isCallbackMode() ) { + $this->callback(); + } + + $auth = FALSE; + + if ( $this->isProxy() ) { + // CAS proxy: username and PGT must be present + if ( $this->isSessionAuthenticated() && !empty($_SESSION['phpCAS']['pgt']) ) { + // authentication already done + $this->setUser($_SESSION['phpCAS']['user']); + $this->setPGT($_SESSION['phpCAS']['pgt']); + phpCAS::trace('user = `'.$_SESSION['phpCAS']['user'].'\', PGT = `'.$_SESSION['phpCAS']['pgt'].'\''); + $auth = TRUE; + } elseif ( $this->isSessionAuthenticated() && empty($_SESSION['phpCAS']['pgt']) ) { + // these two variables should be empty or not empty at the same time + phpCAS::trace('username found (`'.$_SESSION['phpCAS']['user'].'\') but PGT is empty'); + // unset all tickets to enforce authentication + unset($_SESSION['phpCAS']); + $this->setST(''); + $this->setPT(''); + } elseif ( !$this->isSessionAuthenticated() && !empty($_SESSION['phpCAS']['pgt']) ) { + // these two variables should be empty or not empty at the same time + phpCAS::trace('PGT found (`'.$_SESSION['phpCAS']['pgt'].'\') but username is empty'); + // unset all tickets to enforce authentication + unset($_SESSION['phpCAS']); + $this->setST(''); + $this->setPT(''); + } else { + phpCAS::trace('neither user not PGT found'); + } + } else { + // `simple' CAS client (not a proxy): username must be present + if ( $this->isSessionAuthenticated() ) { + // authentication already done + $this->setUser($_SESSION['phpCAS']['user']); + phpCAS::trace('user = `'.$_SESSION['phpCAS']['user'].'\''); + $auth = TRUE; + } else { + phpCAS::trace('no user found'); + } + } + + phpCAS::traceEnd($auth); + return $auth; + } + + /** + * This method is used to redirect the client to the CAS server. + * It is used by CASClient::forceAuthentication() and CASClient::checkAuthentication(). + * @param $gateway true to check authentication, false to force it + * @param $renew true to force the authentication with the CAS server + * @public + */ + function redirectToCas($gateway=false,$renew=false){ + phpCAS::traceBegin(); + $cas_url = $this->getServerLoginURL($gateway,$renew); + header('Location: '.$cas_url); + phpCAS::log( "Redirect to : ".$cas_url ); + + $this->printHTMLHeader($this->getString(CAS_STR_AUTHENTICATION_WANTED)); + + printf('

'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'

',$cas_url); + $this->printHTMLFooter(); + phpCAS::traceExit(); + exit(); + } + +// /** +// * This method is used to logout from CAS. +// * @param $url a URL that will be transmitted to the CAS server (to come back to when logged out) +// * @public +// */ +// function logout($url = "") { +// phpCAS::traceBegin(); +// $cas_url = $this->getServerLogoutURL(); +// // v0.4.14 sebastien.gougeon at univ-rennes1.fr +// // header('Location: '.$cas_url); +// if ( $url != "" ) { +// // Adam Moore 1.0.0RC2 +// $url = '?service=' . $url . '&url=' . $url; +// } +// header('Location: '.$cas_url . $url); +// session_unset(); +// session_destroy(); +// $this->printHTMLHeader($this->getString(CAS_STR_LOGOUT)); +// printf('

'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'

',$cas_url); +// $this->printHTMLFooter(); +// phpCAS::traceExit(); +// exit(); +// } + + /** + * This method is used to logout from CAS. + * @params $params an array that contains the optional url and service parameters that will be passed to the CAS server + * @public + */ + function logout($params) { + phpCAS::traceBegin(); + $cas_url = $this->getServerLogoutURL(); + $paramSeparator = '?'; + if (isset($params['url'])) { + $cas_url = $cas_url . $paramSeparator . "url=" . urlencode($params['url']); + $paramSeparator = '&'; + } + if (isset($params['service'])) { + $cas_url = $cas_url . $paramSeparator . "service=" . urlencode($params['service']); + } + header('Location: '.$cas_url); + session_unset(); + session_destroy(); + $this->printHTMLHeader($this->getString(CAS_STR_LOGOUT)); + printf('

'.$this->getString(CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED).'

',$cas_url); + $this->printHTMLFooter(); + phpCAS::traceExit(); + exit(); + } + + /** + * @return true if the current request is a logout request. + * @private + */ + function isLogoutRequest() { + return !empty($_POST['logoutRequest']); + } + + /** + * @return true if a logout request is allowed. + * @private + */ + function isLogoutRequestAllowed() { + } + + /** + * This method handles logout requests. + * @param $check_client true to check the client bofore handling the request, + * false not to perform any access control. True by default. + * @param $allowed_clients an array of host names allowed to send logout requests. + * By default, only the CAs server (declared in the constructor) will be allowed. + * @public + */ + function handleLogoutRequests($check_client=true, $allowed_clients=false) { + phpCAS::traceBegin(); + if (!$this->isLogoutRequest()) { + phpCAS::log("Not a logout request"); + phpCAS::traceEnd(); + return; + } + phpCAS::log("Logout requested"); + phpCAS::log("SAML REQUEST: ".$_POST['logoutRequest']); + if ($check_client) { + if (!$allowed_clients) { + $allowed_clients = array( $this->getServerHostname() ); + } + $client_ip = $_SERVER['REMOTE_ADDR']; + $client = gethostbyaddr($client_ip); + phpCAS::log("Client: ".$client); + $allowed = false; + foreach ($allowed_clients as $allowed_client) { + if ($client == $allowed_client) { + phpCAS::log("Allowed client '".$allowed_client."' matches, logout request is allowed"); + $allowed = true; + break; + } else { + phpCAS::log("Allowed client '".$allowed_client."' does not match"); + } + } + if (!$allowed) { + phpCAS::error("Unauthorized logout request from client '".$client."'"); + printf("Unauthorized!"); + phpCAS::traceExit(); + exit(); + } + } else { + phpCAS::log("No access control set"); + } + // Extract the ticket from the SAML Request + preg_match("|(.*)|", $_POST['logoutRequest'], $tick, PREG_OFFSET_CAPTURE, 3); + $wrappedSamlSessionIndex = preg_replace('||','',$tick[0][0]); + $ticket2logout = preg_replace('||','',$wrappedSamlSessionIndex); + phpCAS::log("Ticket to logout: ".$ticket2logout); + $session_id = preg_replace('/[^\w]/','',$ticket2logout); + phpCAS::log("Session id: ".$session_id); + + // fix New session ID + session_id($session_id); + $_COOKIE[session_name()]=$session_id; + $_GET[session_name()]=$session_id; + + // Overwrite session + session_start(); + session_unset(); + session_destroy(); + printf("Disconnected!"); + phpCAS::traceExit(); + exit(); + } + + /** @} */ + + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + // XX XX + // XX BASIC CLIENT FEATURES (CAS 1.0) XX + // XX XX + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + // ######################################################################## + // ST + // ######################################################################## + /** + * @addtogroup internalBasic + * @{ + */ + + /** + * the Service Ticket provided in the URL of the request if present + * (empty otherwise). Written by CASClient::CASClient(), read by + * CASClient::getST() and CASClient::hasPGT(). + * + * @hideinitializer + * @private + */ + var $_st = ''; + + /** + * This method returns the Service Ticket provided in the URL of the request. + * @return The service ticket. + * @private + */ + function getST() + { return $this->_st; } + + /** + * This method stores the Service Ticket. + * @param $st The Service Ticket. + * @private + */ + function setST($st) + { $this->_st = $st; } + + /** + * This method tells if a Service Ticket was stored. + * @return TRUE if a Service Ticket has been stored. + * @private + */ + function hasST() + { return !empty($this->_st); } + + /** @} */ + + // ######################################################################## + // ST VALIDATION + // ######################################################################## + /** + * @addtogroup internalBasic + * @{ + */ + + /** + * the certificate of the CAS server. + * + * @hideinitializer + * @private + */ + var $_cas_server_cert = ''; + + /** + * the certificate of the CAS server CA. + * + * @hideinitializer + * @private + */ + var $_cas_server_ca_cert = ''; + + /** + * Set to true not to validate the CAS server. + * + * @hideinitializer + * @private + */ + var $_no_cas_server_validation = false; + + /** + * Set the certificate of the CAS server. + * + * @param $cert the PEM certificate + */ + function setCasServerCert($cert) + { + $this->_cas_server_cert = $cert; + } + + /** + * Set the CA certificate of the CAS server. + * + * @param $cert the PEM certificate of the CA that emited the cert of the server + */ + function setCasServerCACert($cert) + { + $this->_cas_server_ca_cert = $cert; + } + + /** + * Set no SSL validation for the CAS server. + */ + function setNoCasServerValidation() + { + $this->_no_cas_server_validation = true; + } + + /** + * This method is used to validate a ST; halt on failure, and sets $validate_url, + * $text_reponse and $tree_response on success. These parameters are used later + * by CASClient::validatePGT() for CAS proxies. + * + * @param $validate_url the URL of the request to the CAS server. + * @param $text_response the response of the CAS server, as is (XML text). + * @param $tree_response the response of the CAS server, as a DOM XML tree. + * + * @return bool TRUE when successfull, halt otherwise by calling CASClient::authError(). + * + * @private + */ + function validateST($validate_url,&$text_response,&$tree_response) + { + phpCAS::traceBegin(); + // build the URL to validate the ticket + $validate_url = $this->getServerServiceValidateURL().'&ticket='.$this->getST(); + if ( $this->isProxy() ) { + // pass the callback url for CAS proxies + $validate_url .= '&pgtUrl='.$this->getCallbackURL(); + } + + // open and read the URL + if ( !$this->readURL($validate_url,''/*cookies*/,$headers,$text_response,$err_msg) ) { + phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')'); + $this->authError('ST not validated', + $validate_url, + TRUE/*$no_response*/); + } + + // analyze the result depending on the version + switch ($this->getServerVersion()) { + case CAS_VERSION_1_0: + if (preg_match('/^no\n/',$text_response)) { + phpCAS::trace('ST has not been validated'); + $this->authError('ST not validated', + $validate_url, + FALSE/*$no_response*/, + FALSE/*$bad_response*/, + $text_response); + } + if (!preg_match('/^yes\n/',$text_response)) { + phpCAS::trace('ill-formed response'); + $this->authError('ST not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + // ST has been validated, extract the user name + $arr = preg_split('/\n/',$text_response); + $this->setUser(trim($arr[1])); + break; + case CAS_VERSION_2_0: + // read the response of the CAS server into a DOM object + if ( !($dom = domxml_open_mem($text_response))) { + phpCAS::trace('domxml_open_mem() failed'); + $this->authError('ST not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + // read the root node of the XML tree + if ( !($tree_response = $dom->document_element()) ) { + phpCAS::trace('document_element() failed'); + $this->authError('ST not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + // insure that tag name is 'serviceResponse' + if ( $tree_response->node_name() != 'serviceResponse' ) { + phpCAS::trace('bad XML root node (should be `serviceResponse\' instead of `'.$tree_response->node_name().'\''); + $this->authError('ST not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + if ( sizeof($success_elements = $tree_response->get_elements_by_tagname("authenticationSuccess")) != 0) { + // authentication succeded, extract the user name + if ( sizeof($user_elements = $success_elements[0]->get_elements_by_tagname("user")) == 0) { + phpCAS::trace(' found, but no '); + $this->authError('ST not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + $user = trim($user_elements[0]->get_content()); + phpCAS::trace('user = `'.$user); + $this->setUser($user); + + } else if ( sizeof($failure_elements = $tree_response->get_elements_by_tagname("authenticationFailure")) != 0) { + phpCAS::trace(' found'); + // authentication failed, extract the error code and message + $this->authError('ST not validated', + $validate_url, + FALSE/*$no_response*/, + FALSE/*$bad_response*/, + $text_response, + $failure_elements[0]->get_attribute('code')/*$err_code*/, + trim($failure_elements[0]->get_content())/*$err_msg*/); + } else { + phpCAS::trace('neither nor found'); + $this->authError('ST not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + break; + } + + // at this step, ST has been validated and $this->_user has been set, + phpCAS::traceEnd(TRUE); + return TRUE; + } + + /** @} */ + + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + // XX XX + // XX PROXY FEATURES (CAS 2.0) XX + // XX XX + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + // ######################################################################## + // PROXYING + // ######################################################################## + /** + * @addtogroup internalProxy + * @{ + */ + + /** + * A boolean telling if the client is a CAS proxy or not. Written by CASClient::CASClient(), + * read by CASClient::isProxy(). + * + * @private + */ + var $_proxy; + + /** + * Tells if a CAS client is a CAS proxy or not + * + * @return TRUE when the CAS client is a CAs proxy, FALSE otherwise + * + * @private + */ + function isProxy() + { + return $this->_proxy; + } + + /** @} */ + // ######################################################################## + // PGT + // ######################################################################## + /** + * @addtogroup internalProxy + * @{ + */ + + /** + * the Proxy Grnting Ticket given by the CAS server (empty otherwise). + * Written by CASClient::setPGT(), read by CASClient::getPGT() and CASClient::hasPGT(). + * + * @hideinitializer + * @private + */ + var $_pgt = ''; + + /** + * This method returns the Proxy Granting Ticket given by the CAS server. + * @return The Proxy Granting Ticket. + * @private + */ + function getPGT() + { return $this->_pgt; } + + /** + * This method stores the Proxy Granting Ticket. + * @param $pgt The Proxy Granting Ticket. + * @private + */ + function setPGT($pgt) + { $this->_pgt = $pgt; } + + /** + * This method tells if a Proxy Granting Ticket was stored. + * @return TRUE if a Proxy Granting Ticket has been stored. + * @private + */ + function hasPGT() + { return !empty($this->_pgt); } + + /** @} */ + + // ######################################################################## + // CALLBACK MODE + // ######################################################################## + /** + * @addtogroup internalCallback + * @{ + */ + /** + * each PHP script using phpCAS in proxy mode is its own callback to get the + * PGT back from the CAS server. callback_mode is detected by the constructor + * thanks to the GET parameters. + */ + + /** + * a boolean to know if the CAS client is running in callback mode. Written by + * CASClient::setCallBackMode(), read by CASClient::isCallbackMode(). + * + * @hideinitializer + * @private + */ + var $_callback_mode = FALSE; + + /** + * This method sets/unsets callback mode. + * + * @param $callback_mode TRUE to set callback mode, FALSE otherwise. + * + * @private + */ + function setCallbackMode($callback_mode) + { + $this->_callback_mode = $callback_mode; + } + + /** + * This method returns TRUE when the CAs client is running i callback mode, + * FALSE otherwise. + * + * @return A boolean. + * + * @private + */ + function isCallbackMode() + { + return $this->_callback_mode; + } + + /** + * the URL that should be used for the PGT callback (in fact the URL of the + * current request without any CGI parameter). Written and read by + * CASClient::getCallbackURL(). + * + * @hideinitializer + * @private + */ + var $_callback_url = ''; + + /** + * This method returns the URL that should be used for the PGT callback (in + * fact the URL of the current request without any CGI parameter, except if + * phpCAS::setFixedCallbackURL() was used). + * + * @return The callback URL + * + * @private + */ + function getCallbackURL() + { + // the URL is built when needed only + if ( empty($this->_callback_url) ) { + $final_uri = ''; + // remove the ticket if present in the URL + $final_uri = 'https://'; + /* replaced by Julien Marchal - v0.4.6 + * $this->uri .= $_SERVER['SERVER_NAME']; + */ + if(empty($_SERVER['HTTP_X_FORWARDED_SERVER'])){ + /* replaced by teedog - v0.4.12 + * $final_uri .= $_SERVER['SERVER_NAME']; + */ + if (empty($_SERVER['SERVER_NAME'])) { + $final_uri .= $_SERVER['HTTP_HOST']; + } else { + $final_uri .= $_SERVER['SERVER_NAME']; + } + } else { + $final_uri .= $_SERVER['HTTP_X_FORWARDED_SERVER']; + } + if ( ($this->isHttps() && $_SERVER['SERVER_PORT']!=443) + || (!$this->isHttps() && $_SERVER['SERVER_PORT']!=80) ) { + $final_uri .= ':'; + $final_uri .= $_SERVER['SERVER_PORT']; + } + $request_uri = $_SERVER['REQUEST_URI']; + $request_uri = preg_replace('/\?.*$/','',$request_uri); + $final_uri .= $request_uri; + $this->setCallbackURL($final_uri); + } + return $this->_callback_url; + } + + /** + * This method sets the callback url. + * + * @param $callback_url url to set callback + * + * @private + */ + function setCallbackURL($url) + { + return $this->_callback_url = $url; + } + + /** + * This method is called by CASClient::CASClient() when running in callback + * mode. It stores the PGT and its PGT Iou, prints its output and halts. + * + * @private + */ + function callback() + { + phpCAS::traceBegin(); + $this->printHTMLHeader('phpCAS callback'); + $pgt_iou = $_GET['pgtIou']; + $pgt = $_GET['pgtId']; + phpCAS::trace('Storing PGT `'.$pgt.'\' (id=`'.$pgt_iou.'\')'); + echo '

Storing PGT `'.$pgt.'\' (id=`'.$pgt_iou.'\').

'; + $this->storePGT($pgt,$pgt_iou); + $this->printHTMLFooter(); + phpCAS::traceExit(); + } + + /** @} */ + + // ######################################################################## + // PGT STORAGE + // ######################################################################## + /** + * @addtogroup internalPGTStorage + * @{ + */ + + /** + * an instance of a class inheriting of PGTStorage, used to deal with PGT + * storage. Created by CASClient::setPGTStorageFile() or CASClient::setPGTStorageDB(), used + * by CASClient::setPGTStorageFile(), CASClient::setPGTStorageDB() and CASClient::initPGTStorage(). + * + * @hideinitializer + * @private + */ + var $_pgt_storage = null; + + /** + * This method is used to initialize the storage of PGT's. + * Halts on error. + * + * @private + */ + function initPGTStorage() + { + // if no SetPGTStorageXxx() has been used, default to file + if ( !is_object($this->_pgt_storage) ) { + $this->setPGTStorageFile(); + } + + // initializes the storage + $this->_pgt_storage->init(); + } + + /** + * This method stores a PGT. Halts on error. + * + * @param $pgt the PGT to store + * @param $pgt_iou its corresponding Iou + * + * @private + */ + function storePGT($pgt,$pgt_iou) + { + // ensure that storage is initialized + $this->initPGTStorage(); + // writes the PGT + $this->_pgt_storage->write($pgt,$pgt_iou); + } + + /** + * This method reads a PGT from its Iou and deletes the corresponding storage entry. + * + * @param $pgt_iou the PGT Iou + * + * @return The PGT corresponding to the Iou, FALSE when not found. + * + * @private + */ + function loadPGT($pgt_iou) + { + // ensure that storage is initialized + $this->initPGTStorage(); + // read the PGT + return $this->_pgt_storage->read($pgt_iou); + } + + /** + * This method is used to tell phpCAS to store the response of the + * CAS server to PGT requests onto the filesystem. + * + * @param $format the format used to store the PGT's (`plain' and `xml' allowed) + * @param $path the path where the PGT's should be stored + * + * @public + */ + function setPGTStorageFile($format='', + $path='') + { + // check that the storage has not already been set + if ( is_object($this->_pgt_storage) ) { + phpCAS::error('PGT storage already defined'); + } + + // create the storage object + $this->_pgt_storage = &new PGTStorageFile($this,$format,$path); + } + + /** + * This method is used to tell phpCAS to store the response of the + * CAS server to PGT requests into a database. + * @note The connection to the database is done only when needed. + * As a consequence, bad parameters are detected only when + * initializing PGT storage. + * + * @param $user the user to access the data with + * @param $password the user's password + * @param $database_type the type of the database hosting the data + * @param $hostname the server hosting the database + * @param $port the port the server is listening on + * @param $database the name of the database + * @param $table the name of the table storing the data + * + * @public + */ + function setPGTStorageDB($user, + $password, + $database_type, + $hostname, + $port, + $database, + $table) + { + // check that the storage has not already been set + if ( is_object($this->_pgt_storage) ) { + phpCAS::error('PGT storage already defined'); + } + + // warn the user that he should use file storage... + trigger_error('PGT storage into database is an experimental feature, use at your own risk',E_USER_WARNING); + + // create the storage object + $this->_pgt_storage = & new PGTStorageDB($this,$user,$password,$database_type,$hostname,$port,$database,$table); + } + + // ######################################################################## + // PGT VALIDATION + // ######################################################################## + /** + * This method is used to validate a PGT; halt on failure. + * + * @param $validate_url the URL of the request to the CAS server. + * @param $text_response the response of the CAS server, as is (XML text); result + * of CASClient::validateST() or CASClient::validatePT(). + * @param $tree_response the response of the CAS server, as a DOM XML tree; result + * of CASClient::validateST() or CASClient::validatePT(). + * + * @return bool TRUE when successfull, halt otherwise by calling CASClient::authError(). + * + * @private + */ + function validatePGT(&$validate_url,$text_response,$tree_response) + { + phpCAS::traceBegin(); + if ( sizeof($arr = $tree_response->get_elements_by_tagname("proxyGrantingTicket")) == 0) { + phpCAS::trace(' not found'); + // authentication succeded, but no PGT Iou was transmitted + $this->authError('Ticket validated but no PGT Iou transmitted', + $validate_url, + FALSE/*$no_response*/, + FALSE/*$bad_response*/, + $text_response); + } else { + // PGT Iou transmitted, extract it + $pgt_iou = trim($arr[0]->get_content()); + $pgt = $this->loadPGT($pgt_iou); + if ( $pgt == FALSE ) { + phpCAS::trace('could not load PGT'); + $this->authError('PGT Iou was transmitted but PGT could not be retrieved', + $validate_url, + FALSE/*$no_response*/, + FALSE/*$bad_response*/, + $text_response); + } + $this->setPGT($pgt); + } + phpCAS::traceEnd(TRUE); + return TRUE; + } + + // ######################################################################## + // PGT VALIDATION + // ######################################################################## + + /** + * This method is used to retrieve PT's from the CAS server thanks to a PGT. + * + * @param $target_service the service to ask for with the PT. + * @param $err_code an error code (PHPCAS_SERVICE_OK on success). + * @param $err_msg an error message (empty on success). + * + * @return a Proxy Ticket, or FALSE on error. + * + * @private + */ + function retrievePT($target_service,&$err_code,&$err_msg) + { + phpCAS::traceBegin(); + + // by default, $err_msg is set empty and $pt to TRUE. On error, $pt is + // set to false and $err_msg to an error message. At the end, if $pt is FALSE + // and $error_msg is still empty, it is set to 'invalid response' (the most + // commonly encountered error). + $err_msg = ''; + + // build the URL to retrieve the PT + // $cas_url = $this->getServerProxyURL().'?targetService='.preg_replace('/&/','%26',$target_service).'&pgt='.$this->getPGT(); + $cas_url = $this->getServerProxyURL().'?targetService='.urlencode($target_service).'&pgt='.$this->getPGT(); + + // open and read the URL + if ( !$this->readURL($cas_url,''/*cookies*/,$headers,$cas_response,$err_msg) ) { + phpCAS::trace('could not open URL \''.$cas_url.'\' to validate ('.$err_msg.')'); + $err_code = PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE; + $err_msg = 'could not retrieve PT (no response from the CAS server)'; + phpCAS::traceEnd(FALSE); + return FALSE; + } + + $bad_response = FALSE; + + if ( !$bad_response ) { + // read the response of the CAS server into a DOM object + if ( !($dom = @domxml_open_mem($cas_response))) { + phpCAS::trace('domxml_open_mem() failed'); + // read failed + $bad_response = TRUE; + } + } + + if ( !$bad_response ) { + // read the root node of the XML tree + if ( !($root = $dom->document_element()) ) { + phpCAS::trace('document_element() failed'); + // read failed + $bad_response = TRUE; + } + } + + if ( !$bad_response ) { + // insure that tag name is 'serviceResponse' + if ( $root->node_name() != 'serviceResponse' ) { + phpCAS::trace('node_name() failed'); + // bad root node + $bad_response = TRUE; + } + } + + if ( !$bad_response ) { + // look for a proxySuccess tag + if ( sizeof($arr = $root->get_elements_by_tagname("proxySuccess")) != 0) { + // authentication succeded, look for a proxyTicket tag + if ( sizeof($arr = $root->get_elements_by_tagname("proxyTicket")) != 0) { + $err_code = PHPCAS_SERVICE_OK; + $err_msg = ''; + phpCAS::trace('original PT: '.trim($arr[0]->get_content())); + $pt = trim($arr[0]->get_content()); + phpCAS::traceEnd($pt); + return $pt; + } else { + phpCAS::trace(' was found, but not '); + } + } + // look for a proxyFailure tag + else if ( sizeof($arr = $root->get_elements_by_tagname("proxyFailure")) != 0) { + // authentication failed, extract the error + $err_code = PHPCAS_SERVICE_PT_FAILURE; + $err_msg = 'PT retrieving failed (code=`' + .$arr[0]->get_attribute('code') + .'\', message=`' + .trim($arr[0]->get_content()) + .'\')'; + phpCAS::traceEnd(FALSE); + return FALSE; + } else { + phpCAS::trace('neither nor found'); + } + } + + // at this step, we are sure that the response of the CAS server was ill-formed + $err_code = PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE; + $err_msg = 'Invalid response from the CAS server (response=`'.$cas_response.'\')'; + + phpCAS::traceEnd(FALSE); + return FALSE; + } + + // ######################################################################## + // ACCESS TO EXTERNAL SERVICES + // ######################################################################## + + /** + * This method is used to acces a remote URL. + * + * @param $url the URL to access. + * @param $cookies an array containing cookies strings such as 'name=val' + * @param $headers an array containing the HTTP header lines of the response + * (an empty array on failure). + * @param $body the body of the response, as a string (empty on failure). + * @param $err_msg an error message, filled on failure. + * + * @return TRUE on success, FALSE otherwise (in this later case, $err_msg + * contains an error message). + * + * @private + */ + function readURL($url,$cookies,&$headers,&$body,&$err_msg) + { + phpCAS::traceBegin(); + $headers = ''; + $body = ''; + $err_msg = ''; + + $res = TRUE; + + // initialize the CURL session + $ch = curl_init($url); + + if (version_compare(PHP_VERSION,'5.1.3','>=')) { + //only avaible in php5 + curl_setopt_array($ch, $this->_curl_options); + } else { + foreach ($this->_curl_options as $key => $value) { + curl_setopt($ch, $key, $value); + } + } + + if ($this->_cas_server_cert == '' && $this->_cas_server_ca_cert == '' && !$this->_no_cas_server_validation) { + phpCAS::error('one of the methods phpCAS::setCasServerCert(), phpCAS::setCasServerCACert() or phpCAS::setNoCasServerValidation() must be called.'); + } + if ($this->_cas_server_cert != '' ) { + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1); + curl_setopt($ch, CURLOPT_SSLCERT, $this->_cas_server_cert); + } else if ($this->_cas_server_ca_cert != '') { + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1); + curl_setopt($ch, CURLOPT_CAINFO, $this->_cas_server_ca_cert); + } else { + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 1); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); + } + + // return the CURL output into a variable + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + // get the HTTP header with a callback + $this->_curl_headers = array(); // empty the headers array + curl_setopt($ch, CURLOPT_HEADERFUNCTION, array($this, '_curl_read_headers')); + // add cookies headers + if ( is_array($cookies) ) { + curl_setopt($ch,CURLOPT_COOKIE,implode(';',$cookies)); + } + // perform the query + $buf = curl_exec ($ch); + if ( $buf === FALSE ) { + phpCAS::trace('curl_exec() failed'); + $err_msg = 'CURL error #'.curl_errno($ch).': '.curl_error($ch); + // close the CURL session + curl_close ($ch); + $res = FALSE; + } else { + // close the CURL session + curl_close ($ch); + + $headers = $this->_curl_headers; + $body = $buf; + } + + phpCAS::traceEnd($res); + return $res; + } + + /** + * This method is the callback used by readURL method to request HTTP headers. + */ + var $_curl_headers = array(); + function _curl_read_headers($ch, $header) + { + $this->_curl_headers[] = $header; + return strlen($header); + } + + /** + * This method is used to access an HTTP[S] service. + * + * @param $url the service to access. + * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on + * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE, + * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE. + * @param $output the output of the service (also used to give an error + * message on failure). + * + * @return TRUE on success, FALSE otherwise (in this later case, $err_code + * gives the reason why it failed and $output contains an error message). + * + * @public + */ + function serviceWeb($url,&$err_code,&$output) + { + phpCAS::traceBegin(); + // at first retrieve a PT + $pt = $this->retrievePT($url,$err_code,$output); + + $res = TRUE; + + // test if PT was retrieved correctly + if ( !$pt ) { + // note: $err_code and $err_msg are filled by CASClient::retrievePT() + phpCAS::trace('PT was not retrieved correctly'); + $res = FALSE; + } else { + // add cookies if necessary + if ( is_array($_SESSION['phpCAS']['services'][$url]['cookies']) ) { + foreach ( $_SESSION['phpCAS']['services'][$url]['cookies'] as $name => $val ) { + $cookies[] = $name.'='.$val; + } + } + + // build the URL including the PT + if ( strstr($url,'?') === FALSE ) { + $service_url = $url.'?ticket='.$pt; + } else { + $service_url = $url.'&ticket='.$pt; + } + + phpCAS::trace('reading URL`'.$service_url.'\''); + if ( !$this->readURL($service_url,$cookies,$headers,$output,$err_msg) ) { + phpCAS::trace('could not read URL`'.$service_url.'\''); + $err_code = PHPCAS_SERVICE_NOT_AVAILABLE; + // give an error message + $output = sprintf($this->getString(CAS_STR_SERVICE_UNAVAILABLE), + $service_url, + $err_msg); + $res = FALSE; + } else { + // URL has been fetched, extract the cookies + phpCAS::trace('URL`'.$service_url.'\' has been read, storing cookies:'); + foreach ( $headers as $header ) { + // test if the header is a cookie + if ( preg_match('/^Set-Cookie:/',$header) ) { + // the header is a cookie, remove the beginning + $header_val = preg_replace('/^Set-Cookie: */','',$header); + // extract interesting information + $name_val = strtok($header_val,'; '); + // extract the name and the value of the cookie + $cookie_name = strtok($name_val,'='); + $cookie_val = strtok('='); + // store the cookie + $_SESSION['phpCAS']['services'][$url]['cookies'][$cookie_name] = $cookie_val; + phpCAS::trace($cookie_name.' -> '.$cookie_val); + } + } + } + } + + phpCAS::traceEnd($res); + return $res; + } + + /** + * This method is used to access an IMAP/POP3/NNTP service. + * + * @param $url a string giving the URL of the service, including the mailing box + * for IMAP URLs, as accepted by imap_open(). + * @param $flags options given to imap_open(). + * @param $err_code an error code Possible values are PHPCAS_SERVICE_OK (on + * success), PHPCAS_SERVICE_PT_NO_SERVER_RESPONSE, PHPCAS_SERVICE_PT_BAD_SERVER_RESPONSE, + * PHPCAS_SERVICE_PT_FAILURE, PHPCAS_SERVICE_NOT AVAILABLE. + * @param $err_msg an error message on failure + * @param $pt the Proxy Ticket (PT) retrieved from the CAS server to access the URL + * on success, FALSE on error). + * + * @return an IMAP stream on success, FALSE otherwise (in this later case, $err_code + * gives the reason why it failed and $err_msg contains an error message). + * + * @public + */ + function serviceMail($url,$flags,&$err_code,&$err_msg,&$pt) + { + phpCAS::traceBegin(); + // at first retrieve a PT + $pt = $this->retrievePT($target_service,$err_code,$output); + + $stream = FALSE; + + // test if PT was retrieved correctly + if ( !$pt ) { + // note: $err_code and $err_msg are filled by CASClient::retrievePT() + phpCAS::trace('PT was not retrieved correctly'); + } else { + phpCAS::trace('opening IMAP URL `'.$url.'\'...'); + $stream = @imap_open($url,$this->getUser(),$pt,$flags); + if ( !$stream ) { + phpCAS::trace('could not open URL'); + $err_code = PHPCAS_SERVICE_NOT_AVAILABLE; + // give an error message + $err_msg = sprintf($this->getString(CAS_STR_SERVICE_UNAVAILABLE), + $service_url, + var_export(imap_errors(),TRUE)); + $pt = FALSE; + $stream = FALSE; + } else { + phpCAS::trace('ok'); + } + } + + phpCAS::traceEnd($stream); + return $stream; + } + + /** @} */ + + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + // XX XX + // XX PROXIED CLIENT FEATURES (CAS 2.0) XX + // XX XX + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + // ######################################################################## + // PT + // ######################################################################## + /** + * @addtogroup internalProxied + * @{ + */ + + /** + * the Proxy Ticket provided in the URL of the request if present + * (empty otherwise). Written by CASClient::CASClient(), read by + * CASClient::getPT() and CASClient::hasPGT(). + * + * @hideinitializer + * @private + */ + var $_pt = ''; + + /** + * This method returns the Proxy Ticket provided in the URL of the request. + * @return The proxy ticket. + * @private + */ + function getPT() + { + // return 'ST'.substr($this->_pt, 2); + return $this->_pt; + } + + /** + * This method stores the Proxy Ticket. + * @param $pt The Proxy Ticket. + * @private + */ + function setPT($pt) + { $this->_pt = $pt; } + + /** + * This method tells if a Proxy Ticket was stored. + * @return TRUE if a Proxy Ticket has been stored. + * @private + */ + function hasPT() + { return !empty($this->_pt); } + + /** @} */ + // ######################################################################## + // PT VALIDATION + // ######################################################################## + /** + * @addtogroup internalProxied + * @{ + */ + + /** + * This method is used to validate a PT; halt on failure + * + * @return bool TRUE when successfull, halt otherwise by calling CASClient::authError(). + * + * @private + */ + function validatePT(&$validate_url,&$text_response,&$tree_response) + { + phpCAS::traceBegin(); + // build the URL to validate the ticket + $validate_url = $this->getServerProxyValidateURL().'&ticket='.$this->getPT(); + + if ( $this->isProxy() ) { + // pass the callback url for CAS proxies + $validate_url .= '&pgtUrl='.$this->getCallbackURL(); + } + + // open and read the URL + if ( !$this->readURL($validate_url,''/*cookies*/,$headers,$text_response,$err_msg) ) { + phpCAS::trace('could not open URL \''.$validate_url.'\' to validate ('.$err_msg.')'); + $this->authError('PT not validated', + $validate_url, + TRUE/*$no_response*/); + } + + // read the response of the CAS server into a DOM object + if ( !($dom = domxml_open_mem($text_response))) { + // read failed + $this->authError('PT not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + // read the root node of the XML tree + if ( !($tree_response = $dom->document_element()) ) { + // read failed + $this->authError('PT not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + // insure that tag name is 'serviceResponse' + if ( $tree_response->node_name() != 'serviceResponse' ) { + // bad root node + $this->authError('PT not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + if ( sizeof($arr = $tree_response->get_elements_by_tagname("authenticationSuccess")) != 0) { + // authentication succeded, extract the user name + if ( sizeof($arr = $tree_response->get_elements_by_tagname("user")) == 0) { + // no user specified => error + $this->authError('PT not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + $this->setUser(trim($arr[0]->get_content())); + + } else if ( sizeof($arr = $tree_response->get_elements_by_tagname("authenticationFailure")) != 0) { + // authentication succeded, extract the error code and message + $this->authError('PT not validated', + $validate_url, + FALSE/*$no_response*/, + FALSE/*$bad_response*/, + $text_response, + $arr[0]->get_attribute('code')/*$err_code*/, + trim($arr[0]->get_content())/*$err_msg*/); + } else { + $this->authError('PT not validated', + $validate_url, + FALSE/*$no_response*/, + TRUE/*$bad_response*/, + $text_response); + } + + // at this step, PT has been validated and $this->_user has been set, + + phpCAS::traceEnd(TRUE); + return TRUE; + } + + /** @} */ + + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + // XX XX + // XX MISC XX + // XX XX + // XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + + /** + * @addtogroup internalMisc + * @{ + */ + + // ######################################################################## + // URL + // ######################################################################## + /** + * the URL of the current request (without any ticket CGI parameter). Written + * and read by CASClient::getURL(). + * + * @hideinitializer + * @private + */ + var $_url = ''; + + /** + * This method returns the URL of the current request (without any ticket + * CGI parameter). + * + * @return The URL + * + * @private + */ + function getURL() + { + phpCAS::traceBegin(); + // the URL is built when needed only + if ( empty($this->_url) ) { + $final_uri = ''; + // remove the ticket if present in the URL + $final_uri = ($this->isHttps()) ? 'https' : 'http'; + $final_uri .= '://'; + /* replaced by Julien Marchal - v0.4.6 + * $this->_url .= $_SERVER['SERVER_NAME']; + */ + if(empty($_SERVER['HTTP_X_FORWARDED_SERVER'])){ + /* replaced by teedog - v0.4.12 + * $this->_url .= $_SERVER['SERVER_NAME']; + */ + if (empty($_SERVER['SERVER_NAME'])) { + $server_name = $_SERVER['HTTP_HOST']; + } else { + $server_name = $_SERVER['SERVER_NAME']; + } + } else { + $server_name = $_SERVER['HTTP_X_FORWARDED_SERVER']; + } + $final_uri .= $server_name; + if (!strpos($server_name, ':')) { + if ( ($this->isHttps() && $_SERVER['SERVER_PORT']!=443) + || (!$this->isHttps() && $_SERVER['SERVER_PORT']!=80) ) { + $final_uri .= ':'; + $final_uri .= $_SERVER['SERVER_PORT']; + } + } + + $final_uri .= strtok($_SERVER['REQUEST_URI'],"?"); + $cgi_params = '?'.strtok("?"); + // remove the ticket if present in the CGI parameters + $cgi_params = preg_replace('/&ticket=[^&]*/','',$cgi_params); + $cgi_params = preg_replace('/\?ticket=[^&;]*/','?',$cgi_params); + $cgi_params = preg_replace('/\?%26/','?',$cgi_params); + $cgi_params = preg_replace('/\?&/','?',$cgi_params); + $cgi_params = preg_replace('/\?$/','',$cgi_params); + $final_uri .= $cgi_params; + $this->setURL($final_uri); + } + phpCAS::traceEnd($this->_url); + return $this->_url; + } + + /** + * This method sets the URL of the current request + * + * @param $url url to set for service + * + * @private + */ + function setURL($url) + { + $this->_url = $url; + } + + // ######################################################################## + // AUTHENTICATION ERROR HANDLING + // ######################################################################## + /** + * This method is used to print the HTML output when the user was not authenticated. + * + * @param $failure the failure that occured + * @param $cas_url the URL the CAS server was asked for + * @param $no_response the response from the CAS server (other + * parameters are ignored if TRUE) + * @param $bad_response bad response from the CAS server ($err_code + * and $err_msg ignored if TRUE) + * @param $cas_response the response of the CAS server + * @param $err_code the error code given by the CAS server + * @param $err_msg the error message given by the CAS server + * + * @private + */ + function authError($failure,$cas_url,$no_response,$bad_response='',$cas_response='',$err_code='',$err_msg='') + { + phpCAS::traceBegin(); + + $this->printHTMLHeader($this->getString(CAS_STR_AUTHENTICATION_FAILED)); + printf($this->getString(CAS_STR_YOU_WERE_NOT_AUTHENTICATED),$this->getURL(),$_SERVER['SERVER_ADMIN']); + phpCAS::trace('CAS URL: '.$cas_url); + phpCAS::trace('Authentication failure: '.$failure); + if ( $no_response ) { + phpCAS::trace('Reason: no response from the CAS server'); + } else { + if ( $bad_response ) { + phpCAS::trace('Reason: bad response from the CAS server'); + } else { + switch ($this->getServerVersion()) { + case CAS_VERSION_1_0: + phpCAS::trace('Reason: CAS error'); + break; + case CAS_VERSION_2_0: + if ( empty($err_code) ) + phpCAS::trace('Reason: no CAS error'); + else + phpCAS::trace('Reason: ['.$err_code.'] CAS error: '.$err_msg); + break; + } + } + phpCAS::trace('CAS response: '.$cas_response); + } + $this->printHTMLFooter(); + phpCAS::traceExit(); + exit(); + } + + /** @} */ +} + ?> \ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/domxml-php4-php5.php b/plugins/CasAuthentication/extlib/CAS/domxml-php4-php5.php index d64747514c..a0dfb99c7a 100644 --- a/plugins/CasAuthentication/extlib/CAS/domxml-php4-php5.php +++ b/plugins/CasAuthentication/extlib/CAS/domxml-php4-php5.php @@ -1,277 +1,277 @@ - - * { - * if (version_compare(PHP_VERSION,'5','>=')) - * require_once('domxml-php4-to-php5.php'); - * } - * - * - * Version 1.5.5, 2005-01-18, http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/ - * - * ------------------------------------------------------------------
- * Written by Alexandre Alapetite, http://alexandre.alapetite.net/cv/ - * - * Copyright 2004, Licence: Creative Commons "Attribution-ShareAlike 2.0 France" BY-SA (FR), - * http://creativecommons.org/licenses/by-sa/2.0/fr/ - * http://alexandre.alapetite.net/divers/apropos/#by-sa - * - Attribution. You must give the original author credit - * - Share Alike. If you alter, transform, or build upon this work, - * you may distribute the resulting work only under a license identical to this one - * - The French law is authoritative - * - Any of these conditions can be waived if you get permission from Alexandre Alapetite - * - Please send to Alexandre Alapetite the modifications you make, - * in order to improve this file for the benefit of everybody - * - * If you want to distribute this code, please do it as a link to: - * http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/ - */ - -function domxml_new_doc($version) {return new php4DOMDocument('');} -function domxml_open_file($filename) {return new php4DOMDocument($filename);} -function domxml_open_mem($str) -{ - $dom=new php4DOMDocument(''); - $dom->myDOMNode->loadXML($str); - return $dom; -} -function xpath_eval($xpath_context,$eval_str,$contextnode=null) {return $xpath_context->query($eval_str,$contextnode);} -function xpath_new_context($dom_document) {return new php4DOMXPath($dom_document);} - -class php4DOMAttr extends php4DOMNode -{ - function php4DOMAttr($aDOMAttr) {$this->myDOMNode=$aDOMAttr;} - function Name() {return $this->myDOMNode->name;} - function Specified() {return $this->myDOMNode->specified;} - function Value() {return $this->myDOMNode->value;} -} - -class php4DOMDocument extends php4DOMNode -{ - function php4DOMDocument($filename='') - { - $this->myDOMNode=new DOMDocument(); - if ($filename!='') $this->myDOMNode->load($filename); - } - function create_attribute($name,$value) - { - $myAttr=$this->myDOMNode->createAttribute($name); - $myAttr->value=$value; - return new php4DOMAttr($myAttr,$this); - } - function create_cdata_section($content) {return new php4DOMNode($this->myDOMNode->createCDATASection($content),$this);} - function create_comment($data) {return new php4DOMNode($this->myDOMNode->createComment($data),$this);} - function create_element($name) {return new php4DOMElement($this->myDOMNode->createElement($name),$this);} - function create_text_node($content) {return new php4DOMNode($this->myDOMNode->createTextNode($content),$this);} - function document_element() {return new php4DOMElement($this->myDOMNode->documentElement,$this);} - function dump_file($filename,$compressionmode=false,$format=false) {return $this->myDOMNode->save($filename);} - function dump_mem($format=false,$encoding=false) {return $this->myDOMNode->saveXML();} - function get_element_by_id($id) {return new php4DOMElement($this->myDOMNode->getElementById($id),$this);} - function get_elements_by_tagname($name) - { - $myDOMNodeList=$this->myDOMNode->getElementsByTagName($name); - $nodeSet=array(); - $i=0; - if (isset($myDOMNodeList)) - while ($node=$myDOMNodeList->item($i)) - { - $nodeSet[]=new php4DOMElement($node,$this); - $i++; - } - return $nodeSet; - } - function html_dump_mem() {return $this->myDOMNode->saveHTML();} - function root() {return new php4DOMElement($this->myDOMNode->documentElement,$this);} -} - -class php4DOMElement extends php4DOMNode -{ - function get_attribute($name) {return $this->myDOMNode->getAttribute($name);} - function get_elements_by_tagname($name) - { - $myDOMNodeList=$this->myDOMNode->getElementsByTagName($name); - $nodeSet=array(); - $i=0; - if (isset($myDOMNodeList)) - while ($node=$myDOMNodeList->item($i)) - { - $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument); - $i++; - } - return $nodeSet; - } - function has_attribute($name) {return $this->myDOMNode->hasAttribute($name);} - function remove_attribute($name) {return $this->myDOMNode->removeAttribute($name);} - function set_attribute($name,$value) {return $this->myDOMNode->setAttribute($name,$value);} - function tagname() {return $this->myDOMNode->tagName;} -} - -class php4DOMNode -{ - var $myDOMNode; - var $myOwnerDocument; - function php4DOMNode($aDomNode,$aOwnerDocument) - { - $this->myDOMNode=$aDomNode; - $this->myOwnerDocument=$aOwnerDocument; - } - function __get($name) - { - if ($name=='type') return $this->myDOMNode->nodeType; - elseif ($name=='tagname') return $this->myDOMNode->tagName; - elseif ($name=='content') return $this->myDOMNode->textContent; - else - { - $myErrors=debug_backtrace(); - trigger_error('Undefined property: '.get_class($this).'::$'.$name.' ['.$myErrors[0]['file'].':'.$myErrors[0]['line'].']',E_USER_NOTICE); - return false; - } - } - function append_child($newnode) {return new php4DOMElement($this->myDOMNode->appendChild($newnode->myDOMNode),$this->myOwnerDocument);} - function append_sibling($newnode) {return new php4DOMElement($this->myDOMNode->parentNode->appendChild($newnode->myDOMNode),$this->myOwnerDocument);} - function attributes() - { - $myDOMNodeList=$this->myDOMNode->attributes; - $nodeSet=array(); - $i=0; - if (isset($myDOMNodeList)) - while ($node=$myDOMNodeList->item($i)) - { - $nodeSet[]=new php4DOMAttr($node,$this->myOwnerDocument); - $i++; - } - return $nodeSet; - } - function child_nodes() - { - $myDOMNodeList=$this->myDOMNode->childNodes; - $nodeSet=array(); - $i=0; - if (isset($myDOMNodeList)) - while ($node=$myDOMNodeList->item($i)) - { - $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument); - $i++; - } - return $nodeSet; - } - function children() {return $this->child_nodes();} - function clone_node($deep=false) {return new php4DOMElement($this->myDOMNode->cloneNode($deep),$this->myOwnerDocument);} - function first_child() {return new php4DOMElement($this->myDOMNode->firstChild,$this->myOwnerDocument);} - function get_content() {return $this->myDOMNode->textContent;} - function has_attributes() {return $this->myDOMNode->hasAttributes();} - function has_child_nodes() {return $this->myDOMNode->hasChildNodes();} - function insert_before($newnode,$refnode) {return new php4DOMElement($this->myDOMNode->insertBefore($newnode->myDOMNode,$refnode->myDOMNode),$this->myOwnerDocument);} - function is_blank_node() - { - $myDOMNodeList=$this->myDOMNode->childNodes; - $i=0; - if (isset($myDOMNodeList)) - while ($node=$myDOMNodeList->item($i)) - { - if (($node->nodeType==XML_ELEMENT_NODE)|| - (($node->nodeType==XML_TEXT_NODE)&&!ereg('^([[:cntrl:]]|[[:space:]])*$',$node->nodeValue))) - return false; - $i++; - } - return true; - } - function last_child() {return new php4DOMElement($this->myDOMNode->lastChild,$this->myOwnerDocument);} - function new_child($name,$content) - { - $mySubNode=$this->myDOMNode->ownerDocument->createElement($name); - $mySubNode->appendChild($this->myDOMNode->ownerDocument->createTextNode($content)); - $this->myDOMNode->appendChild($mySubNode); - return new php4DOMElement($mySubNode,$this->myOwnerDocument); - } - function next_sibling() {return new php4DOMElement($this->myDOMNode->nextSibling,$this->myOwnerDocument);} - function node_name() {return $this->myDOMNode->localName;} - function node_type() {return $this->myDOMNode->nodeType;} - function node_value() {return $this->myDOMNode->nodeValue;} - function owner_document() {return $this->myOwnerDocument;} - function parent_node() {return new php4DOMElement($this->myDOMNode->parentNode,$this->myOwnerDocument);} - function prefix() {return $this->myDOMNode->prefix;} - function previous_sibling() {return new php4DOMElement($this->myDOMNode->previousSibling,$this->myOwnerDocument);} - function remove_child($oldchild) {return new php4DOMElement($this->myDOMNode->removeChild($oldchild->myDOMNode),$this->myOwnerDocument);} - function replace_child($oldnode,$newnode) {return new php4DOMElement($this->myDOMNode->replaceChild($oldnode->myDOMNode,$newnode->myDOMNode),$this->myOwnerDocument);} - function set_content($text) - { - if (($this->myDOMNode->hasChildNodes())&&($this->myDOMNode->firstChild->nodeType==XML_TEXT_NODE)) - $this->myDOMNode->removeChild($this->myDOMNode->firstChild); - return $this->myDOMNode->appendChild($this->myDOMNode->ownerDocument->createTextNode($text)); - } -} - -class php4DOMNodelist -{ - var $myDOMNodelist; - var $nodeset; - function php4DOMNodelist($aDOMNodelist,$aOwnerDocument) - { - $this->myDOMNodelist=$aDOMNodelist; - $this->nodeset=array(); - $i=0; - if (isset($this->myDOMNodelist)) - while ($node=$this->myDOMNodelist->item($i)) - { - $this->nodeset[]=new php4DOMElement($node,$aOwnerDocument); - $i++; - } - } -} - -class php4DOMXPath -{ - var $myDOMXPath; - var $myOwnerDocument; - function php4DOMXPath($dom_document) - { - $this->myOwnerDocument=$dom_document; - $this->myDOMXPath=new DOMXPath($dom_document->myDOMNode); - } - function query($eval_str,$contextnode) - { - if (isset($contextnode)) return new php4DOMNodelist($this->myDOMXPath->query($eval_str,$contextnode->myDOMNode),$this->myOwnerDocument); - else return new php4DOMNodelist($this->myDOMXPath->query($eval_str),$this->myOwnerDocument); - } - function xpath_register_ns($prefix,$namespaceURI) {return $this->myDOMXPath->registerNamespace($prefix,$namespaceURI);} -} - -if (extension_loaded('xsl')) -{//See also: http://alexandre.alapetite.net/doc-alex/xslt-php4-php5/ - function domxml_xslt_stylesheet($xslstring) {return new php4DomXsltStylesheet(DOMDocument::loadXML($xslstring));} - function domxml_xslt_stylesheet_doc($dom_document) {return new php4DomXsltStylesheet($dom_document);} - function domxml_xslt_stylesheet_file($xslfile) {return new php4DomXsltStylesheet(DOMDocument::load($xslfile));} - class php4DomXsltStylesheet - { - var $myxsltProcessor; - function php4DomXsltStylesheet($dom_document) - { - $this->myxsltProcessor=new xsltProcessor(); - $this->myxsltProcessor->importStyleSheet($dom_document); - } - function process($dom_document,$xslt_parameters=array(),$param_is_xpath=false) - { - foreach ($xslt_parameters as $param=>$value) - $this->myxsltProcessor->setParameter('',$param,$value); - $myphp4DOMDocument=new php4DOMDocument(); - $myphp4DOMDocument->myDOMNode=$this->myxsltProcessor->transformToDoc($dom_document->myDOMNode); - return $myphp4DOMDocument; - } - function result_dump_file($dom_document,$filename) - { - $html=$dom_document->myDOMNode->saveHTML(); - file_put_contents($filename,$html); - return $html; - } - function result_dump_mem($dom_document) {return $dom_document->myDOMNode->saveHTML();} - } -} + + * { + * if (version_compare(PHP_VERSION,'5','>=')) + * require_once('domxml-php4-to-php5.php'); + * } + * + * + * Version 1.5.5, 2005-01-18, http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/ + * + * ------------------------------------------------------------------
+ * Written by Alexandre Alapetite, http://alexandre.alapetite.net/cv/ + * + * Copyright 2004, Licence: Creative Commons "Attribution-ShareAlike 2.0 France" BY-SA (FR), + * http://creativecommons.org/licenses/by-sa/2.0/fr/ + * http://alexandre.alapetite.net/divers/apropos/#by-sa + * - Attribution. You must give the original author credit + * - Share Alike. If you alter, transform, or build upon this work, + * you may distribute the resulting work only under a license identical to this one + * - The French law is authoritative + * - Any of these conditions can be waived if you get permission from Alexandre Alapetite + * - Please send to Alexandre Alapetite the modifications you make, + * in order to improve this file for the benefit of everybody + * + * If you want to distribute this code, please do it as a link to: + * http://alexandre.alapetite.net/doc-alex/domxml-php4-php5/ + */ + +function domxml_new_doc($version) {return new php4DOMDocument('');} +function domxml_open_file($filename) {return new php4DOMDocument($filename);} +function domxml_open_mem($str) +{ + $dom=new php4DOMDocument(''); + $dom->myDOMNode->loadXML($str); + return $dom; +} +function xpath_eval($xpath_context,$eval_str,$contextnode=null) {return $xpath_context->query($eval_str,$contextnode);} +function xpath_new_context($dom_document) {return new php4DOMXPath($dom_document);} + +class php4DOMAttr extends php4DOMNode +{ + function php4DOMAttr($aDOMAttr) {$this->myDOMNode=$aDOMAttr;} + function Name() {return $this->myDOMNode->name;} + function Specified() {return $this->myDOMNode->specified;} + function Value() {return $this->myDOMNode->value;} +} + +class php4DOMDocument extends php4DOMNode +{ + function php4DOMDocument($filename='') + { + $this->myDOMNode=new DOMDocument(); + if ($filename!='') $this->myDOMNode->load($filename); + } + function create_attribute($name,$value) + { + $myAttr=$this->myDOMNode->createAttribute($name); + $myAttr->value=$value; + return new php4DOMAttr($myAttr,$this); + } + function create_cdata_section($content) {return new php4DOMNode($this->myDOMNode->createCDATASection($content),$this);} + function create_comment($data) {return new php4DOMNode($this->myDOMNode->createComment($data),$this);} + function create_element($name) {return new php4DOMElement($this->myDOMNode->createElement($name),$this);} + function create_text_node($content) {return new php4DOMNode($this->myDOMNode->createTextNode($content),$this);} + function document_element() {return new php4DOMElement($this->myDOMNode->documentElement,$this);} + function dump_file($filename,$compressionmode=false,$format=false) {return $this->myDOMNode->save($filename);} + function dump_mem($format=false,$encoding=false) {return $this->myDOMNode->saveXML();} + function get_element_by_id($id) {return new php4DOMElement($this->myDOMNode->getElementById($id),$this);} + function get_elements_by_tagname($name) + { + $myDOMNodeList=$this->myDOMNode->getElementsByTagName($name); + $nodeSet=array(); + $i=0; + if (isset($myDOMNodeList)) + while ($node=$myDOMNodeList->item($i)) + { + $nodeSet[]=new php4DOMElement($node,$this); + $i++; + } + return $nodeSet; + } + function html_dump_mem() {return $this->myDOMNode->saveHTML();} + function root() {return new php4DOMElement($this->myDOMNode->documentElement,$this);} +} + +class php4DOMElement extends php4DOMNode +{ + function get_attribute($name) {return $this->myDOMNode->getAttribute($name);} + function get_elements_by_tagname($name) + { + $myDOMNodeList=$this->myDOMNode->getElementsByTagName($name); + $nodeSet=array(); + $i=0; + if (isset($myDOMNodeList)) + while ($node=$myDOMNodeList->item($i)) + { + $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument); + $i++; + } + return $nodeSet; + } + function has_attribute($name) {return $this->myDOMNode->hasAttribute($name);} + function remove_attribute($name) {return $this->myDOMNode->removeAttribute($name);} + function set_attribute($name,$value) {return $this->myDOMNode->setAttribute($name,$value);} + function tagname() {return $this->myDOMNode->tagName;} +} + +class php4DOMNode +{ + var $myDOMNode; + var $myOwnerDocument; + function php4DOMNode($aDomNode,$aOwnerDocument) + { + $this->myDOMNode=$aDomNode; + $this->myOwnerDocument=$aOwnerDocument; + } + function __get($name) + { + if ($name=='type') return $this->myDOMNode->nodeType; + elseif ($name=='tagname') return $this->myDOMNode->tagName; + elseif ($name=='content') return $this->myDOMNode->textContent; + else + { + $myErrors=debug_backtrace(); + trigger_error('Undefined property: '.get_class($this).'::$'.$name.' ['.$myErrors[0]['file'].':'.$myErrors[0]['line'].']',E_USER_NOTICE); + return false; + } + } + function append_child($newnode) {return new php4DOMElement($this->myDOMNode->appendChild($newnode->myDOMNode),$this->myOwnerDocument);} + function append_sibling($newnode) {return new php4DOMElement($this->myDOMNode->parentNode->appendChild($newnode->myDOMNode),$this->myOwnerDocument);} + function attributes() + { + $myDOMNodeList=$this->myDOMNode->attributes; + $nodeSet=array(); + $i=0; + if (isset($myDOMNodeList)) + while ($node=$myDOMNodeList->item($i)) + { + $nodeSet[]=new php4DOMAttr($node,$this->myOwnerDocument); + $i++; + } + return $nodeSet; + } + function child_nodes() + { + $myDOMNodeList=$this->myDOMNode->childNodes; + $nodeSet=array(); + $i=0; + if (isset($myDOMNodeList)) + while ($node=$myDOMNodeList->item($i)) + { + $nodeSet[]=new php4DOMElement($node,$this->myOwnerDocument); + $i++; + } + return $nodeSet; + } + function children() {return $this->child_nodes();} + function clone_node($deep=false) {return new php4DOMElement($this->myDOMNode->cloneNode($deep),$this->myOwnerDocument);} + function first_child() {return new php4DOMElement($this->myDOMNode->firstChild,$this->myOwnerDocument);} + function get_content() {return $this->myDOMNode->textContent;} + function has_attributes() {return $this->myDOMNode->hasAttributes();} + function has_child_nodes() {return $this->myDOMNode->hasChildNodes();} + function insert_before($newnode,$refnode) {return new php4DOMElement($this->myDOMNode->insertBefore($newnode->myDOMNode,$refnode->myDOMNode),$this->myOwnerDocument);} + function is_blank_node() + { + $myDOMNodeList=$this->myDOMNode->childNodes; + $i=0; + if (isset($myDOMNodeList)) + while ($node=$myDOMNodeList->item($i)) + { + if (($node->nodeType==XML_ELEMENT_NODE)|| + (($node->nodeType==XML_TEXT_NODE)&&!ereg('^([[:cntrl:]]|[[:space:]])*$',$node->nodeValue))) + return false; + $i++; + } + return true; + } + function last_child() {return new php4DOMElement($this->myDOMNode->lastChild,$this->myOwnerDocument);} + function new_child($name,$content) + { + $mySubNode=$this->myDOMNode->ownerDocument->createElement($name); + $mySubNode->appendChild($this->myDOMNode->ownerDocument->createTextNode($content)); + $this->myDOMNode->appendChild($mySubNode); + return new php4DOMElement($mySubNode,$this->myOwnerDocument); + } + function next_sibling() {return new php4DOMElement($this->myDOMNode->nextSibling,$this->myOwnerDocument);} + function node_name() {return $this->myDOMNode->localName;} + function node_type() {return $this->myDOMNode->nodeType;} + function node_value() {return $this->myDOMNode->nodeValue;} + function owner_document() {return $this->myOwnerDocument;} + function parent_node() {return new php4DOMElement($this->myDOMNode->parentNode,$this->myOwnerDocument);} + function prefix() {return $this->myDOMNode->prefix;} + function previous_sibling() {return new php4DOMElement($this->myDOMNode->previousSibling,$this->myOwnerDocument);} + function remove_child($oldchild) {return new php4DOMElement($this->myDOMNode->removeChild($oldchild->myDOMNode),$this->myOwnerDocument);} + function replace_child($oldnode,$newnode) {return new php4DOMElement($this->myDOMNode->replaceChild($oldnode->myDOMNode,$newnode->myDOMNode),$this->myOwnerDocument);} + function set_content($text) + { + if (($this->myDOMNode->hasChildNodes())&&($this->myDOMNode->firstChild->nodeType==XML_TEXT_NODE)) + $this->myDOMNode->removeChild($this->myDOMNode->firstChild); + return $this->myDOMNode->appendChild($this->myDOMNode->ownerDocument->createTextNode($text)); + } +} + +class php4DOMNodelist +{ + var $myDOMNodelist; + var $nodeset; + function php4DOMNodelist($aDOMNodelist,$aOwnerDocument) + { + $this->myDOMNodelist=$aDOMNodelist; + $this->nodeset=array(); + $i=0; + if (isset($this->myDOMNodelist)) + while ($node=$this->myDOMNodelist->item($i)) + { + $this->nodeset[]=new php4DOMElement($node,$aOwnerDocument); + $i++; + } + } +} + +class php4DOMXPath +{ + var $myDOMXPath; + var $myOwnerDocument; + function php4DOMXPath($dom_document) + { + $this->myOwnerDocument=$dom_document; + $this->myDOMXPath=new DOMXPath($dom_document->myDOMNode); + } + function query($eval_str,$contextnode) + { + if (isset($contextnode)) return new php4DOMNodelist($this->myDOMXPath->query($eval_str,$contextnode->myDOMNode),$this->myOwnerDocument); + else return new php4DOMNodelist($this->myDOMXPath->query($eval_str),$this->myOwnerDocument); + } + function xpath_register_ns($prefix,$namespaceURI) {return $this->myDOMXPath->registerNamespace($prefix,$namespaceURI);} +} + +if (extension_loaded('xsl')) +{//See also: http://alexandre.alapetite.net/doc-alex/xslt-php4-php5/ + function domxml_xslt_stylesheet($xslstring) {return new php4DomXsltStylesheet(DOMDocument::loadXML($xslstring));} + function domxml_xslt_stylesheet_doc($dom_document) {return new php4DomXsltStylesheet($dom_document);} + function domxml_xslt_stylesheet_file($xslfile) {return new php4DomXsltStylesheet(DOMDocument::load($xslfile));} + class php4DomXsltStylesheet + { + var $myxsltProcessor; + function php4DomXsltStylesheet($dom_document) + { + $this->myxsltProcessor=new xsltProcessor(); + $this->myxsltProcessor->importStyleSheet($dom_document); + } + function process($dom_document,$xslt_parameters=array(),$param_is_xpath=false) + { + foreach ($xslt_parameters as $param=>$value) + $this->myxsltProcessor->setParameter('',$param,$value); + $myphp4DOMDocument=new php4DOMDocument(); + $myphp4DOMDocument->myDOMNode=$this->myxsltProcessor->transformToDoc($dom_document->myDOMNode); + return $myphp4DOMDocument; + } + function result_dump_file($dom_document,$filename) + { + $html=$dom_document->myDOMNode->saveHTML(); + file_put_contents($filename,$html); + return $html; + } + function result_dump_mem($dom_document) {return $dom_document->myDOMNode->saveHTML();} + } +} ?> \ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/languages/catalan.php b/plugins/CasAuthentication/extlib/CAS/languages/catalan.php index 3d67473d98..0b139c7cad 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/catalan.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/catalan.php @@ -1,27 +1,27 @@ - - * @sa @link internalLang Internationalization @endlink - * @ingroup internalLang - */ - -$this->_strings = array( - CAS_STR_USING_SERVER - => 'usant servidor', - CAS_STR_AUTHENTICATION_WANTED - => 'Autentificació CAS necessària!', - CAS_STR_LOGOUT - => 'Sortida de CAS necessària!', - CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED - => 'Ja hauria d\ haver estat redireccionat al servidor CAS. Feu click aquí per a continuar.', - CAS_STR_AUTHENTICATION_FAILED - => 'Autentificació CAS fallida!', - CAS_STR_YOU_WERE_NOT_AUTHENTICATED - => '

No estàs autentificat.

Pots tornar a intentar-ho fent click aquí.

Si el problema persisteix hauría de contactar amb l\'administrador d\'aquest llocc.

', - CAS_STR_SERVICE_UNAVAILABLE - => 'El servei `%s\' no està disponible (%s).' -); - -?> + + * @sa @link internalLang Internationalization @endlink + * @ingroup internalLang + */ + +$this->_strings = array( + CAS_STR_USING_SERVER + => 'usant servidor', + CAS_STR_AUTHENTICATION_WANTED + => 'Autentificació CAS necessària!', + CAS_STR_LOGOUT + => 'Sortida de CAS necessària!', + CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED + => 'Ja hauria d\ haver estat redireccionat al servidor CAS. Feu click aquí per a continuar.', + CAS_STR_AUTHENTICATION_FAILED + => 'Autentificació CAS fallida!', + CAS_STR_YOU_WERE_NOT_AUTHENTICATED + => '

No estàs autentificat.

Pots tornar a intentar-ho fent click aquí.

Si el problema persisteix hauría de contactar amb l\'administrador d\'aquest llocc.

', + CAS_STR_SERVICE_UNAVAILABLE + => 'El servei `%s\' no està disponible (%s).' +); + +?> diff --git a/plugins/CasAuthentication/extlib/CAS/languages/english.php b/plugins/CasAuthentication/extlib/CAS/languages/english.php index c143450314..d38d42c1f7 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/english.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/english.php @@ -1,27 +1,27 @@ - - * @sa @link internalLang Internationalization @endlink - * @ingroup internalLang - */ - -$this->_strings = array( - CAS_STR_USING_SERVER - => 'using server', - CAS_STR_AUTHENTICATION_WANTED - => 'CAS Authentication wanted!', - CAS_STR_LOGOUT - => 'CAS logout wanted!', - CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED - => 'You should already have been redirected to the CAS server. Click here to continue.', - CAS_STR_AUTHENTICATION_FAILED - => 'CAS Authentication failed!', - CAS_STR_YOU_WERE_NOT_AUTHENTICATED - => '

You were not authenticated.

You may submit your request again by clicking here.

If the problem persists, you may contact the administrator of this site.

', - CAS_STR_SERVICE_UNAVAILABLE - => 'The service `%s\' is not available (%s).' -); - + + * @sa @link internalLang Internationalization @endlink + * @ingroup internalLang + */ + +$this->_strings = array( + CAS_STR_USING_SERVER + => 'using server', + CAS_STR_AUTHENTICATION_WANTED + => 'CAS Authentication wanted!', + CAS_STR_LOGOUT + => 'CAS logout wanted!', + CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED + => 'You should already have been redirected to the CAS server. Click here to continue.', + CAS_STR_AUTHENTICATION_FAILED + => 'CAS Authentication failed!', + CAS_STR_YOU_WERE_NOT_AUTHENTICATED + => '

You were not authenticated.

You may submit your request again by clicking here.

If the problem persists, you may contact the administrator of this site.

', + CAS_STR_SERVICE_UNAVAILABLE + => 'The service `%s\' is not available (%s).' +); + ?> \ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/languages/french.php b/plugins/CasAuthentication/extlib/CAS/languages/french.php index 675a7fc04e..32d1416850 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/french.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/french.php @@ -1,28 +1,28 @@ - - * @sa @link internalLang Internationalization @endlink - * @ingroup internalLang - */ - -$this->_strings = array( - CAS_STR_USING_SERVER - => 'utilisant le serveur', - CAS_STR_AUTHENTICATION_WANTED - => 'Authentication CAS ncessaire !', - CAS_STR_LOGOUT - => 'Dconnexion demande !', - CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED - => 'Vous auriez du etre redirig(e) vers le serveur CAS. Cliquez ici pour continuer.', - CAS_STR_AUTHENTICATION_FAILED - => 'Authentification CAS infructueuse !', - CAS_STR_YOU_WERE_NOT_AUTHENTICATED - => '

Vous n\'avez pas t authentifi(e).

Vous pouvez soumettre votre requete nouveau en cliquant ici.

Si le problme persiste, vous pouvez contacter l\'administrateur de ce site.

', - CAS_STR_SERVICE_UNAVAILABLE - => 'Le service `%s\' est indisponible (%s)' - -); - + + * @sa @link internalLang Internationalization @endlink + * @ingroup internalLang + */ + +$this->_strings = array( + CAS_STR_USING_SERVER + => 'utilisant le serveur', + CAS_STR_AUTHENTICATION_WANTED + => 'Authentication CAS ncessaire !', + CAS_STR_LOGOUT + => 'Dconnexion demande !', + CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED + => 'Vous auriez du etre redirig(e) vers le serveur CAS. Cliquez ici pour continuer.', + CAS_STR_AUTHENTICATION_FAILED + => 'Authentification CAS infructueuse !', + CAS_STR_YOU_WERE_NOT_AUTHENTICATED + => '

Vous n\'avez pas t authentifi(e).

Vous pouvez soumettre votre requete nouveau en cliquant ici.

Si le problme persiste, vous pouvez contacter l\'administrateur de ce site.

', + CAS_STR_SERVICE_UNAVAILABLE + => 'Le service `%s\' est indisponible (%s)' + +); + ?> \ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/languages/german.php b/plugins/CasAuthentication/extlib/CAS/languages/german.php index 29daeb35dd..55c3238fde 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/german.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/german.php @@ -1,27 +1,27 @@ - - * @sa @link internalLang Internationalization @endlink - * @ingroup internalLang - */ - -$this->_strings = array( - CAS_STR_USING_SERVER - => 'via Server', - CAS_STR_AUTHENTICATION_WANTED - => 'CAS Authentifizierung erforderlich!', - CAS_STR_LOGOUT - => 'CAS Abmeldung!', - CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED - => 'eigentlich häten Sie zum CAS Server weitergeleitet werden sollen. Drücken Sie hier um fortzufahren.', - CAS_STR_AUTHENTICATION_FAILED - => 'CAS Anmeldung fehlgeschlagen!', - CAS_STR_YOU_WERE_NOT_AUTHENTICATED - => '

Sie wurden nicht angemeldet.

Um es erneut zu versuchen klicken Sie hier.

Wenn das Problem bestehen bleibt, kontkatieren Sie den Administrator dieser Seite.

', - CAS_STR_SERVICE_UNAVAILABLE - => 'Der Dienst `%s\' ist nicht verfügbar (%s).' -); - + + * @sa @link internalLang Internationalization @endlink + * @ingroup internalLang + */ + +$this->_strings = array( + CAS_STR_USING_SERVER + => 'via Server', + CAS_STR_AUTHENTICATION_WANTED + => 'CAS Authentifizierung erforderlich!', + CAS_STR_LOGOUT + => 'CAS Abmeldung!', + CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED + => 'eigentlich häten Sie zum CAS Server weitergeleitet werden sollen. Drücken Sie hier um fortzufahren.', + CAS_STR_AUTHENTICATION_FAILED + => 'CAS Anmeldung fehlgeschlagen!', + CAS_STR_YOU_WERE_NOT_AUTHENTICATED + => '

Sie wurden nicht angemeldet.

Um es erneut zu versuchen klicken Sie hier.

Wenn das Problem bestehen bleibt, kontkatieren Sie den Administrator dieser Seite.

', + CAS_STR_SERVICE_UNAVAILABLE + => 'Der Dienst `%s\' ist nicht verfügbar (%s).' +); + ?> \ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/languages/greek.php b/plugins/CasAuthentication/extlib/CAS/languages/greek.php index c17b1d6637..d41bf783b4 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/greek.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/greek.php @@ -1,27 +1,27 @@ - - * @sa @link internalLang Internationalization @endlink - * @ingroup internalLang - */ - -$this->_strings = array( - CAS_STR_USING_SERVER - => ' ', - CAS_STR_AUTHENTICATION_WANTED - => ' CAS!', - CAS_STR_LOGOUT - => ' CAS!', - CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED - => ' CAS. .', - CAS_STR_AUTHENTICATION_FAILED - => ' CAS !', - CAS_STR_YOU_WERE_NOT_AUTHENTICATED - => '

.

, .

, .

', - CAS_STR_SERVICE_UNAVAILABLE - => ' `%s\' (%s).' -); - + + * @sa @link internalLang Internationalization @endlink + * @ingroup internalLang + */ + +$this->_strings = array( + CAS_STR_USING_SERVER + => ' ', + CAS_STR_AUTHENTICATION_WANTED + => ' CAS!', + CAS_STR_LOGOUT + => ' CAS!', + CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED + => ' CAS. .', + CAS_STR_AUTHENTICATION_FAILED + => ' CAS !', + CAS_STR_YOU_WERE_NOT_AUTHENTICATED + => '

.

, .

, .

', + CAS_STR_SERVICE_UNAVAILABLE + => ' `%s\' (%s).' +); + ?> \ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/languages/languages.php b/plugins/CasAuthentication/extlib/CAS/languages/languages.php index 2c6f8bb3b3..001cfe445c 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/languages.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/languages.php @@ -1,24 +1,24 @@ - - * @sa @link internalLang Internationalization @endlink - * @ingroup internalLang - */ - -//@{ -/** - * a phpCAS string index - */ -define("CAS_STR_USING_SERVER", 1); -define("CAS_STR_AUTHENTICATION_WANTED", 2); -define("CAS_STR_LOGOUT", 3); -define("CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED", 4); -define("CAS_STR_AUTHENTICATION_FAILED", 5); -define("CAS_STR_YOU_WERE_NOT_AUTHENTICATED", 6); -define("CAS_STR_SERVICE_UNAVAILABLE", 7); -//@} - + + * @sa @link internalLang Internationalization @endlink + * @ingroup internalLang + */ + +//@{ +/** + * a phpCAS string index + */ +define("CAS_STR_USING_SERVER", 1); +define("CAS_STR_AUTHENTICATION_WANTED", 2); +define("CAS_STR_LOGOUT", 3); +define("CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED", 4); +define("CAS_STR_AUTHENTICATION_FAILED", 5); +define("CAS_STR_YOU_WERE_NOT_AUTHENTICATED", 6); +define("CAS_STR_SERVICE_UNAVAILABLE", 7); +//@} + ?> \ No newline at end of file diff --git a/plugins/CasAuthentication/extlib/CAS/languages/spanish.php b/plugins/CasAuthentication/extlib/CAS/languages/spanish.php index 3a8ffc2535..04067ca03b 100644 --- a/plugins/CasAuthentication/extlib/CAS/languages/spanish.php +++ b/plugins/CasAuthentication/extlib/CAS/languages/spanish.php @@ -1,27 +1,27 @@ - - * @sa @link internalLang Internationalization @endlink - * @ingroup internalLang - */ - -$this->_strings = array( - CAS_STR_USING_SERVER - => 'usando servidor', - CAS_STR_AUTHENTICATION_WANTED - => '¡Autentificación CAS necesaria!', - CAS_STR_LOGOUT - => '¡Salida CAS necesaria!', - CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED - => 'Ya debería haber sido redireccionado al servidor CAS. Haga click aquí para continuar.', - CAS_STR_AUTHENTICATION_FAILED - => '¡Autentificación CAS fallida!', - CAS_STR_YOU_WERE_NOT_AUTHENTICATED - => '

No estás autentificado.

Puedes volver a intentarlo haciendo click aquí.

Si el problema persiste debería contactar con el administrador de este sitio.

', - CAS_STR_SERVICE_UNAVAILABLE - => 'El servicio `%s\' no está disponible (%s).' -); - -?> + + * @sa @link internalLang Internationalization @endlink + * @ingroup internalLang + */ + +$this->_strings = array( + CAS_STR_USING_SERVER + => 'usando servidor', + CAS_STR_AUTHENTICATION_WANTED + => '¡Autentificación CAS necesaria!', + CAS_STR_LOGOUT + => '¡Salida CAS necesaria!', + CAS_STR_SHOULD_HAVE_BEEN_REDIRECTED + => 'Ya debería haber sido redireccionado al servidor CAS. Haga click aquí para continuar.', + CAS_STR_AUTHENTICATION_FAILED + => '¡Autentificación CAS fallida!', + CAS_STR_YOU_WERE_NOT_AUTHENTICATED + => '

No estás autentificado.

Puedes volver a intentarlo haciendo click aquí.

Si el problema persiste debería contactar con el administrador de este sitio.

', + CAS_STR_SERVICE_UNAVAILABLE + => 'El servicio `%s\' no está disponible (%s).' +); + +?> From 519e1e6250d995aad0b7705ca46dec989e8d8e8c Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Wed, 13 Jan 2010 23:33:05 +0100 Subject: [PATCH 4/4] Update generation of YAML files * need lower case in some places * update target path Not in production yet at translatewiki.net - need some Translate extension code changes to get YAML config support for Gettext first. --- scripts/update_po_templates.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/update_po_templates.php b/scripts/update_po_templates.php index 83bff6d806..f882f673a4 100755 --- a/scripts/update_po_templates.php +++ b/scripts/update_po_templates.php @@ -80,20 +80,21 @@ function do_translatewiki_plugin($basedir, $plugin) mkdir($yamldir); } $outfile = "$yamldir/StatusNet-{$plugin}.yml"; + $pluginlc = strtolower( $plugin ); $data = <<