Merge branch '0.9.x' into 1.0.x

1 files changed, 62 insertions, 81 deletions

diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 03eb5ace2..869c0a143 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-27 17:43+0000\n"
-"PO-Revision-Date: 2010-03-27 17:43:37+0000\n"
+"POT-Creation-Date: 2010-04-03 13:27+0000\n"
+"PO-Revision-Date: 2010-04-03 13:27:40+0000\n"
 "Language-Team: Bulgarian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64252); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64515); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: out-statusnet\n"
@@ -74,7 +74,6 @@ msgid "Save access settings"
 msgstr "Запазване настройките за достъп"
 
 #: actions/accessadminpanel.php:203
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Запазване"
@@ -93,7 +92,7 @@ msgstr "Няма такака страница."
 #: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
 #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
 #: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:78
 #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
@@ -192,7 +191,7 @@ msgstr "Бележки от %1$s и приятели в %2$s."
 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:133
 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
 #: actions/apigroupshow.php:115 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
@@ -331,18 +330,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:279
 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."
@@ -362,9 +359,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."
@@ -475,11 +471,16 @@ msgstr "Не членувате в тази група."
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Грешка при проследяване — потребителят не е намерен."
 
-#: actions/apigrouplist.php:95
+#: actions/apigrouplist.php:96
 #, php-format
 msgid "%s's groups"
 msgstr "Групи на %s"
 
+#: actions/apigrouplist.php:104
+#, fuzzy, php-format
+msgid "Groups %1$s is a member of on %2$s."
+msgstr "Групи, в които участва %s"
+
 #: actions/apigrouplistall.php:90 actions/usergroups.php:62
 #, php-format
 msgid "%s groups"
@@ -518,9 +519,8 @@ msgid "There was a problem with your session token. Try again, please."
 msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
 
 #: actions/apioauthauthorize.php:135
-#, fuzzy
 msgid "Invalid nickname / password!"
-msgstr "Неправилно име или парола."
+msgstr "Неправилно име или парола!"
 
 #: actions/apioauthauthorize.php:159
 #, fuzzy
@@ -638,7 +638,7 @@ msgstr "Твърде дълга бележка. Трябва да е най-мн
 msgid "Not found"
 msgstr "Не е открито."
 
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:182
+#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -754,7 +754,7 @@ msgid "Preview"
 msgstr "Преглед"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:658
+#: lib/deleteuserform.php:66 lib/noticelist.php:659
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -767,9 +767,8 @@ msgid "Crop"
 msgstr "Изрязване"
 
 #: actions/avatarsettings.php:305
-#, fuzzy
 msgid "No file uploaded."
-msgstr "Не е указан профил."
+msgstr "Няма качен файл."
 
 #: actions/avatarsettings.php:332
 msgid "Pick a square area of the image to be your avatar"
@@ -1005,7 +1004,7 @@ msgstr "Наистина ли искате да изтриете тази бел
 msgid "Do not delete this notice"
 msgstr "Да не се изтрива бележката"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:658
+#: actions/deletenotice.php:146 lib/noticelist.php:659
 msgid "Delete this notice"
 msgstr "Изтриване на бележката"
 
@@ -1168,20 +1167,17 @@ msgid "No such document \"%s\""
 msgstr "Няма такъв документ."
 
 #: actions/editapplication.php:54
-#, fuzzy
 msgid "Edit Application"
-msgstr "Други настройки"
+msgstr "Редактиране на приложението"
 
 #: actions/editapplication.php:66
-#, fuzzy
 msgid "You must be logged in to edit an application."
-msgstr "За да редактирате група, трябва да сте влезли."
+msgstr "За да редактирате приложение, трябва да сте влезли."
 
 #: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
 #: actions/showapplication.php:87
-#, fuzzy
 msgid "No such application."
-msgstr "Няма такава бележка."
+msgstr "Няма такова приложение."
 
 #: actions/editapplication.php:161
 #, fuzzy
@@ -1189,9 +1185,8 @@ msgid "Use this form to edit your application."
 msgstr "Използвайте тази бланка за създаване на нова група."
 
 #: actions/editapplication.php:177 actions/newapplication.php:159
-#, fuzzy
 msgid "Name is required."
-msgstr "Същото като паролата по-горе. Задължително поле."
+msgstr "Името е задължително."
 
 #: actions/editapplication.php:180 actions/newapplication.php:165
 #, fuzzy
@@ -1204,9 +1199,8 @@ msgid "Name already in use. Try another one."
 msgstr "Опитайте друг псевдоним, този вече е зает."
 
 #: actions/editapplication.php:186 actions/newapplication.php:168
-#, fuzzy
 msgid "Description is required."
-msgstr "Описание"
+msgstr "Описанието е задължително."
 
 #: actions/editapplication.php:194
 msgid "Source URL is too long."
@@ -1222,9 +1216,8 @@ msgid "Organization is required."
 msgstr ""
 
 #: actions/editapplication.php:206 actions/newapplication.php:191
-#, fuzzy
 msgid "Organization is too long (max 255 chars)."
-msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
+msgstr "Името на организацията е твърде дълго (макс. 255 знака)."
 
 #: actions/editapplication.php:209 actions/newapplication.php:194
 msgid "Organization homepage is required."
@@ -2187,9 +2180,8 @@ msgid "No current status"
 msgstr ""
 
 #: actions/newapplication.php:52
-#, fuzzy
 msgid "New Application"
-msgstr "Няма такава бележка."
+msgstr "Ново приложение"
 
 #: actions/newapplication.php:64
 #, fuzzy
@@ -2251,7 +2243,7 @@ msgstr "Съобщението е изпратено"
 msgid "Direct message to %s sent."
 msgstr "Прякото съобщение до %s е изпратено."
 
-#: actions/newmessage.php:210 actions/newnotice.php:246 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Грешка в Ajax"
 
@@ -2259,7 +2251,7 @@ msgstr "Грешка в Ajax"
 msgid "New notice"
 msgstr "Нова бележка"
 
-#: actions/newnotice.php:212
+#: actions/newnotice.php:217
 msgid "Notice posted"
 msgstr "Бележката е публикувана"
 
@@ -2380,8 +2372,8 @@ msgstr "вид съдържание "
 msgid "Only "
 msgstr "Само "
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1069
-#: lib/apiaction.php:1097 lib/apiaction.php:1213
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1068
+#: lib/apiaction.php:1096 lib/apiaction.php:1212
 msgid "Not a supported data format."
 msgstr "Неподдържан формат на данните"
 
@@ -3259,7 +3251,7 @@ msgstr "Не можете да повтаряте собствена бележ�
 msgid "You already repeated that notice."
 msgstr "Вече сте повторили тази бележка."
 
-#: actions/repeat.php:114 lib/noticelist.php:677
+#: actions/repeat.php:114 lib/noticelist.php:678
 msgid "Repeated"
 msgstr "Повторено"
 
@@ -3423,7 +3415,7 @@ msgstr ""
 
 #: actions/showapplication.php:261
 msgid "Application info"
-msgstr ""
+msgstr "Данни за приложението"
 
 #: actions/showapplication.php:263
 msgid "Consumer key"
@@ -3778,9 +3770,8 @@ msgid "Default timezone for the site; usually UTC."
 msgstr "Часови пояс по подразбиране за сайта (обикновено UTC)."
 
 #: actions/siteadminpanel.php:262
-#, fuzzy
 msgid "Default language"
-msgstr "Език по подразбиране за сайта"
+msgstr "Език по подразбиране"
 
 #: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
@@ -4014,9 +4005,8 @@ msgid "This action only accepts POST requests."
 msgstr ""
 
 #: actions/subscribe.php:107
-#, fuzzy
 msgid "No such profile."
-msgstr "Няма такъв файл."
+msgstr "Няма такъв профил."
 
 #: actions/subscribe.php:117
 #, fuzzy
@@ -4209,7 +4199,6 @@ msgstr ""
 
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:59
-#, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "Потребител"
@@ -4682,7 +4671,6 @@ msgid "Personal profile and friends timeline"
 msgstr ""
 
 #: lib/action.php:432
-#, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Лично"
@@ -4733,13 +4721,11 @@ msgstr "Покани"
 
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:461
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Излизане от сайта"
 
 #: lib/action.php:464
-#, fuzzy
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Изход"
@@ -4759,13 +4745,11 @@ msgstr "Регистриране"
 
 #. TRANS: Tooltip for main menu option "Login"
 #: lib/action.php:475
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Влизане в сайта"
 
 #: lib/action.php:478
-#, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "Вход"
@@ -4791,7 +4775,6 @@ msgid "Search for people or text"
 msgstr "Търсене за хора или бележки"
 
 #: lib/action.php:490
-#, fuzzy
 msgctxt "MENU"
 msgid "Search"
 msgstr "Търсене"
@@ -4968,7 +4951,6 @@ msgstr "Основна настройка на сайта"
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:350
-#, fuzzy
 msgctxt "MENU"
 msgid "Site"
 msgstr "Сайт"
@@ -5650,12 +5632,12 @@ msgstr "MB"
 msgid "kB"
 msgstr "kB"
 
-#: lib/jabber.php:228
+#: lib/jabber.php:387
 #, php-format
 msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
 
-#: lib/jabber.php:408
+#: lib/jabber.php:567
 #, fuzzy, php-format
 msgid "Unknown inbox source %d."
 msgstr "Непознат език \"%s\""
@@ -5860,7 +5842,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:485
+#: lib/mailbox.php:227 lib/noticelist.php:486
 msgid "from"
 msgstr "от"
 
@@ -5950,7 +5932,7 @@ msgstr "До"
 msgid "Available characters"
 msgstr "Налични знаци"
 
-#: lib/messageform.php:178 lib/noticeform.php:242
+#: lib/messageform.php:178 lib/noticeform.php:236
 #, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
@@ -5965,72 +5947,72 @@ msgstr "Изпращане на бележка"
 msgid "What's up, %s?"
 msgstr "Какво става, %s?"
 
-#: lib/noticeform.php:195
+#: lib/noticeform.php:192
 msgid "Attach"
 msgstr "Прикрепяне"
 
-#: lib/noticeform.php:200 lib/noticeform.php:222
+#: lib/noticeform.php:196
 msgid "Attach a file"
 msgstr "Прикрепяне на файл"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:212
 #, fuzzy
 msgid "Share my location"
 msgstr "Грешка при запазване етикетите."
 
-#: lib/noticeform.php:219
+#: lib/noticeform.php:215
 #, fuzzy
 msgid "Do not share my location"
 msgstr "Грешка при запазване етикетите."
 
-#: lib/noticeform.php:220
+#: lib/noticeform.php:216
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
 msgid "N"
 msgstr "С"
 
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
 msgid "S"
 msgstr "Ю"
 
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
 msgid "E"
 msgstr "И"
 
-#: lib/noticelist.php:431
+#: lib/noticelist.php:432
 msgid "W"
 msgstr "З"
 
-#: lib/noticelist.php:438
+#: lib/noticelist.php:439
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:569
+#: lib/noticelist.php:570
 msgid "in context"
 msgstr "в контекст"
 
-#: lib/noticelist.php:604
+#: lib/noticelist.php:605
 msgid "Repeated by"
 msgstr "Повторено от"
 
-#: lib/noticelist.php:631
+#: lib/noticelist.php:632
 msgid "Reply to this notice"
 msgstr "Отговаряне на тази бележка"
 
-#: lib/noticelist.php:632
+#: lib/noticelist.php:633
 msgid "Reply"
 msgstr "Отговор"
 
-#: lib/noticelist.php:676
+#: lib/noticelist.php:677
 msgid "Notice repeated"
 msgstr "Бележката е повторена."
 
@@ -6235,7 +6217,7 @@ msgstr "Неозаглавен раздел"
 
 #: lib/section.php:106
 msgid "More..."
-msgstr ""
+msgstr "Още…"
 
 #: lib/silenceform.php:67
 msgid "Silence"
@@ -6351,20 +6333,18 @@ msgid "Moderate"
 msgstr ""
 
 #: lib/userprofile.php:364
-#, fuzzy
 msgid "User role"
-msgstr "Потребителски профил"
+msgstr "Потребителска роля"
 
 #: lib/userprofile.php:366
-#, fuzzy
 msgctxt "role"
 msgid "Administrator"
-msgstr "Администратори"
+msgstr "Администратор"
 
 #: lib/userprofile.php:367
 msgctxt "role"
 msgid "Moderator"
-msgstr ""
+msgstr "Модератор"
 
 #: lib/util.php:1046
 msgid "a few seconds ago"
@@ -6421,7 +6401,8 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s не е допустим цвят! Използвайте 3 или 6 шестнадесетични знака."
 
 #: lib/xmppmanager.php:403
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
-"Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d."
+"Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %2"
+"$d."