summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorSiebrand Mazeland <s.mazeland@xs4all.nl>2010-12-16 16:30:30 +0100
committerSiebrand Mazeland <s.mazeland@xs4all.nl>2010-12-16 16:30:30 +0100
commitcf824621b9a06d5245393f28fe529f2837a95416 (patch)
treee44a1e7b8b0c7c19ebb81e063a4b71398f8ec0d4 /locale
parentb7f43c8127fb9adb129bb66536d5529a6cac2e8c (diff)
Localisation updates from http://translatewiki.net.
Diffstat (limited to 'locale')
-rw-r--r--locale/af/LC_MESSAGES/statusnet.po457
-rw-r--r--locale/ar/LC_MESSAGES/statusnet.po455
-rw-r--r--locale/arz/LC_MESSAGES/statusnet.po455
-rw-r--r--locale/bg/LC_MESSAGES/statusnet.po467
-rw-r--r--locale/br/LC_MESSAGES/statusnet.po479
-rw-r--r--locale/ca/LC_MESSAGES/statusnet.po911
-rw-r--r--locale/cs/LC_MESSAGES/statusnet.po453
-rw-r--r--locale/da/LC_MESSAGES/statusnet.po451
-rw-r--r--locale/de/LC_MESSAGES/statusnet.po453
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po453
-rw-r--r--locale/eo/LC_MESSAGES/statusnet.po467
-rw-r--r--locale/es/LC_MESSAGES/statusnet.po453
-rw-r--r--locale/fa/LC_MESSAGES/statusnet.po453
-rw-r--r--locale/fi/LC_MESSAGES/statusnet.po455
-rw-r--r--locale/fr/LC_MESSAGES/statusnet.po535
-rw-r--r--locale/ga/LC_MESSAGES/statusnet.po452
-rw-r--r--locale/gl/LC_MESSAGES/statusnet.po453
-rw-r--r--locale/hsb/LC_MESSAGES/statusnet.po983
-rw-r--r--locale/hu/LC_MESSAGES/statusnet.po451
-rw-r--r--locale/ia/LC_MESSAGES/statusnet.po530
-rw-r--r--locale/is/LC_MESSAGES/statusnet.po455
-rw-r--r--locale/it/LC_MESSAGES/statusnet.po453
-rw-r--r--locale/ja/LC_MESSAGES/statusnet.po461
-rw-r--r--locale/ka/LC_MESSAGES/statusnet.po451
-rw-r--r--locale/ko/LC_MESSAGES/statusnet.po453
-rw-r--r--locale/mk/LC_MESSAGES/statusnet.po468
-rw-r--r--locale/nb/LC_MESSAGES/statusnet.po453
-rw-r--r--locale/nl/LC_MESSAGES/statusnet.po469
-rw-r--r--locale/nn/LC_MESSAGES/statusnet.po455
-rw-r--r--locale/pl/LC_MESSAGES/statusnet.po533
-rw-r--r--locale/pt/LC_MESSAGES/statusnet.po453
-rw-r--r--locale/pt_BR/LC_MESSAGES/statusnet.po763
-rw-r--r--locale/ru/LC_MESSAGES/statusnet.po551
-rw-r--r--locale/statusnet.pot433
-rw-r--r--locale/sv/LC_MESSAGES/statusnet.po453
-rw-r--r--locale/te/LC_MESSAGES/statusnet.po465
-rw-r--r--locale/tr/LC_MESSAGES/statusnet.po539
-rw-r--r--locale/uk/LC_MESSAGES/statusnet.po510
-rw-r--r--locale/vi/LC_MESSAGES/statusnet.po454
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po481
40 files changed, 13777 insertions, 6242 deletions
diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index 5d42ad255..2c4afe8d0 100644
--- a/locale/af/LC_MESSAGES/statusnet.po
+++ b/locale/af/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:17:46+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:21+0000\n"
"Language-Team: Afrikaans <http://translatewiki.net/wiki/Portal:af>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: af\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -85,11 +85,11 @@ msgstr "Stoor toegangsinstellings"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -368,20 +368,38 @@ msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
msgid "Could not update your design."
msgstr "Dit was nie moontlik om u ontwerp by te werk nie."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s tydlyn"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Beskrywing"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Gunstelinge"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "lede van die groep %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -740,7 +758,7 @@ msgstr ""
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -776,7 +794,7 @@ msgstr ""
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -845,7 +863,7 @@ msgstr "Wagwoord"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -922,7 +940,8 @@ msgstr "U mag nie 'n ander gebruiker se status verwyder nie."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Die kennisgewing bestaan nie."
@@ -938,7 +957,10 @@ msgstr "U kan nie u eie kennisgewings herhaal nie."
msgid "Already repeated that notice."
msgstr "U het reeds die kennisgewing herhaal."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "Die API-funksie is nie gevind nie."
@@ -958,16 +980,16 @@ msgstr "Die status is verwyder."
msgid "No status with that ID found."
msgstr "Geen status met die ID gevind nie."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Hierdie kennisgewing kan nie verwyder word nie."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "Verwyder kennisgewing"
@@ -1090,33 +1112,57 @@ msgstr "met die etiket %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Opdaterings van %1$s op %2$s."
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
msgid "Only the user can add to their own timeline."
msgstr ""
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "U kan nie u eie kennisgewings herhaal nie."
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr ""
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1133,6 +1179,150 @@ msgstr "Die API-funksie is nie gevind nie."
msgid "User not found."
msgstr "Die API-funksie is nie gevind nie."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Die lêer bestaan nie."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Kon nie e-posbevestiging verwyder nie."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Onbekend"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Voeg by gunstelinge"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Die lêer bestaan nie."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "lede van die groep %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Groepe waarvan %s lid is"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Onbekend"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Alle lede"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Die lêer bestaan nie."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr ""
+"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Die groep bestaan nie."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Alle lede"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "Die API-funksie is nie gevind nie."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Die lêer bestaan nie."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "U volg hierdie gebruiker:"
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr ""
+"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "U volg hierdie gebruiker:"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Onbekende lêertipe"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1424,8 +1614,8 @@ msgstr "Die E-posadres bestaan reeds."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1951,12 +2141,12 @@ msgstr ""
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "E-posadres"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Huidige bevestigde e-posadres."
@@ -1965,14 +2155,14 @@ msgstr "Huidige bevestigde e-posadres."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Verwyder"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1983,14 +2173,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "E-posadres, soos \"UserName@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -1998,99 +2188,106 @@ msgstr "Voeg by"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Inkomende e-pos"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr ""
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Nuut"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "E-posadresse"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr ""
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
#, fuzzy
msgid "Publish a MicroID for my email address."
msgstr "Dit is nie u e-posadres nie."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "E-posadresse"
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Geen e-posadres."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
#, fuzzy
msgid "Cannot normalize that email address"
msgstr "Dit was nie moontlik om die Jabber-ID te normaliseer nie"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Nie 'n geldige e-posadres nie."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Dit is al reeds u e-posadres."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
#, fuzzy
msgid "That email address already belongs to another user."
msgstr "Die Jabber-ID word reeds deur 'n ander gebruiker gebruik."
@@ -2098,13 +2295,13 @@ msgstr "Die Jabber-ID word reeds deur 'n ander gebruiker gebruik."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Kon nie e-posbevestiging verwyder nie."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2113,58 +2310,58 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
#, fuzzy
msgid "No pending confirmation to cancel."
msgstr "Geen bevestigingskode."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
#, fuzzy
msgid "That is the wrong email address."
msgstr "Dit is die verkeerde IM-adres."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Kon nie e-posbevestiging verwyder nie."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Geen bevestigingskode."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Dit is nie u e-posadres nie."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "Inkomende e-posadres is verwyder."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Geen inkomende e-posadres."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Kon nie gebruikersdata opdateer nie."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Inkomende e-posadres is verwyder."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
#, fuzzy
msgid "New incoming email address added."
msgstr "Geen inkomende e-posadres."
@@ -5307,7 +5504,7 @@ msgstr "U volg hierdie gebruiker:"
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
#, fuzzy
msgid "Could not save subscription."
msgstr "Kon nie die profiel stoor nie."
@@ -5316,11 +5513,6 @@ msgstr "Kon nie die profiel stoor nie."
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "Die lêer bestaan nie."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
@@ -5382,13 +5574,6 @@ msgid ""
"%) and be the first?"
msgstr ""
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Beskrywing"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5432,13 +5617,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s volg niemand nie."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Voer vir vriende van %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5832,14 +6022,14 @@ msgid "Author(s)"
msgstr "Outeur(s)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
#, fuzzy
msgid "Favor"
msgstr "Gunstelinge"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "Hierdie kennisgewing is nie 'n gunsteling nie!"
@@ -5894,44 +6084,44 @@ msgid "Invalid filename."
msgstr "Ongeldige grootte."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
#, fuzzy
msgid "Group join failed."
msgstr "Groepsprofiel"
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "Nie lid van die groep nie."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
#, fuzzy
msgid "Group leave failed."
msgstr "Groepsprofiel"
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "Fout tydens stoor van gebruiker; ongeldig."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Aansluit"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -5961,13 +6151,13 @@ msgid "You are banned from sending direct messages."
msgstr "U inkomende boodskappe"
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
#, fuzzy
msgid "Could not insert message."
msgstr "Kan nie boodskap verwerk nie."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
#, fuzzy
msgid "Could not update message with new URI."
msgstr "Kan nie boodskap verwerk nie."
@@ -5986,60 +6176,60 @@ msgid "Database error inserting hashtag: %s"
msgstr ""
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr ""
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
#, fuzzy
msgid "You are banned from posting notices on this site."
msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr ""
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr ""
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Kon nie die profiel stoor nie."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6053,14 +6243,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6078,55 +6268,55 @@ msgid "Unable to save tag."
msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr ""
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr ""
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
#, fuzzy
msgid "User has blocked you."
msgstr "Hierdie gebruiker het nie 'n profiel nie."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr ""
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
#, fuzzy
msgid "Could not delete self-subscription."
msgstr ""
"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
#, fuzzy
msgid "Could not delete subscription OMB token."
msgstr ""
"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
#, fuzzy
msgid "Could not delete subscription."
msgstr ""
"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%s volg niemand nie."
@@ -6501,10 +6691,15 @@ msgid "Before"
msgstr "Voor"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Foto"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -7977,19 +8172,19 @@ msgid "Send"
msgstr "Stuur"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Die gebruikersnaam mag slegs uit kleinletters en syfers bestaan en mag geen "
"spasies bevat nie."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8244,7 +8439,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Blok hierdie gebruiker van hierdie groep"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "Die API-funksie is nie gevind nie."
@@ -8503,17 +8698,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "'n paar sekondes gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "ongeveer 'n minuut gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8521,12 +8716,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "ongeveer 'n uur gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8534,12 +8729,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "ongeveer een dag gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8547,12 +8742,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "ongeveer een maand gelede"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8560,7 +8755,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "ongeveer een jaar gelede"
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 294d50dee..2eb7e3f32 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:17:47+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:23+0000\n"
"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
"99) ? 4 : 5 ) ) ) );\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -89,11 +89,11 @@ msgstr "حفظ إعدادت الوصول"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -377,20 +377,38 @@ msgstr "تعذّر حذف إعدادات التصميم."
msgid "Could not update your design."
msgstr "تعذّر تحديث تصميمك."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "مسار %s الزمني"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "اشتراكات %s"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "المفضلات"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "أعضاء مجموعة %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -759,7 +777,7 @@ msgstr "لا تملك تصريحًا."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -796,7 +814,7 @@ msgstr "خطأ في قاعدة البيانات أثناء حذف مستخدم
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -865,7 +883,7 @@ msgstr "كلمة السر"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -943,7 +961,8 @@ msgstr "لا يمكنك حذف المستخدمين."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "لا إشعار كهذا."
@@ -959,7 +978,10 @@ msgstr "لا يمكنك تكرار ملحوظتك الخاصة."
msgid "Already repeated that notice."
msgstr "كرر بالفعل هذه الملاحظة."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "لم يتم العثور على وسيلة API."
@@ -979,16 +1001,16 @@ msgstr "حُذِفت الحالة."
msgid "No status with that ID found."
msgstr "لا حالة وُجدت بهذه الهوية."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "تعذّر حذف هذا الإشعار."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "احذف الإشعار"
@@ -1119,34 +1141,58 @@ msgstr "الإشعارات الموسومة ب%s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "الإشعارات التي فضلها %1$s في %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار الإشعارات."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "ابحث عن محتويات في الإشعارات"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "لا ملف بهذه الهوية."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1162,6 +1208,147 @@ msgstr "لم يتم العثور على وسيلة API."
msgid "User not found."
msgstr "لم يُعثرعلى المستخدم."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "لا ملف كهذا."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "تعذّر إدراج اشتراك جديد."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "ابحث عن محتويات في الإشعارات"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "غير معروفة"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "أضف إلى المفضلات"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "لا ملف كهذا."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "أعضاء مجموعة %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "المجموعات التي %s عضو فيها"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "غير معروفة"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "جميع الأعضاء"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "لا ملف كهذا."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "تعذّر حذف المفضلة."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "لا مجموعة كهذه."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "جميع الأعضاء"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "لم يتم العثور على وسيلة API."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "لا ملف كهذا."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "لست مُشتركًا بأي أحد."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "تعذّر حفظ الاشتراك."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "الأشخاص المشتركون ب%s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "نوع ملف غير معروف"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1449,8 +1636,8 @@ msgstr "هذا البريد الإلكتروني ملك مستخدم آخر با
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1976,12 +2163,12 @@ msgstr "أدر كيف تستلم البريد الإلكتروني من %%site.n
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "عنوان البريد الإلكتروني"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
@@ -1990,14 +2177,14 @@ msgstr "عنوان البريد الإلكتروني المُؤكد الحالي
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "أزل"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2008,14 +2195,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "عنوان البريد الإلكتروني، مثل \"UserName@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2023,111 +2210,118 @@ msgstr "أضف"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "البريد الإلكتروني الوارد"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "أريد أن أرسل الملاحظات عبر البريد الإلكتروني."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "أرسل بريدًا إلكترونيًا إلى هذا العنوان لترسل إشعارات جديدة."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "أنشئ عنوان بريد إلكتروني لترسل إليه؛ ألغِ القديم."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "جديد"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "تفضيلات البريد الإلكتروني"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "أرسل لي إشعارات بالاشتراكات الجديدة عبر البريد الإلكتروني."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "أرسل لي بريدًا إلكرتونيًا عندما يضيف أحدهم إشعاري مفضلة."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "أرسل لي بريدًا إلكترونيًا عندما يرسل لي أحد رسالة خاصة."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "أرسل لي بريدًا إلكترونيًا عندما يرسل لي أحد \"@-رد\"."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "اسمح لأصدقائي بتنبيهي ومراسلتي عبر البريد الإلكتروني."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "أريد أن أرسل الملاحظات عبر البريد الإلكتروني."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكتروني."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "حُفظت تفضيلات البريد الإلكرتوني."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "لا عنوان بريد إلكتروني."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
#, fuzzy
msgid "Cannot normalize that email address"
msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "ليس عنوان بريد صالح."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "هذا هو عنوان بريدك الإكتروني سابقًا."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "هذا البريد الإلكتروني ملك مستخدم آخر بالفعل."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "تعذّر إدراج رمز التأكيد."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2136,58 +2330,58 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
#, fuzzy
msgid "No pending confirmation to cancel."
msgstr "أُلغي تأكيد المراسلة الفورية."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "هذا عنوان بريد إلكتروني خطأ."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "تعذّر حذف تأكيد البريد الإلكتروني."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "أُلغي تأكيد البريد الإلكتروني."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "هذا ليس عنوان بريدك الإلكتروني."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "أزيل عنوان البريد الإلكتروني."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "لا عنوان بريد إلكتروني وارد."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "تعذّر تحديث سجل المستخدم."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
#, fuzzy
msgid "Incoming email address removed."
msgstr "لا عنوان بريد إلكتروني وارد."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
#, fuzzy
msgid "New incoming email address added."
msgstr "لا عنوان بريد إلكتروني وارد."
@@ -5320,7 +5514,7 @@ msgstr "لست مُشتركًا بأي أحد."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "تعذّر حفظ الاشتراك."
@@ -5328,10 +5522,6 @@ msgstr "تعذّر حفظ الاشتراك."
msgid "This action only accepts POST requests."
msgstr "هذا الإجراء يقبل طلبات POST فقط."
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "لا ملف كهذا."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
@@ -5393,13 +5583,6 @@ msgid ""
"%) and be the first?"
msgstr ""
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "اشتراكات %s"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5443,13 +5626,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "الردود على %s"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "جابر"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "رسائل قصيرة"
@@ -5838,13 +6026,13 @@ msgid "Author(s)"
msgstr "المؤلف(ون)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "فضّل"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "لقد أضاف %s (@%s) إشعارك إلى مفضلاته"
@@ -5911,42 +6099,42 @@ msgid "Invalid filename."
msgstr "حجم غير صالح."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "الانضمام للمجموعة فشل."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "ليس جزءا من المجموعة."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "ترك المجموعة فشل."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "انضم"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -5974,12 +6162,12 @@ msgid "You are banned from sending direct messages."
msgstr "أنت ممنوع من إرسال رسائل مباشرة."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "تعذّر إدراج الرسالة."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
#, fuzzy
msgid "Could not update message with new URI."
msgstr "تعذّر تحليل الرسالة."
@@ -5998,64 +6186,64 @@ msgid "Database error inserting hashtag: %s"
msgstr "خطأ في قاعدة البيانات أثناء حذف مستخدم تطبيق OAuth."
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "مشكلة في حفظ الإشعار. طويل جدًا."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "مشكلة في حفظ الإشعار. مستخدم غير معروف."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
#, fuzzy
msgid "You are banned from posting notices on this site."
msgstr "أنت ممنوع من إرسال رسائل مباشرة."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "مشكلة أثناء حفظ الإشعار."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
#, fuzzy
msgid "Problem saving group inbox."
msgstr "مشكلة أثناء حفظ الإشعار."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "تعذر تحديث المجموعة المحلية."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
-msgstr "آر تي @%1$s %2$s"
+msgstr "RT @%1$s %2$s"
#. TRANS: Full name of a profile or group followed by nickname in parens
#: classes/Profile.php:172 classes/User_group.php:247
@@ -6066,14 +6254,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6091,48 +6279,48 @@ msgid "Unable to save tag."
msgstr "تعذّر حفظ إشعار الموقع."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr ""
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "مُشترك أصلا!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "لقد منعك المستخدم."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "غير مشترك!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "تعذّر حفظ الاشتراك."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "تعذّر حفظ الاشتراك."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "تعذّر حفظ الاشتراك."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
@@ -6504,10 +6692,15 @@ msgid "Before"
msgstr "قبل"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "صورة"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8055,18 +8248,18 @@ msgid "Send"
msgstr "أرسل"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
#, fuzzy
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8312,7 +8505,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "امنع هذا المستخدم من هذه المجموعة"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "لم يتم العثور على وسيلة API."
@@ -8567,17 +8760,17 @@ msgid "Moderator"
msgstr "مراقب"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8589,12 +8782,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8606,12 +8799,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8623,12 +8816,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8640,7 +8833,7 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 417ad569f..4f56fcd5d 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:17:48+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:25+0000\n"
"Language-Team: Egyptian Spoken Arabic <http://translatewiki.net/wiki/Portal:"
"arz>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: arz\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -92,11 +92,11 @@ msgstr "اذف إعدادت الموقع"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
#, fuzzy
@@ -381,20 +381,38 @@ msgstr "تعذّر حذف إعدادات التصميم."
msgid "Could not update your design."
msgstr "تعذّر تحديث تصميمك."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "مسار %s الزمني"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "اشتراكات %s"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "المفضلات"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "أعضاء مجموعه %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -766,7 +784,7 @@ msgstr "لا تملك تصريحًا."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -803,7 +821,7 @@ msgstr "خطأ قاعده البيانات أثناء إدخال المستخد
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -872,7 +890,7 @@ msgstr "كلمه السر"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
#, fuzzy
@@ -951,7 +969,8 @@ msgstr "لا يمكنك حذف المستخدمين."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "لا إشعار كهذا."
@@ -967,7 +986,10 @@ msgstr "مش نافعه تتكرر الملاحظتك بتاعتك."
msgid "Already repeated that notice."
msgstr "الملاحظه اتكررت فعلا."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "الـ API method مش موجوده."
@@ -988,16 +1010,16 @@ msgstr "حُذِفت الحاله."
msgid "No status with that ID found."
msgstr "لا ملف شخصى بهذه الهويه."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "تعذّر حذف هذا الإشعار."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "احذف الإشعار"
@@ -1128,34 +1150,58 @@ msgstr "الإشعارات الموسومه ب%s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "الإشعارات الموسومه ب%s"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "يحق للمُرسل والمستلم فقط قراءه هذه الرساله."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "ابحث عن محتويات فى الإشعارات"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "لا ملف بهذه الهويه."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1172,6 +1218,148 @@ msgstr "الـ API method مش موجوده."
msgid "User not found."
msgstr "الـ API method مش موجوده."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "لا ملف كهذا."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "تعذّر إدراج اشتراك جديد."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "ابحث عن محتويات فى الإشعارات"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "مش معروف"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "أضف إلى المفضلات"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "لا ملف كهذا."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "أعضاء مجموعه %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "المجموعات التى %s عضو فيها"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "مش معروف"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "جميع الأعضاء"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "لا ملف كهذا."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "تعذّر حذف المفضله."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "لا مجموعه كهذه."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "جميع الأعضاء"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "الـ API method مش موجوده."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "لا ملف كهذا."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "لست مُشتركًا بأى أحد."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "تعذّر حفظ الاشتراك."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "الأشخاص المشتركون ب%s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "نوع ملف غير معروف"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1462,8 +1650,8 @@ msgstr "هذا البريد الإلكترونى ملك مستخدم آخر با
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1995,12 +2183,12 @@ msgstr "أدر كيف تستلم البريد الإلكترونى من %%site.n
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "عنوان الايميل"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
@@ -2009,14 +2197,14 @@ msgstr "عنوان البريد الإلكترونى المُؤكد الحالى
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "استرجع"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2027,14 +2215,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "عنوان البريد الإلكترونى، مثل \"UserName@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
#, fuzzy
msgctxt "BUTTON"
@@ -2043,115 +2231,122 @@ msgstr "أضف"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "البريد الإلكترونى الوارد"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "أريد أن أرسل الملاحظات عبر البريد الإلكترونى."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "أرسل بريدًا إلكترونيًا إلى هذا العنوان لترسل إشعارات جديده."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "أنشئ عنوان بريد إلكترونى لترسل إليه؛ ألغِ القديم."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "جديد"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "عناوين البريد الإلكتروني"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "أرسل لى إشعارات بالاشتراكات الجديده عبر البريد الإلكترونى."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أحدهم إشعارى مفضله."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
#, fuzzy
msgid "Send me email when someone sends me a private message."
msgstr "أرسل لى بريدًا إلكترونيًا عندما يرسل لى أحدهم \"@-رد\"."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "أرسل لى بريدًا إلكترونيًا عندما يرسل لى أحدهم \"@-رد\"."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "أريد أن أرسل الملاحظات عبر البريد الإلكترونى."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
#, fuzzy
msgid "Publish a MicroID for my email address."
msgstr "هذا ليس عنوان بريدك الإلكترونى."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
#, fuzzy
msgid "Email preferences saved."
msgstr "حُفِظت التفضيلات."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "لا عنوان بريد إلكترونى."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
#, fuzzy
msgid "Cannot normalize that email address"
msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "ليس عنوان بريد صالح."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "هذا هو عنوان بريدك الإكترونى سابقًا."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "هذا البريد الإلكترونى ملك مستخدم آخر بالفعل."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "تعذّر إدراج رمز التأكيد."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2160,61 +2355,61 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
#, fuzzy
msgid "No pending confirmation to cancel."
msgstr "لا رمز تأكيد."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
#, fuzzy
msgid "That is the wrong email address."
msgstr "هذا عنوان محادثه فوريه خاطئ."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "تعذّر حذف تأكيد البريد الإلكترونى."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "لا رمز تأكيد."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "هذا ليس عنوان بريدك الإلكترونى."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "لا عنوان بريد إلكترونى."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
#, fuzzy
msgid "No incoming email address."
msgstr "لا عنوان بريد إلكترونى."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
#, fuzzy
msgid "Couldn't update user record."
msgstr "تعذّر تحديث المستخدم."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
#, fuzzy
msgid "Incoming email address removed."
msgstr "لا عنوان بريد إلكترونى."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
#, fuzzy
msgid "New incoming email address added."
msgstr "لا عنوان بريد إلكترونى."
@@ -5357,7 +5552,7 @@ msgstr "لست مُشتركًا بأى أحد."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "تعذّر حفظ الاشتراك."
@@ -5365,11 +5560,6 @@ msgstr "تعذّر حفظ الاشتراك."
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "لا ملف كهذا."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
@@ -5431,13 +5621,6 @@ msgid ""
"%) and be the first?"
msgstr ""
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "اشتراكات %s"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5481,13 +5664,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "لست مُشتركًا بأى أحد."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "الردود على %s"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "جابر"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "رسائل قصيرة"
@@ -5875,13 +6063,13 @@ msgid "Author(s)"
msgstr "المؤلف/ين"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "فضّل"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أحدهم إشعارى مفضله."
@@ -5948,42 +6136,42 @@ msgid "Invalid filename."
msgstr "حجم غير صالح."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "دخول الجروپ فشل."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "مش جزء من الجروپ."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "الخروج من الجروپ فشل."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "انضم"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6012,12 +6200,12 @@ msgid "You are banned from sending direct messages."
msgstr "أنت ممنوع من إرسال رسائل مباشره."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "تعذّر إدراج الرساله."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
#, fuzzy
msgid "Could not update message with new URI."
msgstr "تعذّر تحليل الرساله."
@@ -6036,61 +6224,61 @@ msgid "Database error inserting hashtag: %s"
msgstr "خطأ فى إدراج الأفتار"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "مشكله فى حفظ الإشعار. طويل جدًا."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "مشكله فى حفظ الإشعار. مستخدم غير معروف."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
#, fuzzy
msgid "You are banned from posting notices on this site."
msgstr "أنت ممنوع من إرسال رسائل مباشره."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "مشكله أثناء حفظ الإشعار."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
#, fuzzy
msgid "Problem saving group inbox."
msgstr "مشكله أثناء حفظ الإشعار."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "تعذّر حفظ الاشتراك."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "آر تى @%1$s %2$s"
@@ -6104,14 +6292,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6128,48 +6316,48 @@ msgid "Unable to save tag."
msgstr "تعذّر حفظ الوسوم."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr ""
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "مُشترك أصلا!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "لقد منعك المستخدم."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "غير مشترك!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "تعذّر حفظ الاشتراك."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "تعذّر حفظ الاشتراك."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "تعذّر حفظ الاشتراك."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "هؤلاء هم الأشخاص الذين يستمعون إلى إشعاراتك."
@@ -6556,10 +6744,15 @@ msgid "Before"
msgstr "قبل"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "صورة"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8060,17 +8253,17 @@ msgid "Send"
msgstr "أرسل"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8316,7 +8509,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "امنع هذا المستخدم من هذه المجموعة"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "الـ API method مش موجوده."
@@ -8574,17 +8767,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "قبل دقيقه تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8596,12 +8789,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "قبل ساعه تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8613,12 +8806,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8630,12 +8823,12 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8647,7 +8840,7 @@ msgstr[4] ""
msgstr[5] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "قبل سنه تقريبًا"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index ec3a3f244..bb1f0c3e0 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:17:49+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:26+0000\n"
"Language-Team: Bulgarian <http://translatewiki.net/wiki/Portal:bg>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -86,11 +86,11 @@ msgstr "Запазване настройките за достъп"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -369,20 +369,38 @@ msgstr "Грешка при записване настройките за Twitt
msgid "Could not update your design."
msgstr "Грешка при обновяване на потребителя."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "Поток на %s"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "Абонаменти на %s"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Любими"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "Членове на групата %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -742,7 +760,7 @@ msgstr "Не сте абонирани за никого."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -779,7 +797,7 @@ msgstr "Грешка в базата от данни — отговор при
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -848,7 +866,7 @@ msgstr "Парола"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -924,7 +942,8 @@ msgstr "Не може да изтривате бележки на друг по
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Няма такава бележка."
@@ -940,7 +959,10 @@ msgstr "Не можете да повтаряте собствени бележ
msgid "Already repeated that notice."
msgstr "Вече сте повторили тази бележка."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "Не е открит методът в API."
@@ -960,16 +982,16 @@ msgstr "Бележката е изтрита."
msgid "No status with that ID found."
msgstr "Не е открита бележка с такъв идентификатор."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Грешка при изтриване на бележката."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "Изтриване на бележката"
@@ -1092,34 +1114,58 @@ msgstr "Бележки с етикет %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Бележки от %1$s в %2$s."
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "Само потребителят може да отваря собствената си кутия."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
msgstr ""
-#: actions/apitimelineuser.php:316
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
+msgstr ""
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Търсене в съдържанието на бележките"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "Не е открита бележка с такъв идентификатор."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1134,6 +1180,147 @@ msgstr "Методът в API все още се разработва."
msgid "User not found."
msgstr "Не е открит методът в API."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Няма такъв профил."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Грешка при добавяне на нов абонамент."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Търсене в съдържанието на бележките"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Непознато"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Добавяне към любимите"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Няма такъв профил."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "Членове на групата %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Групи, в които участва %s"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Непознато"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Всички членове"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Няма такъв файл."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Грешка при изтриване на любима бележка."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Няма такава група"
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Всички членове"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "Не е открит методът в API."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Няма такъв профил."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Не сте абонирани за този профил"
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Грешка при добавяне на нов абонамент."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Абонирани за %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Неподдържан вид файл"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1422,8 +1609,8 @@ msgstr "Този адрес е вече потвърден."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1861,7 +2048,7 @@ msgstr "Описанието е задължително."
#. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
#: actions/editapplication.php:208
msgid "Source URL is too long."
-msgstr ""
+msgstr "Изходният адрес е твърде дълъг."
#. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
#: actions/editapplication.php:215 actions/newapplication.php:193
@@ -1964,12 +2151,12 @@ msgstr "Управление на пощата, идваща от %%site.name%%.
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "Адрес на е-поща"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Текущ потвърден адрес на е-поща."
@@ -1978,14 +2165,14 @@ msgstr "Текущ потвърден адрес на е-поща."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Премахване"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1998,14 +2185,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "Адрес на е-поща, като \"UserName@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2013,112 +2200,119 @@ msgstr "Добавяне"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Входяща поща"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Искам да изпращам бележки по пощата."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Изпратете писмо до този адрес за публикуване като бележка."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Задаване на нова е-поща, от която да се публикува. Отменя предишната."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Ново"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Настройки на е-поща"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Изпращане на уведомления за нови абонаменти по пощата."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Изпращане на писмо при отбелязване на моя бележка като любима."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Изпращане на писмо при ново лично съобщение."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Изпращане на писмо при ново лично съобщение."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Искам да изпращам бележки по пощата."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Публикуване на MicroID за адреса на е-пощата."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "Настройките на е-поща са запазени."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Не е въведена е-поща."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Грешка при нормализиране адреса на е-пощата"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Неправилен адрес на е-поща."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Това и сега е адресът на е-пощата ви."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Тази е-поща вече се използва от друг потребител."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Не може да се вмъкне код за потвърждение."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2130,57 +2324,57 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Няма потвърждения, очакващи да бъдат отказани."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
#, fuzzy
msgid "That is the wrong email address."
msgstr "Грешен IM адрес."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Грешка при изтриване потвърждението по е-поща."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Няма потвърждения, очакващи да бъдат отказани."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Това не е вашият адрес на е-поща."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "Входящият адрес на е-поща е премахнат."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Няма входящ адрес на е-поща."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Грешка при обновяване записа на потребител."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Входящият адрес на е-поща е премахнат."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Добавен е нов входящ адрес на е-поща."
@@ -2476,13 +2670,13 @@ msgstr "Настройки"
#: actions/groupmembers.php:399
msgctxt "BUTTON"
msgid "Block"
-msgstr ""
+msgstr "Блокиране"
#. TRANS: Submit button title.
#: actions/groupmembers.php:403
msgctxt "TOOLTIP"
msgid "Block this user"
-msgstr ""
+msgstr "Блокиране на този потребител"
#: actions/groupmembers.php:498
#, fuzzy
@@ -2956,7 +3150,7 @@ msgstr "%1$s напусна групата %2$s"
#: actions/licenseadminpanel.php:56
msgctxt "TITLE"
msgid "License"
-msgstr ""
+msgstr "Лиценз"
#: actions/licenseadminpanel.php:67
msgid "License for this StatusNet site"
@@ -3003,7 +3197,7 @@ msgstr "Частен"
#: actions/licenseadminpanel.php:246
msgid "All Rights Reserved"
-msgstr ""
+msgstr "Всички права запазени"
#: actions/licenseadminpanel.php:247
msgid "Creative Commons"
@@ -4341,7 +4535,7 @@ msgstr ""
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
#: actions/register.php:541
msgid "All rights reserved."
-msgstr ""
+msgstr "Всички права запазени."
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
#: actions/register.php:546
@@ -5345,7 +5539,7 @@ msgstr "Не сте абонирани за този профил"
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Грешка при добавяне на нов абонамент."
@@ -5353,10 +5547,6 @@ msgstr "Грешка при добавяне на нов абонамент."
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Няма такъв профил."
-
#: actions/subscribe.php:117
#, fuzzy
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
@@ -5420,13 +5610,6 @@ msgid ""
"%) and be the first?"
msgstr ""
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "Абонаменти на %s"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5470,13 +5653,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s не получава ничии бележки."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Емисия с бележки на %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5875,13 +6063,13 @@ msgid "Author(s)"
msgstr "Автор(и)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Любимо"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%s (@%s) отбеляза бележката ви като любима"
@@ -5936,45 +6124,45 @@ msgid "Invalid filename."
msgstr "Неправилен размер."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
#, fuzzy
msgid "Group join failed."
msgstr "Профил на групата"
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
#, fuzzy
msgid "Not part of group."
msgstr "Грешка при обновяване на групата."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
#, fuzzy
msgid "Group leave failed."
msgstr "Профил на групата"
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "Грешка при запазване на потребител — невалидност."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Присъединяване"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6004,12 +6192,12 @@ msgid "You are banned from sending direct messages."
msgstr "Грешка при изпращане на прякото съобщение"
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Грешка при вмъкване на съобщението."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Грешка при обновяване на бележката с нов URL-адрес."
@@ -6027,18 +6215,18 @@ msgid "Database error inserting hashtag: %s"
msgstr "Грешка при вмъкване на аватар"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Проблем при записване на бележката."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Грешка при записване на бележката. Непознат потребител."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6046,7 +6234,7 @@ msgstr ""
"отново след няколко минути."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -6056,37 +6244,37 @@ msgstr ""
"отново след няколко минути."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Забранено ви е да публикувате бележки в този сайт."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Проблем при записване на бележката."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Проблем при записване на бележката."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Грешка при запазване на етикетите."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6100,14 +6288,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6124,51 +6312,51 @@ msgid "Unable to save tag."
msgstr "Грешка при запазване на етикетите."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Потребителят е забранил да се абонирате за него."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
#, fuzzy
msgid "Already subscribed!"
msgstr "Не сте абонирани!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "Потребителят ви е блокирал."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
#, fuzzy
msgid "Not subscribed!"
msgstr "Не сте абонирани!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Грешка при добавяне на нов абонамент."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Грешка при добавяне на нов абонамент."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Грешка при добавяне на нов абонамент."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s вече получава бележките ви в %2$s."
@@ -6544,10 +6732,15 @@ msgid "Before"
msgstr "Преди"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Снимка"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8017,19 +8210,19 @@ msgid "Send"
msgstr "Прати"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Псевдонимът може да съдържа само малки букви, числа и никакво разстояние "
"между тях."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8272,7 +8465,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Списък с потребителите в тази група."
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "Не е открит методът в API."
@@ -8302,7 +8495,7 @@ msgstr "Ключови думи"
#: lib/searchaction.php:130
msgctxt "BUTTON"
msgid "Search"
-msgstr ""
+msgstr "Търсене"
#. TRANS: Definition list item with instructions on how to get (better) search results.
#: lib/searchaction.php:170
@@ -8527,17 +8720,17 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "преди няколко секунди"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "преди около минута"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8545,12 +8738,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "преди около час"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8558,12 +8751,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "преди около ден"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8571,12 +8764,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "преди около месец"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8584,7 +8777,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "преди около година"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index b9bb16d80..7a98ba56b 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:17:49+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:27+0000\n"
"Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: br\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -88,11 +88,11 @@ msgstr "Enrollañ an arventennoù moned"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -373,20 +373,38 @@ msgstr "Dibosupl eo enrollañ an arventennoù empentiñ."
msgid "Could not update your design."
msgstr "Diposubl eo hizivat ho design."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "Oberezhioù %s"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "Koumanantoù %s"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Pennrolloù"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "Izili ar strollad %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -745,7 +763,7 @@ msgstr "N'oc'h ket aotreet."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -782,7 +800,7 @@ msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -850,7 +868,7 @@ msgstr "Ger-tremen"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -923,7 +941,8 @@ msgstr "Ne c'helloc'h ket dilemel statud un implijer all."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "N'eus ket eus an ali-se."
@@ -939,7 +958,10 @@ msgstr "Ne c'helloc'h ket adlavar ho alioù."
msgid "Already repeated that notice."
msgstr "Kemenn bet adkemeret dija."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "N'eo ket bet kavet an hentenn API !"
@@ -959,16 +981,16 @@ msgstr "Statud diverket."
msgid "No status with that ID found."
msgstr "N'eo ket bet kavet a statud evit an ID-mañ"
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Dibosupl eo dilemel ar c'hemenn-mañ."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "Dilemel un ali"
@@ -1091,34 +1113,58 @@ msgstr "Alioù merket gant %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Hizivadennoù merket gant %1$s e %2$s !"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
msgstr ""
-#: actions/apitimelineuser.php:316
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
+msgstr ""
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Klask alioù en danvez"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr ""
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1134,6 +1180,147 @@ msgstr "Hentenn API war sevel."
msgid "User not found."
msgstr "N'eo ket bet kavet an hentenn API !"
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "N'eus ket eus ar profil-se."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Dibosupl eo dilemel ar c'houmanant."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Klask alioù en danvez"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Dianav"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Ouzhpennañ d'ar pennrolloù"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "N'eus ket eus ar profil-se."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "Izili ar strollad %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Ezel eo %s eus ar strolladoù"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Dianav"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "An holl izili"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Restr ezvezant."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Diposupl eo dilemel ar pennroll-mañ."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "N'eus ket eus ar strollad-se."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "An holl izili"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "N'eo ket bet kavet an hentenn API !"
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "N'eus ket eus ar profil-se."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "N'oc'h ket koumanantet d'ar profil-se."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Dibosupl eo dilemel ar c'houmanant."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Koumanantet da %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Dizanv eo seurt ar restr"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1417,8 +1604,8 @@ msgstr "Kadarnaet eo bet dija ar chomlec'h-mañ."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1937,12 +2124,12 @@ msgstr "Merañ ar posteloù a fell deoc'h resevout a-berzh %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "Chomlec'h postel"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Chomlec'h postel gwiriekaet er mare-mañ."
@@ -1951,14 +2138,14 @@ msgstr "Chomlec'h postel gwiriekaet er mare-mañ."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Dilemel"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1969,14 +2156,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "Chomlec'h postel, evel \"AnvImplijer@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -1984,101 +2171,108 @@ msgstr "Ouzhpennañ"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Postel o tont"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "C'hoant am eus kas va alioù dre bostel."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
#, fuzzy
msgid "Send email to this address to post new notices."
msgstr "Chomlec'h postel nevez evit embann e %s"
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
#, fuzzy
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Chomlec'h postel nevez evit embann e %s"
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Nevez"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Penndibaboù ar posteloù"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
#, fuzzy
msgid "Send me notices of new subscriptions through email."
msgstr "Kas din an alioù dre Jabber/GTalk."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Kas din ur postel pa lak unan bennak unan eus va alioù evel pennroll."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Kas din ur postel pa gas unan bennak ur gemennadenn bersonel din."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Kas din ur postel pa gas unan bennak ur \"@-respont\" din."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "C'hoant am eus kas va alioù dre bostel."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Embann ur MicroID evit ma chomlec'h postel."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "Enrollet eo bet an arventennoù postel."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Chomlec'h postel ebet."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
#, fuzzy
msgid "Cannot normalize that email address"
msgstr "Diposubl eo implijout an ID Jabber-mañ"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "N'eo ket ur chomlec'h postel reizh."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Ho postel eo dija."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
#, fuzzy
msgid "That email address already belongs to another user."
msgstr "D'un implijer all eo an niverenn-mañ dija."
@@ -2086,13 +2280,13 @@ msgstr "D'un implijer all eo an niverenn-mañ dija."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Dibosupl eo ensoc'hañ ar c'hod gwiriekaat."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2101,56 +2295,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Kadarnadenn ebet da vezañ nullet."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "N'eo ket mat ar chomlec'h postelerezh prim."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Diposubl eo dilemel ar postel kadarnadur."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Nullet eo bet kadarnadenn ar postel."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "N'eo ket ho postel."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "Dilamet eo bet ar chomlec'h postel."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Chomlec'h postel ebet o tont."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Dibosupl eo hizivaat doser an implijer."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Diverket eo bet ar chomlec'h postel o tont tre."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Ouzhpennet ez eus bet ur chomlec'h postel nevez o tont tre"
@@ -4146,7 +4340,7 @@ msgstr "Goulennet eo an adtapout gerioù-tremen"
#: actions/recoverpassword.php:213
msgid "Unknown action"
-msgstr "Ober dianav"
+msgstr "Oberiadenn dianav"
#: actions/recoverpassword.php:236
msgid "6 or more characters, and don't forget it!"
@@ -4609,9 +4803,8 @@ msgid "%1$s's favorite notices, page %2$d"
msgstr "Alioù karetañ %1$s, pajenn %2$d"
#: actions/showfavorites.php:132
-#, fuzzy
msgid "Could not retrieve favorite notices."
-msgstr "Diposupl eo krouiñ ar pennroll-mañ."
+msgstr "Diposupl eo diskwel ar pennrolloù."
#: actions/showfavorites.php:171
#, php-format
@@ -5280,13 +5473,12 @@ msgstr "Enrollañ arventennoù al lec'hienn"
#. TRANS: Client error displayed trying a change a subscription for a non-subscribed profile.
#: actions/subedit.php:75
-#, fuzzy
msgid "You are not subscribed to that profile."
-msgstr "N'hoc'h ket koumanantet da zen ebet."
+msgstr "N'oc'h ket koumanantet d'ar profil-se."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
#, fuzzy
msgid "Could not save subscription."
msgstr "Dibosupl eo dilemel ar c'houmanant."
@@ -5295,10 +5487,6 @@ msgstr "Dibosupl eo dilemel ar c'houmanant."
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "N'eus ket eus ar profil-se."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
@@ -5365,13 +5553,6 @@ msgstr ""
"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
"gentañ da embann un dra !"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "Koumanantoù %s"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5415,13 +5596,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "Ne heuilh %s den ebet."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Gwazh alioù %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5813,13 +5999,13 @@ msgid "Author(s)"
msgstr "Aozer(ien)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Pennrolloù"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "Kas din ur postel pa lak unan bennak unan eus va alioù evel pennroll."
@@ -5874,42 +6060,42 @@ msgid "Invalid filename."
msgstr "Ment direizh."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "C'hwitet eo bet an enskrivadur d'ar strollad."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "N'eo ezel eus strollad ebet."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "C'hwitet eo bet an disenskrivadur d'ar strollad."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "Ur fazi 'zo bet e-pad enolladenn an implijer ; diwiriek."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Stagañ"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -5939,12 +6125,12 @@ msgid "You are banned from sending direct messages."
msgstr "Ur gudenn 'zo bet pa veze kaset ho kemennadenn."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Diposubl eo ensoc'hañ ur gemenadenn"
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Dibosupl eo hizivaat ar gemennadenn gant un URI nevez."
@@ -5962,60 +6148,60 @@ msgid "Database error inserting hashtag: %s"
msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Ur gudenn a zo bet e-pad enrolladenn ar c'hemenn. Re hir."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Ur gudenn a zo bet e-pad enrolladenn ar c'hemenn. Implijer dianav."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
#, fuzzy
msgid "You are banned from posting notices on this site."
msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Ur gudenn 'zo bet pa veze enrollet an ali."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "Ur gudenn 'zo bet pa veze enrollet boest degemer ar strollad."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Dibosupl eo enrollañ titouroù ar strollad lec'hel."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6029,14 +6215,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6052,48 +6238,48 @@ msgid "Unable to save tag."
msgstr "Dibosupl eo enrollañ an tikedenn."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "Nac'het ez eus bet deoc'h en em goumanantiñ."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Koumanantet dija !"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "An implijer-mañ en deus stanket ac'hanoc'h."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Nann-koumanantet !"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Dibosupl eo dilemel ar c'houmanant."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Dibosupl eo dilemel ar c'houmanant."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Dibosupl eo dilemel ar c'houmanant."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
-msgstr ""
+msgstr "Heuliañ"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "Ne heuilh %s den ebet."
@@ -6185,7 +6371,7 @@ msgstr "Pajenn hep anv"
#: lib/action.php:312
msgctxt "TOOLTIP"
msgid "Show more"
-msgstr ""
+msgstr "Diskouez muioc'h"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
#: lib/action.php:531
@@ -6459,10 +6645,15 @@ msgid "Before"
msgstr "Kent"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Skeudenn"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -6876,19 +7067,19 @@ msgstr "Kemenn bet ouzhpennet d'ar pennroll."
#: lib/command.php:357
#, php-format
msgid "%1$s joined group %2$s."
-msgstr ""
+msgstr "%1$s a zo bet er strollad %2$s."
#. TRANS: Message given having removed a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
#: lib/command.php:405
#, php-format
msgid "%1$s left group %2$s."
-msgstr ""
+msgstr "%1$s en deus kuitaet ar strollad %2$s."
#. TRANS: Whois output.
#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
#: lib/command.php:426
-#, fuzzy, php-format
+#, php-format
msgctxt "WHOIS"
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -7066,7 +7257,7 @@ msgstr "Digoumanatet %s."
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:830
msgid "You are not subscribed to anyone."
-msgstr "N'hoc'h ket koumanantet da zen ebet."
+msgstr "N'oc'h ket koumanantet da zen ebet."
#. TRANS: Text shown after requesting other users a user is subscribed to.
#. TRANS: This message supports plural forms. This message is followed by a
@@ -7503,8 +7694,8 @@ msgstr[1] "Ko"
#, php-format
msgid "%dB"
msgid_plural "%dB"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d&nbsp;o"
+msgstr[1] "%d&nbsp;o"
#: lib/jabber.php:387
#, php-format
@@ -7922,18 +8113,18 @@ msgid "Send"
msgstr "Kas"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
#, fuzzy
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8177,7 +8368,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Stankañ an implijer-mañ eus ar strollad-se"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "N'eo ket bet kavet an hentenn API !"
@@ -8206,7 +8397,7 @@ msgstr "Ger(ioù) alc'hwez"
#: lib/searchaction.php:130
msgctxt "BUTTON"
msgid "Search"
-msgstr ""
+msgstr "Klask"
#. TRANS: Definition list item with instructions on how to get (better) search results.
#: lib/searchaction.php:170
@@ -8433,17 +8624,17 @@ msgid "Moderator"
msgstr "Habasker"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "un nebeud eilennoù zo"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "1 vunutenn zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8451,12 +8642,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "1 eurvezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8464,12 +8655,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "1 devezh zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8477,12 +8668,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "miz zo well-wazh"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8490,7 +8681,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "bloaz zo well-wazh"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index da80e1954..93e150107 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -15,17 +15,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:17:50+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:29+0000\n"
"Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ca\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -93,11 +93,11 @@ msgstr "Desa els paràmetres d'accés"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -353,7 +353,7 @@ msgstr "No s'ha pogut desar el perfil."
#: actions/designadminpanel.php:125 actions/editapplication.php:121
#: actions/newapplication.php:104 actions/newnotice.php:95
#: lib/designsettings.php:298
-#, fuzzy, php-format
+#, php-format
msgid ""
"The server was unable to handle that much POST data (%s byte) due to its "
"current configuration."
@@ -361,7 +361,7 @@ msgid_plural ""
"The server was unable to handle that much POST data (%s bytes) due to its "
"current configuration."
msgstr[0] ""
-"El servidor no ha pogut gestionar tantes dades POST (%s bytes) a causa de la "
+"El servidor no ha pogut gestionar tantes dades POST (%s byte) a causa de la "
"configuració actual."
msgstr[1] ""
"El servidor no ha pogut gestionar tantes dades POST (%s bytes) a causa de la "
@@ -388,20 +388,38 @@ msgstr "No s'han pogut desar els paràmetres de disseny."
msgid "Could not update your design."
msgstr "No s'ha pogut actualitzar el vostre disseny."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
-msgstr ""
+msgstr "Principal"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s línia temporal"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "Subscripcions de %s"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Preferits"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "%s membre/s en el grup"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -451,10 +469,10 @@ msgstr "No hi ha text al missatge!"
#. TRANS: Form validation error displayed when message content is too long.
#. TRANS: %d is the maximum number of characters for a message.
#: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
-#, fuzzy, php-format
+#, php-format
msgid "That's too long. Maximum message size is %d character."
msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] "És massa llarg. La mida màxima del missatge és %d caràcters."
+msgstr[0] "És massa llarg. La mida màxima del missatge és %d caràcter."
msgstr[1] "És massa llarg. La mida màxima del missatge és %d caràcters."
#. TRANS: Client error displayed if a recipient user could not be found (403).
@@ -471,10 +489,9 @@ msgstr ""
#. TRANS: Client error displayed trying to direct message self (403).
#: actions/apidirectmessagenew.php:154
-#, fuzzy
msgid ""
"Do not 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ò."
+msgstr "No us envieu un missatge a un mateix; simplement comentar-vos-ho."
#. TRANS: Client error displayed when requesting a status with a non-existing ID.
#. TRANS: Client error displayed when trying to remove a favourite with an invalid ID.
@@ -529,9 +546,8 @@ msgstr "No podeu deixar de seguir-vos a un mateix."
#. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
#: actions/apifriendshipsexists.php:88
-#, fuzzy
msgid "Two valid IDs or nick names must be supplied."
-msgstr "Cal proporcionar dos identificadors d'usuari o screen_names."
+msgstr "Cal proporcionar dos identificadors o sobrenoms."
#. TRANS: Client error displayed when a source user could not be determined showing friendship.
#: actions/apifriendshipsshow.php:131
@@ -582,7 +598,6 @@ msgstr "La pàgina personal no és un URL vàlid."
#: actions/apigroupcreate.php:191 actions/editgroup.php:204
#: actions/newgroup.php:144 actions/profilesettings.php:256
#: actions/register.php:226
-#, fuzzy
msgid "Full name is too long (maximum 255 characters)."
msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
@@ -597,10 +612,10 @@ msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
#: actions/apigroupcreate.php:201 actions/editapplication.php:201
#: actions/editgroup.php:209 actions/newapplication.php:178
#: actions/newgroup.php:149
-#, fuzzy, php-format
+#, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
-msgstr[0] "La descripció és massa llarga (màx. %d caràcters)."
+msgstr[0] "La descripció és massa llarga (màx. %d caràcter)."
msgstr[1] "La descripció és massa llarga (màx. %d caràcters)."
#. TRANS: Client error shown when providing too long a location during group creation.
@@ -621,11 +636,11 @@ msgstr "La localització és massa llarga (màx. 255 caràcters)."
#. TRANS: %d is the maximum number of allowed aliases.
#: actions/apigroupcreate.php:236 actions/editgroup.php:229
#: actions/newgroup.php:169
-#, fuzzy, php-format
+#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
-msgstr[0] "Hi ha massa àlies! Màxim %d."
-msgstr[1] "Hi ha massa àlies! Màxim %d."
+msgstr[0] "Hi ha massa àlies! Es permet %d com a màxim."
+msgstr[1] "Hi ha massa àlies! Es permeten %d com a màxim."
#. TRANS: Client error shown when providing an invalid alias during group creation.
#. TRANS: %s is the invalid alias.
@@ -717,7 +732,7 @@ msgstr "%1$s grups dels que %2$s és membre."
#: actions/apigrouplistall.php:88 actions/usergroups.php:63
#, php-format
msgid "%s groups"
-msgstr "%s grups"
+msgstr "Grups de %s"
#. TRANS: Message is used as a subtitle when listing the lastest 20 groups. %s is a site name.
#: actions/apigrouplistall.php:93
@@ -732,9 +747,8 @@ msgstr "La pujada ha fallat."
#. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
#: actions/apioauthaccesstoken.php:101
-#, fuzzy
msgid "Invalid request token or verifier."
-msgstr "No s'ha especificat un testimoni d'inici de sessió vàlid."
+msgstr "El testimoni de sol·licitud o verificador no és vàlid."
#. TRANS: Client error given when no oauth_token was passed to the OAuth API.
#: actions/apioauthauthorize.php:107
@@ -743,20 +757,18 @@ msgstr "No s'ha proporcionat cap paràmetre oauth_token."
#. TRANS: Client error given when an invalid request token was passed to the OAuth API.
#: actions/apioauthauthorize.php:115 actions/apioauthauthorize.php:129
-#, fuzzy
msgid "Invalid request token."
-msgstr "El testimoni no és vàlid."
+msgstr "El testimoni de sol·licitud no és vàlid."
#. TRANS: Client error given when an invalid request token was passed to the OAuth API.
#: actions/apioauthauthorize.php:121
-#, fuzzy
msgid "Request token already authorized."
-msgstr "No esteu autoritzat."
+msgstr "El testimoni de sol·licitud ja està autoritzat."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -781,9 +793,8 @@ msgstr "Nom d'usuari / contrasenya no vàlid!"
#. TRANS: Server error displayed when a database action fails.
#: actions/apioauthauthorize.php:217
-#, fuzzy
msgid "Database error inserting oauth_token_association."
-msgstr "Error de la base de dades en inserir l'usuari de l'aplicació OAuth."
+msgstr "Error de la base de dades en inserir l'oauth_token_association."
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
@@ -795,7 +806,7 @@ msgstr "Error de la base de dades en inserir l'usuari de l'aplicació OAuth."
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -815,15 +826,15 @@ msgstr "Permet o denega l'accés"
#. TRANS: User notification of external application requesting account access.
#. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
#: actions/apioauthauthorize.php:425
-#, fuzzy, php-format
+#, php-format
msgid ""
"An application would like the ability to <strong>%3$s</strong> your %4$s "
"account data. You should only give access to your %4$s account to third "
"parties you trust."
msgstr ""
-"L'aplicació <strong>%1$s</strong>, de <strong>%2$s</strong>, voldria obtenir "
-"l'habilitat de <strong>%3$s</strong> les dades del vostre compte %4$s. Només "
-"hauríeu de donar accés al compte %4$s a terceres parts en què confieu."
+"Una aplicació voldria l'habilitat de <strong>%3$s</strong> les dades del "
+"vostre compte %4$s. Només hauríeu de donar accés al compte %4$s a terceres "
+"parts en què confieu."
#. TRANS: User notification of external application requesting account access.
#. TRANS: %1$s is the application name requesting access, %2$s is the organisation behind the application,
@@ -841,7 +852,6 @@ msgstr ""
#. TRANS: Fieldset legend.
#: actions/apioauthauthorize.php:455
-#, fuzzy
msgctxt "LEGEND"
msgid "Account"
msgstr "Compte"
@@ -870,7 +880,7 @@ msgstr "Contrasenya"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -879,7 +889,6 @@ msgstr "Cancel·la"
#. TRANS: Button text that when clicked will allow access to an account by an external application.
#: actions/apioauthauthorize.php:485
-#, fuzzy
msgctxt "BUTTON"
msgid "Allow"
msgstr "Permet"
@@ -897,15 +906,14 @@ msgstr "S'ha cancel·lat l'autorització."
#. TRANS: User notification after revoking OAuth access to an application.
#. TRANS: %s is an OAuth token.
#: actions/apioauthauthorize.php:598
-#, fuzzy, php-format
+#, php-format
msgid "The request token %s has been revoked."
-msgstr "S'ha denegat i revocat el testimoni de sol·licitud %s."
+msgstr "S'ha revocat el testimoni de sol·licitud %s."
#. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
#: actions/apioauthauthorize.php:621
-#, fuzzy
msgid "You have successfully authorized the application"
-msgstr "No esteu autoritzat."
+msgstr "Heu autoritzat l'aplicació amb èxit."
#. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
#: actions/apioauthauthorize.php:625
@@ -913,13 +921,15 @@ msgid ""
"Please return to the application and enter the following security code to "
"complete the process."
msgstr ""
+"Torneu a l'aplicació i introduïu el codi de seguretat següent per completar "
+"el procés."
#. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
#. TRANS: %s is the authorised application name.
#: actions/apioauthauthorize.php:632
-#, fuzzy, php-format
+#, php-format
msgid "You have successfully authorized %s"
-msgstr "No esteu autoritzat."
+msgstr "Heu autoritzat amb èxit %s"
#. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
#. TRANS: %s is the authorised application name.
@@ -929,6 +939,7 @@ msgid ""
"Please return to %s and enter the following security code to complete the "
"process."
msgstr ""
+"Torneu a %s i introduïu el codi de seguretat següent per completar el procés."
#. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
#. TRANS: POST and DELETE should not be translated.
@@ -945,7 +956,8 @@ msgstr "No podeu eliminar l'estat d'un altre usuari."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "No existeix aquest avís."
@@ -961,15 +973,17 @@ msgstr "No podeu repetir els vostres propis avisos."
msgid "Already repeated that notice."
msgstr "Avís duplicat."
-#: actions/apistatusesshow.php:117
-#, fuzzy
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
-msgstr "No s'ha trobat el mètode API!"
+msgstr "El mètode HTTP no està implementat."
#: actions/apistatusesshow.php:141
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported format: %s"
-msgstr "El format no està implementat."
+msgstr "Format no permès: %s"
#. TRANS: Client error displayed requesting a deleted status.
#: actions/apistatusesshow.php:152
@@ -981,19 +995,19 @@ msgstr "S'ha eliminat l'estat."
msgid "No status with that ID found."
msgstr "No s'ha trobat cap estatus amb la ID trobada."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
-msgstr ""
+msgstr "Només es pot eliminar fent servir el format Atom."
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "No es pot eliminar l'avís."
-#: actions/apistatusesshow.php:247
-#, fuzzy, php-format
+#: actions/apistatusesshow.php:243
+#, php-format
msgid "Deleted notice %d"
-msgstr "Elimina l'avís"
+msgstr "S'ha eliminat l'avís %d"
#. TRANS: Client error displayed when the parameter "status" is missing.
#: actions/apistatusesupdate.php:221
@@ -1004,34 +1018,33 @@ msgstr "El client ha de proporcionar un paràmetre 'status' amb un valor."
#. TRANS: %d is the maximum number of character for a notice.
#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
#: lib/mailhandler.php:60
-#, fuzzy, php-format
+#, php-format
msgid "That's too long. Maximum notice size is %d character."
msgid_plural "That's too long. Maximum notice size is %d characters."
-msgstr[0] "Massa llarg. La longitud màxima és de %d caràcters."
-msgstr[1] "Massa llarg. La longitud màxima és de %d caràcters."
+msgstr[0] "És massa llarg. La longitud màxima de l'avís és de %d caràcter."
+msgstr[1] "És massa llarg. La longitud màxima de l'avís és de %d caràcters."
#. TRANS: Client error displayed when replying to a non-existing notice.
#: actions/apistatusesupdate.php:284
-#, fuzzy
msgid "Parent notice not found."
-msgstr "No s'ha trobat el mètode API!"
+msgstr "No s'ha trobat l'avís pare."
#. TRANS: Client error displayed exceeding the maximum notice length.
#. TRANS: %d is the maximum lenth for a notice.
#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
-#, fuzzy, php-format
+#, php-format
msgid "Maximum notice size is %d character, including attachment URL."
msgid_plural "Maximum notice size is %d characters, including attachment URL."
msgstr[0] ""
-"La mida màxima de l'avís és %d caràcters, incloent l'URL de l'adjunt."
+"La mida màxima de l'avís és %d caràcter, incloent l'URL de l'adjunció."
msgstr[1] ""
-"La mida màxima de l'avís és %d caràcters, incloent l'URL de l'adjunt."
+"La mida màxima de l'avís és %d caràcters, incloent l'URL de l'adjunció."
#. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
#. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
#: actions/apisubscriptions.php:228 actions/apisubscriptions.php:258
msgid "Unsupported format."
-msgstr "El format no està implementat."
+msgstr "El format no està permès."
#. TRANS: Title for timeline of most recent favourite notices by a user.
#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
@@ -1044,16 +1057,16 @@ msgstr "%1$s / Preferits de %2$s"
#. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
#. TRANS: %3$s is a user nickname.
#: actions/apitimelinefavorites.php:120
-#, fuzzy, php-format
+#, php-format
msgid "%1$s updates favorited by %2$s / %3$s."
-msgstr "%1$s actualitzacions preferides per %2$s / %2$s."
+msgstr "%1$s actualitzacions preferides per %2$s / %3$s."
#. TRANS: Server error displayed when generating an Atom feed fails.
#. TRANS: %s is the error.
#: actions/apitimelinegroup.php:138
-#, fuzzy, php-format
+#, php-format
msgid "Could not generate feed for group - %s"
-msgstr "No s'ha pogut eliminar el grup %s."
+msgstr "No s'ha pogut generar un canal per al grup - %s."
#. TRANS: Title for timeline of most recent mentions of a user.
#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
@@ -1084,9 +1097,8 @@ msgstr "%s actualitzacions de tothom!"
#. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
#: actions/apitimelineretweetedbyme.php:71
-#, fuzzy
msgid "Unimplemented."
-msgstr "Mètode no implementat"
+msgstr "No implementat."
#. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
#: actions/apitimelineretweetedtome.php:108
@@ -1115,37 +1127,64 @@ msgstr "Avisos etiquetats amb %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualitzacions etiquetades amb %1$s el %2$s!"
-#: actions/apitimelineuser.php:300
-#, fuzzy
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
msgid "Only the user can add to their own timeline."
-msgstr "Només l'usuari pot llegir les seves safates de correu."
+msgstr "Només l'usuari pot afegir a la pròpia línia temporal."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
-msgstr ""
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+#, fuzzy
+msgid "Only accept AtomPub for Atom feeds."
+msgstr "Només accepta AtomPub per als canals Atom."
-#: actions/apitimelineuser.php:316
+#: actions/apitimelineuser.php:310
+#, fuzzy
+msgid "Atom post must not be empty."
+msgstr "L'enviament Atom ha de ser una entrada Atom."
+
+#: actions/apitimelineuser.php:315
+#, fuzzy
+msgid "Atom post must be well-formed XML."
+msgstr "L'enviament Atom ha de ser una entrada Atom."
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
-msgstr ""
+msgstr "L'enviament Atom ha de ser una entrada Atom."
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
-msgstr ""
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+#, fuzzy
+msgid "Can only handle POST activities."
+msgstr "Només es poden gestionar les activitats enviades."
-#: actions/apitimelineuser.php:334
-#, php-format
-msgid "Cannot handle activity object type \"%s\""
-msgstr ""
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
+#, fuzzy, php-format
+msgid "Cannot handle activity object type \"%s\"."
+msgstr "Només es pot gestionar l'activitat dels tipus d'objecte «%s»"
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Cerca el contingut dels avisos"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
+#, php-format
msgid "Notice with URI \"%s\" already exists."
-msgstr "No existeix cap avís amb aquest identificador."
+msgstr "L'avís amb URI «%s» amb ja existeix."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
+msgstr "Enviament AtomPub amb un URI %s d'atenció desconegut"
#. TRANS: Server error for unfinished API method showTrends.
#: actions/apitrends.php:85
@@ -1157,6 +1196,150 @@ msgstr "Mètode API en construcció."
msgid "User not found."
msgstr "No s'ha trobat el mètode API!"
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "No existeix el perfil."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "No s'ha pogut inserir una nova subscripció."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+#, fuzzy
+msgid "Can only handle Favorite activities."
+msgstr "Només es poden gestionar les activitats enviades."
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Només es poden gestionar les activitats enviades."
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Desconegut"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Afegeix als preferits"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "No existeix el perfil."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "%s membre/s en el grup"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "%s grups són membres de"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+#, fuzzy
+msgid "Can only handle Join activities."
+msgstr "Només es poden gestionar les activitats enviades."
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Desconegut"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Tots els membres"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "No existeix el fitxer."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "No s'ha pogut eliminar el preferit."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "No s'ha trobat el grup."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Tots els membres"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "El mètode HTTP no està implementat."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "No existeix el perfil."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "No estàs subscrit a aquest perfil."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "No s'ha pogut eliminar l'autosubscripció."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Gent subscrita a %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+#, fuzzy
+msgid "Can only handle Follow activities."
+msgstr "Només es poden gestionar les activitats enviades."
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Tipus de fitxer desconegut"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1445,8 +1628,8 @@ msgstr "Aquesta adreça ja ha estat confirmada."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1968,12 +2151,12 @@ msgstr "Gestioneu com rebeu correu de %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "Adreça de correu electrònic"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Adreça electrònica confirmada actualment."
@@ -1982,14 +2165,14 @@ msgstr "Adreça electrònica confirmada actualment."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Elimina"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2002,14 +2185,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "Adreça electrònica, com ara «nomusuari@example.org»"
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2017,112 +2200,119 @@ msgstr "Afegeix"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Correu electrònic entrant"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Vull publicar avisos amb el correu electrònic."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Envia correu electrònic a aquesta adreça per publicar nous avisos."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Estableix una nova adreça electrònica d'enviament; cancel·la l'antiga."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Nou"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Preferències del correu electrònic"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Envia'm avisos per correu electrònic quan algú nou se'm subscrigui."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Envia'm un correu electrònic quan algú afegeixi un avís meu com a preferit."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Envia'm un correu electrònic quan algú m'envii un missatge privat."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Envia'm un correu electrònic quan algú m'enviï una resposta amb @."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr ""
"Permetre que els amics em cridin l'atenció i m'enviïn un correu electrònic."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Vull publicar avisos amb el correu electrònic."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Publica una MicroID per al meu correu electrònic."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "S'han desat les preferències del correu electrònic."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "No hi ha cap adreça electrònica."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "No es pot normalitzar l'adreça electrònica."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Adreça de correu electrònic no vàlida."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Ja és la vostra adreça electrònica."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "L'adreça electrònica ja pertany a un altre usuari."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "No s'ha pogut inserir el codi de confirmació."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2134,56 +2324,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Cap confirmació pendent per cancel·lar."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Aquesta l'adreça de correu electrònic incorrecta."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "S'ha cancel·lat la confirmació de correu electrònic."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Aquest no és el teu correu electrònic"
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "S'ha eliminat l'adreça de correu electrònic."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "No hi ha cap direcció de correu electrònic entrant."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "No s'ha pogut actualitzar el registre de l'usuari."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Eliminat el correu electrònic entrant."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Nou correu electrònic entrant afegit."
@@ -2811,24 +3001,21 @@ msgstr "%1$s (%2$s)"
#. TRANS: already uses a this StatusNet site. Plural form is based on the number of
#. TRANS: reported already present people. Followed by a bullet list.
#: actions/invite.php:153
-#, fuzzy
msgid "This person is already a user and you were automatically subscribed:"
msgid_plural ""
"These people are already users and you were automatically subscribed to them:"
-msgstr[0] ""
-"Aquestes persones ja són usuaris i se us ha subscrit automàticament:"
+msgstr[0] "Aquesta persona ja és usuària i us hi heu subscrit automàticament:"
msgstr[1] ""
-"Aquestes persones ja són usuaris i se us ha subscrit automàticament:"
+"Aquestes persones ja són usuàries i us hi heu subscrit automàticament:"
#. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
#. TRANS: based on the number of invitations sent. Followed by a bullet list of
#. TRANS: e-mail addresses to which invitations were sent.
#: actions/invite.php:167
-#, fuzzy
msgid "Invitation sent to the following person:"
msgid_plural "Invitations sent to the following people:"
-msgstr[0] "Invitació(ons) enviada(des) a la següent gent:"
-msgstr[1] "Invitació(ons) enviada(des) a la següent gent:"
+msgstr[0] "Invitació enviada a la persona següent:"
+msgstr[1] "Invitacions enviades a les persones següents:"
#. TRANS: Generic message displayed after sending out one or more invitations to
#. TRANS: people to join a StatusNet site.
@@ -2990,7 +3177,6 @@ msgstr ""
"«Tots els drets reservats»."
#: actions/licenseadminpanel.php:156
-#, fuzzy
msgid "Invalid license title. Maximum length is 255 characters."
msgstr ""
"El títol de la llicència no és vàlid. La longitud màxima és 255 caràcters."
@@ -3156,9 +3342,8 @@ msgstr "No hi ha cap estat actual."
#. TRANS: This is the title of the form for adding a new application.
#: actions/newapplication.php:52
-#, fuzzy
msgid "New application"
-msgstr "Nova Aplicació"
+msgstr "Aplicació nova"
#. TRANS: Client error displayed trying to add a new application while not logged in.
#: actions/newapplication.php:65
@@ -3284,7 +3469,6 @@ msgstr ""
"Les actualitzacions que coincideixen amb el terme de cerca «%1$s» el %2$s!"
#: actions/nudge.php:85
-#, fuzzy
msgid ""
"This user doesn't allow nudges or hasn't confirmed or set their email "
"address yet."
@@ -3328,9 +3512,8 @@ msgstr "Aplicacions connectades"
#. TRANS: Instructions for OAuth connection settings.
#: actions/oauthconnectionssettings.php:83
-#, fuzzy
msgid "The following connections exist for your account."
-msgstr "Heu permès les aplicacions següents accedir al vostre compte."
+msgstr "Les connexions següents existeixen per al vostre compte."
#. TRANS: Client error when trying to revoke access for an application while not being a user of it.
#: actions/oauthconnectionssettings.php:168
@@ -3340,7 +3523,7 @@ msgstr "No sou usuari de l'aplicació."
#. TRANS: Client error when revoking access has failed for some reason.
#. TRANS: %s is the application ID revoking access failed for.
#: actions/oauthconnectionssettings.php:183
-#, fuzzy, php-format
+#, php-format
msgid "Unable to revoke access for application: %s."
msgstr "No s'ha pogut revocar l'accés de l'aplicació: %s"
@@ -3352,6 +3535,8 @@ msgid ""
"You have successfully revoked access for %1$s and the access token starting "
"with %2$s."
msgstr ""
+"Heu revocat amb èxit l'accés de %1$s i el testimoni d'accés que comença amb %"
+"2$s."
#. TRANS: Empty list message when no applications have been authorised yet.
#: actions/oauthconnectionssettings.php:213
@@ -3367,6 +3552,8 @@ msgid ""
"Are you a developer? [Register an OAuth client application](%s) to use with "
"this instance of StatusNet."
msgstr ""
+"Sou un desenvolupador? [Registreu una aplicació de client OAuth](%s) per "
+"utilitzar-la amb una instància de l'StatusNet."
#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
@@ -3441,10 +3628,9 @@ msgstr "Mostra o amaga els dissenys de perfil."
#. TRANS: Form validation error for form "Other settings" in user profile.
#: actions/othersettings.php:162
-#, fuzzy
msgid "URL shortening service is too long (maximum 50 characters)."
msgstr ""
-"El servei d'auto-escurçament d'URL és massa llarga (màx. 50 caràcters)."
+"El servei d'autoescurçament d'URL és massa llarga (màxim 50 caràcters)."
#: actions/otp.php:69
msgid "No user ID specified."
@@ -3610,20 +3796,17 @@ msgid "Path"
msgstr "Camí"
#: actions/pathsadminpanel.php:249
-#, fuzzy
msgid "Site path."
-msgstr "Camí del lloc"
+msgstr "Camí del lloc."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:255
-#, fuzzy
msgid "Locale directory"
-msgstr "Directori de temes"
+msgstr "Directori de les traduccions"
#: actions/pathsadminpanel.php:256
-#, fuzzy
msgid "Directory path to locales."
-msgstr "El camí del directori a les traduccions"
+msgstr "Camí del directori a les traduccions."
#. TRANS: Checkbox label in Paths admin panel.
#: actions/pathsadminpanel.php:263
@@ -3640,14 +3823,13 @@ msgstr "Tema"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:281
-#, fuzzy
msgid "Server for themes."
-msgstr "Servidor de temes"
+msgstr "Servidor de temes."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:290
msgid "Web path to themes."
-msgstr ""
+msgstr "Camí web dels temes."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
@@ -3658,7 +3840,7 @@ msgstr "Servidor SSL"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:299
msgid "SSL server for themes (default: SSL server)."
-msgstr ""
+msgstr "Servidor SSL dels temes (per defecte: servidor SSL)."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
@@ -3669,7 +3851,7 @@ msgstr "Camí SSL"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:308
msgid "SSL path to themes (default: /theme/)."
-msgstr ""
+msgstr "Camí SSL als temes (per defecte: /theme/)."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
@@ -3679,9 +3861,8 @@ msgstr "Directori"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:317
-#, fuzzy
msgid "Directory where themes are located."
-msgstr "El camí del directori a les traduccions"
+msgstr "Directori on es troben els temes."
#. TRANS: Fieldset legend in Paths admin panel.
#: actions/pathsadminpanel.php:326
@@ -3695,9 +3876,8 @@ msgstr "Servidor d'avatars"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:335
-#, fuzzy
msgid "Server for avatars."
-msgstr "Servidor de temes"
+msgstr "Servidor d'avatars."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:342
@@ -3706,9 +3886,8 @@ msgstr "Camí de l'avatar"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:344
-#, fuzzy
msgid "Web path to avatars."
-msgstr "Error en actualitzar avatar."
+msgstr "Camí web dels avatars."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:351
@@ -3717,9 +3896,8 @@ msgstr "Directori d'avatars"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:353
-#, fuzzy
msgid "Directory where avatars are located."
-msgstr "El camí del directori a les traduccions"
+msgstr "Directori on es troben els avatars."
#. TRANS: Fieldset legend in Paths admin panel.
#: actions/pathsadminpanel.php:364
@@ -3728,30 +3906,28 @@ msgstr "Fons"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:372
-#, fuzzy
msgid "Server for backgrounds."
-msgstr "Servidor de temes"
+msgstr "Servidor de fons."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:381
msgid "Web path to backgrounds."
-msgstr ""
+msgstr "Camí web de fons."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:390
msgid "Server for backgrounds on SSL pages."
-msgstr ""
+msgstr "Servidor de fons a pàgines SSL."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:399
msgid "Web path to backgrounds on SSL pages."
-msgstr ""
+msgstr "Camí web de fons a pàgines SSL."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:408
-#, fuzzy
msgid "Directory where backgrounds are located."
-msgstr "El camí del directori a les traduccions"
+msgstr "Directori on es troben els fons."
#. TRANS: Fieldset legens in Paths admin panel.
#. TRANS: DT element label in attachment list.
@@ -3761,32 +3937,28 @@ msgstr "Adjuncions"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:427
-#, fuzzy
msgid "Server for attachments."
-msgstr "Servidor de temes"
+msgstr "Servidor d'adjuncions."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:436
-#, fuzzy
msgid "Web path to attachments."
-msgstr "Cap adjunció."
+msgstr "Camí web de les adjuncions."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:445
-#, fuzzy
msgid "Server for attachments on SSL pages."
-msgstr "Servidor de temes"
+msgstr "Servidor d'adjuncions a les pàgines SSL."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:454
msgid "Web path to attachments on SSL pages."
-msgstr ""
+msgstr "Camí web de les adjuncions a les pàgines SSL."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:463
-#, fuzzy
msgid "Directory where attachments are located."
-msgstr "El camí del directori a les traduccions"
+msgstr "Directori on es troben les adjuncions."
#. TRANS: Fieldset legend in Paths admin panel.
#: actions/pathsadminpanel.php:472
@@ -3814,15 +3986,13 @@ msgstr "Utilitza l'SSL"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:487
-#, fuzzy
msgid "When to use SSL."
-msgstr "Quan utilitzar l'SSL"
+msgstr "Quan utilitzar l'SSL."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:497
-#, fuzzy
msgid "Server to direct SSL requests to."
-msgstr "Servidor on dirigir les sol·licituds SSL"
+msgstr "Servidor on dirigir les sol·licituds SSL."
#. TRANS: Button title text to store form data in the Paths admin panel.
#: actions/pathsadminpanel.php:514
@@ -3883,10 +4053,9 @@ msgstr "Informació del perfil"
#. TRANS: Tooltip for field label in form for profile settings.
#: actions/profilesettings.php:113
-#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr ""
-"1-64 lletres en minúscula o números, sense signes de puntuació o espais"
+"1-64 lletres en minúscula o nombres, sense signes de puntuació o espais."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
@@ -3905,18 +4074,17 @@ msgstr "Pàgina personal"
#. TRANS: Tooltip for field label in form for profile settings.
#: actions/profilesettings.php:125
-#, fuzzy
msgid "URL of your homepage, blog, or profile on another site."
-msgstr "URL del teu web, blog o perfil en un altre lloc"
+msgstr "URL del vostre web, blog o perfil en un altre lloc."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
#: actions/profilesettings.php:133 actions/register.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
-msgstr[0] "Descriviu qui sou i els vostres interessos en %d caràcters"
+msgstr[0] "Descriviu qui sou i els vostres interessos en %d caràcter"
msgstr[1] "Descriviu qui sou i els vostres interessos en %d caràcters"
#. TRANS: Tooltip for field label in form for profile settings.
@@ -3996,10 +4164,10 @@ msgstr ""
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
#: actions/profilesettings.php:262 actions/register.php:229
-#, fuzzy, php-format
+#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
-msgstr[0] "La biografia és massa llarga (màx. %d caràcters)."
+msgstr[0] "La biografia és massa llarga (màx. %d caràcter)."
msgstr[1] "La biografia és massa llarga (màx. %d caràcters)."
#. TRANS: Validation error in form for profile settings.
@@ -4009,9 +4177,8 @@ msgstr "No s'ha seleccionat el fus horari."
#. TRANS: Validation error in form for profile settings.
#: actions/profilesettings.php:281
-#, fuzzy
msgid "Language is too long (maximum 50 characters)."
-msgstr "La llengua és massa llarga (màx. 50 caràcters)."
+msgstr "La llengua és massa llarga (màxim 50 caràcters)."
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
@@ -4129,9 +4296,9 @@ msgstr "Núvol públic d'etiquetes"
#. TRANS: Instructions (more used like an explanation/header).
#. TRANS: %s is the StatusNet sitename.
#: actions/publictagcloud.php:65
-#, fuzzy, php-format
+#, php-format
msgid "These are most popular recent tags on %s"
-msgstr "Aquestes són les etiquetes recents més populars a %s "
+msgstr "Aquestes són les etiquetes recents més populars a %s"
#. TRANS: This message contains a Markdown URL. The link description is between
#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
@@ -4278,7 +4445,6 @@ msgid "Unexpected password reset."
msgstr "Restabliment de contrasenya inesperat."
#: actions/recoverpassword.php:365
-#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "La contrasenya ha de tenir 6 o més caràcters."
@@ -4940,16 +5106,16 @@ msgstr "S'ha eliminat l'avís."
#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
#: actions/showstream.php:70
-#, fuzzy, php-format
+#, php-format
msgid "%1$s tagged %2$s"
-msgstr "%1$s, pàgina %2$d"
+msgstr "%1$s etiquetats %2$s"
#. TRANS: Page title showing tagged notices in one user's stream.
#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
#: actions/showstream.php:74
-#, fuzzy, php-format
+#, php-format
msgid "%1$s tagged %2$s, page %3$d"
-msgstr "Avisos etiquetats amb %1$s, pàgina %2$d"
+msgstr "%1$s etiquetats %2$s, pàgina %3$d"
#. TRANS: Extended page title showing tagged notices in one user's stream.
#. TRANS: %1$s is the username, %2$d is the page number.
@@ -4993,10 +5159,10 @@ msgstr "FOAF de %s"
#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
#: actions/showstream.php:211
-#, fuzzy, php-format
+#, php-format
msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
msgstr ""
-"Aquesta és la línia temporal de %1$s, però %2$s no hi ha enviat res encara."
+"Aquesta és la línia temporal de %1$s, però %1$s no hi ha enviat encara res."
#. TRANS: Second sentence of empty list message for a stream for the user themselves.
#: actions/showstream.php:217
@@ -5166,39 +5332,37 @@ msgstr ""
#. TRANS: Page title for site-wide notice tab in admin panel.
#: actions/sitenoticeadminpanel.php:55
msgid "Site Notice"
-msgstr "Avís del lloc"
+msgstr "Avís per a tot el lloc"
#. TRANS: Instructions for site-wide notice tab in admin panel.
#: actions/sitenoticeadminpanel.php:66
msgid "Edit site-wide message"
-msgstr "Edita el missatge de tot el lloc"
+msgstr "Edita el missatge per a tot el lloc"
#. TRANS: Server error displayed when saving a site-wide notice was impossible.
#: actions/sitenoticeadminpanel.php:101
msgid "Unable to save site notice."
-msgstr "No s'ha pogut desar l'avís del lloc."
+msgstr "No s'ha pogut desar l'avís per a tot el lloc."
#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
#: actions/sitenoticeadminpanel.php:112
-#, fuzzy
msgid "Maximum length for the site-wide notice is 255 characters."
-msgstr "La mida màxima per als avisos de tot el lloc és de 255 caràcters."
+msgstr "La mida màxima per als avisos per a tot el lloc és de 255 caràcters."
#. TRANS: Label for site-wide notice text field in admin panel.
#: actions/sitenoticeadminpanel.php:176
msgid "Site notice text"
-msgstr "Text de l'avís del lloc"
+msgstr "Text d'avís per a tot el lloc"
#. TRANS: Tooltip for site-wide notice text field in admin panel.
#: actions/sitenoticeadminpanel.php:179
-#, fuzzy
msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
-msgstr "Text d'avís de tot el lloc (màxim 255 caràcters, es permet l'HTML)"
+msgstr "Text d'avís per a tot el lloc (màxim 255 caràcters; es permet l'HTML)"
#. TRANS: Title for button to save site notice in admin panel.
#: actions/sitenoticeadminpanel.php:201
msgid "Save site notice"
-msgstr "Desa l'avís del lloc"
+msgstr "Desa l'avís per a tot el lloc"
#. TRANS: Title for SMS settings.
#: actions/smssettings.php:59
@@ -5422,7 +5586,7 @@ msgstr "No estàs subscrit a aquest perfil."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "No s'ha pogut guardar la subscripció."
@@ -5430,10 +5594,6 @@ msgstr "No s'ha pogut guardar la subscripció."
msgid "This action only accepts POST requests."
msgstr "Aquesta acció només accepta sol·licituds POST."
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "No existeix el perfil."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr "No podeu subscriure-us a un perfil remot OMB 0.1 amb aquesta acció."
@@ -5447,7 +5607,7 @@ msgstr "Subscrit"
#: actions/subscribers.php:51
#, php-format
msgid "%s subscribers"
-msgstr "%s subscriptors"
+msgstr "Subscriptors de %s"
#. TRANS: Header for list of subscribers for a user (not first page).
#. TRANS: %1$s is the user's nickname, $2$d is the page number.
@@ -5460,7 +5620,7 @@ msgstr "%1$s subscriptors, pàgina %2$d"
#. TRANS: of the logged in user's own profile.
#: actions/subscribers.php:68
msgid "These are the people who listen to your notices."
-msgstr "Aquestes són les persones que escolten els teus avisos."
+msgstr "Aquestes són les persones que escolten els vostres avisos."
#. TRANS: Page notice for page with an overview of all subscribers of a user other
#. TRANS: than the logged in user. %s is the user nickname.
@@ -5471,13 +5631,12 @@ msgstr "Aquestes són les persones que escolten els avisos de %s."
#. TRANS: Subscriber list text when the logged in user has no subscribers.
#: actions/subscribers.php:116
-#, fuzzy
msgid ""
"You have no subscribers. Try subscribing to people you know and they might "
"return the favor."
msgstr ""
"No teniu cap subscriptor. Proveu de subscriure-us a gent que coneixeu i ells "
-"podrien tornar-vos així el favor"
+"podrien tornar-vos així el favor."
#. TRANS: Subscriber list text when looking at the subscribers for a of a user other
#. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
@@ -5500,13 +5659,6 @@ msgstr ""
"%s no té subscriptors. Per què no us [registreu](%%%%action.register%%%%) i "
"en sou el primer?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "%s subscripcions"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5518,7 +5670,7 @@ msgstr "%1$s subscripcions, pàgina %2$d"
#. TRANS: of the logged in user's own profile.
#: actions/subscriptions.php:68
msgid "These are the people whose notices you listen to."
-msgstr "Aquestes són les persones que escoltes."
+msgstr "Aquestes són les persones que escolteu."
#. TRANS: Page notice for page with an overview of all subscriptions of a user other
#. TRANS: than the logged in user. %s is the user nickname.
@@ -5556,13 +5708,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s no escolta a ningú."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Canal d'avisos de %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5683,7 +5840,6 @@ msgstr "El límit de la biografia no és vàlid. Cal que sigui numèric."
#. TRANS: Form validation error in user admin panel when welcome text is too long.
#: actions/useradminpanel.php:154
-#, fuzzy
msgid "Invalid welcome text. Maximum length is 255 characters."
msgstr ""
"El text de benvinguda no és vàlid. La longitud màxima és de 255 caràcters."
@@ -5691,7 +5847,7 @@ msgstr ""
#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
#. TRANS: users in user admin panel. %1$s is the invalid nickname.
#: actions/useradminpanel.php:166
-#, fuzzy, php-format
+#, php-format
msgid "Invalid default subscripton: '%1$s' is not a user."
msgstr "La subscripció per defecte no és vàlida: «%1$s» no és cap usuari."
@@ -5723,9 +5879,8 @@ msgstr "Benvinguda als usuaris nous"
#. TRANS: Tooltip in user admin panel for setting new user welcome text.
#: actions/useradminpanel.php:238
-#, fuzzy
msgid "Welcome text for new users (maximum 255 characters)."
-msgstr "Text de benvinguda per a nous usuaris (màx. 255 caràcters)."
+msgstr "Text de benvinguda per a nous usuaris (màxim 255 caràcters)."
#. TRANS: Field label in user admin panel for setting default subscription for new users.
#: actions/useradminpanel.php:244
@@ -5975,13 +6130,13 @@ msgid "Author(s)"
msgstr "Autoria"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Preferit"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%1$s ha marcat l'avís %2$s com a preferit"
@@ -6001,7 +6156,7 @@ msgstr "El Robin pensa que quelcom és impossible."
#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
#. TRANS: %1$s is used for plural.
#: classes/File.php:204
-#, fuzzy, php-format
+#, php-format
msgid ""
"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
"Try to upload a smaller version."
@@ -6009,8 +6164,8 @@ msgid_plural ""
"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
"Try to upload a smaller version."
msgstr[0] ""
-"Cap fitxer pot ser major de %1$d bytes i el fitxer que heu enviat era de %2"
-"$d bytes. Proveu de pujar una versió de mida menor."
+"Cap fitxer pot ser major de %1$d byte i el fitxer que heu enviat era de %2$d "
+"bytes. Proveu de pujar una versió de mida menor."
msgstr[1] ""
"Cap fitxer pot ser major de %1$d bytes i el fitxer que heu enviat era de %2"
"$d bytes. Proveu de pujar una versió de mida menor."
@@ -6018,22 +6173,22 @@ msgstr[1] ""
#. TRANS: Message given if an upload would exceed user quota.
#. TRANS: %d (number) is the user quota in bytes and is used for plural.
#: classes/File.php:217
-#, fuzzy, php-format
+#, php-format
msgid "A file this large would exceed your user quota of %d byte."
msgid_plural "A file this large would exceed your user quota of %d bytes."
msgstr[0] ""
-"Un fitxer d'aquesta mida excediria la vostra quota d'usuari de %d bytes."
+"Un fitxer d'aquesta mida excediria la vostra quota d'usuari de %d byte."
msgstr[1] ""
"Un fitxer d'aquesta mida excediria la vostra quota d'usuari de %d bytes."
#. TRANS: Message given id an upload would exceed a user's monthly quota.
#. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
#: classes/File.php:229
-#, fuzzy, php-format
+#, php-format
msgid "A file this large would exceed your monthly quota of %d byte."
msgid_plural "A file this large would exceed your monthly quota of %d bytes."
msgstr[0] ""
-"Un fitxer d'aquesta mida excediria la vostra quota mensual de %d bytes."
+"Un fitxer d'aquesta mida excediria la vostra quota mensual de %d byte."
msgstr[1] ""
"Un fitxer d'aquesta mida excediria la vostra quota mensual de %d bytes."
@@ -6043,42 +6198,42 @@ msgid "Invalid filename."
msgstr "El nom del fitxer no és vàlid."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "No s'ha pogut unir al grup."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "No s'és part del grup."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "La sortida del grup ha fallat."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr "L'identificador del perfil %s no és vàlid."
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
-#, fuzzy, php-format
+#: classes/Group_member.php:98
+#, php-format
msgid "Group ID %s is invalid."
-msgstr "S'ha produït un error en desar l'usuari; no és vàlid."
+msgstr "L'identificador del grup %s no és vàlid."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Inici de sessió"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr "%1$s s'ha unit al grup %2$s."
@@ -6106,12 +6261,12 @@ msgid "You are banned from sending direct messages."
msgstr "Se us ha bandejat enviar missatges directes."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "No s'ha pogut inserir el missatge."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "No s'ha pogut inserir el missatge amb la nova URI."
@@ -6131,24 +6286,24 @@ msgstr ""
"coixinet (%): %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "S'ha produït un problema en desar l'avís. És massa llarg."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "S'ha produït un problema en desar l'avís. Usuari desconegut."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Massa avisos massa ràpid; pren un respir i publica de nou en uns minuts."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6157,58 +6312,57 @@ msgstr ""
"enviar en uns minuts."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Ha estat bandejat de publicar avisos en aquest lloc."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "S'ha produït un problema en desar l'avís."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
-#, fuzzy
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
-msgstr "S'ha proporcionat un tipus incorrecte per a saveKnownGroups"
+msgstr "S'ha proporcionat un tipus incorrecte per a saveKnownGroups."
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "S'ha produït un problema en desar la safata d'entrada del grup."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "No s'ha pogut desar la resposta de %1$d, %2$d."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
#. TRANS: Full name of a profile or group followed by nickname in parens
#: classes/Profile.php:172 classes/User_group.php:247
-#, fuzzy, php-format
+#, php-format
msgctxt "FANCYNAME"
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr "No es pot revocar el rol «%1$s» de l'usuari #%2$d; no existeix."
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6226,48 +6380,48 @@ msgid "Unable to save tag."
msgstr "No s'ha pogut desar l'etiqueta."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "Se us ha banejat la subscripció."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Ja hi esteu subscrit!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "Un usuari t'ha bloquejat."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "No hi esteu subscrit!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "No s'ha pogut eliminar l'autosubscripció."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "No s'ha pogut eliminar el testimoni OMB de la subscripció."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "No s'ha pogut eliminar la subscripció."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr "Segueix"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s ara està seguint %2$s."
@@ -6287,7 +6441,7 @@ msgstr "No s'ha definit cap usuari únic per al mode d'usuari únic."
#. TRANS: Server exception.
#: classes/User.php:927
msgid "Single-user mode code called when not enabled."
-msgstr ""
+msgstr "S'ha cridat el codi del mode d'únic usuari quan no està habilitat."
#. TRANS: Server exception thrown when creating a group failed.
#: classes/User_group.php:511
@@ -6641,12 +6795,17 @@ msgid "Before"
msgstr "Anteriors"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
"S'esperava un element del canal arrel, però se n'ha obtingut tot un document "
"XML sencer."
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Foto"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -6781,27 +6940,26 @@ msgstr "No se us ha pogut autenticar."
#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
#: lib/apioauthstore.php:45
-#, fuzzy
msgid "Could not create anonymous consumer."
-msgstr "No s'han pogut crear els àlies."
+msgstr "No s'ha pogut crear un consumidor anònim."
#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
#: lib/apioauthstore.php:69
-#, fuzzy
msgid "Could not create anonymous OAuth application."
-msgstr "No s'ha pogut crear l'aplicació."
+msgstr "No s'ha pogut crear l'aplicació OAuth anònima."
#. TRANS: Exception thrown when no token association could be found.
#: lib/apioauthstore.php:151
msgid ""
"Could not find a profile and application associated with the request token."
msgstr ""
+"No s'ha pogut trobar un perfil i una aplicació associada amb el testimoni "
+"sol·licitat."
#. TRANS: Exception thrown when no access token can be issued.
#: lib/apioauthstore.php:186
-#, fuzzy
msgid "Could not issue access token."
-msgstr "No s'ha pogut inserir el missatge."
+msgstr "No s'ha pogut emetre un testimoni d'accés."
#. TRANS: Server error displayed when a database error occurs.
#: lib/apioauthstore.php:243
@@ -6826,10 +6984,10 @@ msgstr "Icona de l'aplicació"
#. TRANS: Form input field instructions.
#. TRANS: %d is the number of available characters for the description.
#: lib/applicationeditform.php:201
-#, fuzzy, php-format
+#, php-format
msgid "Describe your application in %d character"
msgid_plural "Describe your application in %d characters"
-msgstr[0] "Descriviu la vostra aplicació en %d caràcters"
+msgstr[0] "Descriviu la vostra aplicació en %d caràcter"
msgstr[1] "Descriviu la vostra aplicació en %d caràcters"
#. TRANS: Form input field instructions.
@@ -6900,7 +7058,7 @@ msgstr "Cancel·la"
#: lib/applicationlist.php:247
msgid " by "
-msgstr ""
+msgstr " per "
#. TRANS: Application access type
#: lib/applicationlist.php:260
@@ -6923,7 +7081,7 @@ msgstr "Aprovat: %1$s - accés «%2$s»."
#: lib/applicationlist.php:282
#, php-format
msgid "Access token starting with: %s"
-msgstr ""
+msgstr "Testimoni d'accés que comença amb: %s"
#. TRANS: Button label
#: lib/applicationlist.php:298
@@ -6957,15 +7115,13 @@ msgstr "Etiquetes de l'adjunció"
#. TRANS: Exception thrown when a password change fails.
#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
-#, fuzzy
msgid "Password changing failed."
-msgstr "El canvi de contrasenya ha fallat"
+msgstr "El canvi de contrasenya ha fallat."
#. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
#: lib/authenticationplugin.php:238
-#, fuzzy
msgid "Password changing is not allowed."
-msgstr "No es permet el canvi de contrasenya"
+msgstr "No es permet el canvi de contrasenya."
#. TRANS: Title for the form to block a user.
#: lib/blockform.php:68
@@ -6979,9 +7135,8 @@ msgstr "Resultats de les comandes"
#. TRANS: Title for command results.
#: lib/channel.php:194
-#, fuzzy
msgid "AJAX error"
-msgstr "Ajax Error"
+msgstr "Error de l'AJAX"
#. TRANS: E-mail subject when a command has completed.
#: lib/channel.php:233 lib/mailhandler.php:143
@@ -7072,7 +7227,7 @@ msgstr "%1$s ha deixat el grup %2$s."
#. TRANS: Whois output.
#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
#: lib/command.php:426
-#, fuzzy, php-format
+#, php-format
msgctxt "WHOIS"
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -7119,11 +7274,11 @@ msgstr ""
#. TRANS: Message given if content is too long. %1$sd is used for plural.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:488
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d character, you sent %2$d."
msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr[0] ""
-"El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d."
+"El missatge és massa llarg - el màxim és %1$d caràcter, i n'heu enviat %2$d."
msgstr[1] ""
"El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d."
@@ -7147,11 +7302,11 @@ msgstr "S'ha produït un error en repetir l'avís."
#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:591
-#, fuzzy, php-format
+#, php-format
msgid "Notice too long - maximum is %1$d character, you sent %2$d."
msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
msgstr[0] ""
-"L'avís és massa llarg - el màxim és %1$d caràcters, n'heu enviat %2$d."
+"L'avís és massa llarg - el màxim és %1$d caràcter, n'heu enviat %2$d."
msgstr[1] ""
"L'avís és massa llarg - el màxim és %1$d caràcters, n'heu enviat %2$d."
@@ -7371,14 +7526,12 @@ msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#: lib/common.php:147
-#, fuzzy
msgid "No configuration file found."
msgstr "No s'ha trobat cap fitxer de configuració. "
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
#: lib/common.php:150
-#, fuzzy
msgid "I looked for configuration files in the following places:"
msgstr "S'han cercat fitxers de configuracions en els llocs següents: "
@@ -7395,7 +7548,6 @@ msgstr "Vés a l'instal·lador."
#. TRANS: Menu item for Instant Messaging settings.
#: lib/connectsettingsaction.php:106
-#, fuzzy
msgctxt "MENU"
msgid "IM"
msgstr "MI"
@@ -7407,7 +7559,6 @@ msgstr "Actualitzacions per missatgeria instantània (MI)"
#. TRANS: Menu item for Short Message Service settings.
#: lib/connectsettingsaction.php:113
-#, fuzzy
msgctxt "MENU"
msgid "SMS"
msgstr "SMS"
@@ -7419,7 +7570,6 @@ msgstr "Actualitzacions per SMS"
#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
-#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Connexions"
@@ -7449,21 +7599,18 @@ msgstr ""
#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
#: lib/designsettings.php:139
-#, fuzzy
msgctxt "RADIO"
msgid "On"
msgstr "Activada"
#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
#: lib/designsettings.php:156
-#, fuzzy
msgctxt "RADIO"
msgid "Off"
msgstr "Desactivada"
#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
#: lib/designsettings.php:264
-#, fuzzy
msgctxt "BUTTON"
msgid "Reset"
msgstr "Reinicialitza"
@@ -7537,30 +7684,28 @@ msgstr ""
"1-64 lletres en minúscula o números, sense signes de puntuació o espais"
#: lib/groupeditform.php:163
-#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
-msgstr "URL del teu web, blog del grup o de la temàtica"
+msgstr "URL de la pàgina o blog del grup o de la temàtica."
#: lib/groupeditform.php:168
msgid "Describe the group or topic"
msgstr "Descriviu el grup o la temàtica"
#: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
msgid "Describe the group or topic in %d character or less"
msgid_plural "Describe the group or topic in %d characters or less"
-msgstr[0] "Descriviu el grup o la temàtica en %d caràcters"
+msgstr[0] "Descriviu el grup o la temàtica en %d caràcter"
msgstr[1] "Descriviu el grup o la temàtica en %d caràcters"
#: lib/groupeditform.php:182
-#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
-"Ubicació del grup, si s'hi adiu cap, com ara «ciutat, comarca (o illa), país»"
+"Ubicació del grup, si s'hi adiu cap, com ara «ciutat, comarca (o illa), país»."
#: lib/groupeditform.php:190
-#, fuzzy, php-format
+#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
"alias allowed."
@@ -7568,9 +7713,11 @@ msgid_plural ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
"aliases allowed."
msgstr[0] ""
-"Sobrenoms addicionals del grup, separats amb comes o espais, màx. %d"
+"Sobrenoms addicionals del grup, separats amb comes o espais. Es permet un "
+"màxim de %d àlies."
msgstr[1] ""
-"Sobrenoms addicionals del grup, separats amb comes o espais, màx. %d"
+"Sobrenoms addicionals del grup, separats amb comes o espais. Es permet un "
+"màxim de %d àlies."
#. TRANS: Menu item in the group navigation page.
#: lib/groupnav.php:86
@@ -7700,19 +7847,19 @@ msgstr "Tipus de fitxer desconegut"
#. TRANS: Number of megabytes. %d is the number.
#: lib/imagefile.php:283
-#, fuzzy, php-format
+#, php-format
msgid "%dMB"
msgid_plural "%dMB"
-msgstr[0] "MB"
-msgstr[1] "MB"
+msgstr[0] "%dMB"
+msgstr[1] "%dMB"
#. TRANS: Number of kilobytes. %d is the number.
#: lib/imagefile.php:287
-#, fuzzy, php-format
+#, php-format
msgid "%dkB"
msgid_plural "%dkB"
-msgstr[0] "kB"
-msgstr[1] "kB"
+msgstr[0] "%dkB"
+msgstr[1] "%dkB"
#. TRANS: Number of bytes. %d is the number.
#: lib/imagefile.php:290
@@ -7753,7 +7900,7 @@ msgstr "Confirmació de l'adreça de correu electrònic"
#. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
#. TRANS: %3$s is the URL to confirm at.
#: lib/mail.php:179
-#, fuzzy, php-format
+#, php-format
msgid ""
"Hey, %1$s.\n"
"\n"
@@ -7768,19 +7915,19 @@ msgid ""
"Thanks for your time, \n"
"%2$s\n"
msgstr ""
-"Hola, %s.\n"
+"Hola, %1$s.\n"
"\n"
-"Algú ha introduït aquesta adreça electrònica a %s.\n"
+"Algú ha introduït aquesta adreça electrònica a %2$s.\n"
"\n"
"Si sou qui ho ha fet i voleu confirmar-hi la vostra entrada, feu servir "
"l'URL a continuació:\n"
"\n"
-"\t%s\n"
+"\t%3$s\n"
"\n"
-"Si nou, simplement ignoreu el missatge.\n"
+"Si no, simplement ignoreu el missatge.\n"
"\n"
"Gràcies pel vostre temps, \n"
-"%s\n"
+"%2$s"
#. TRANS: Subject of new-subscriber notification e-mail.
#. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
@@ -7807,7 +7954,7 @@ msgstr ""
#. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
#. TRANS: %7$s is a link to the addressed user's e-mail settings.
#: lib/mail.php:263
-#, fuzzy, php-format
+#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
"\n"
@@ -7826,10 +7973,10 @@ msgstr ""
"\n"
"%4$s%5$s%6$s\n"
"Atentament,\n"
-"%7$s.\n"
+"%2$s.\n"
"\n"
"----\n"
-"Canvieu la vostra adreça electrònica o les opcions d'avís a %8$s\n"
+"Canvieu la vostra adreça electrònica o les opcions d'avís a %7$s\n"
#. TRANS: Profile info line in new-subscriber notification e-mail.
#. TRANS: %s is biographical information.
@@ -7849,7 +7996,7 @@ msgstr "Nou correu electrònic per publicar a %s"
#. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
#. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
#: lib/mail.php:321
-#, fuzzy, php-format
+#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
"\n"
@@ -7867,7 +8014,7 @@ msgstr ""
"Més instruccions per al correu electrònic a %3$s.\n"
"\n"
"Atentament,\n"
-"%4$s"
+"%1$s"
#. TRANS: Subject line for SMS-by-email notification messages.
#. TRANS: %s is the posting user's nickname.
@@ -7971,9 +8118,9 @@ msgstr ""
#. TRANS: Subject for favorite notification e-mail.
#. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
#: lib/mail.php:607
-#, fuzzy, php-format
+#, php-format
msgid "%1$s (@%2$s) added your notice as a favorite"
-msgstr "%s (@%s) ha afegit el vostre avís com a preferit"
+msgstr "%1$s (@%2$s) ha afegit el vostre avís com a preferit"
#. TRANS: Body for favorite notification e-mail.
#. TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
@@ -8032,9 +8179,9 @@ msgstr ""
#. TRANS: E-mail subject for notice notification.
#. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
#: lib/mail.php:680
-#, fuzzy, php-format
+#, php-format
msgid "%1$s (@%2$s) sent a notice to your attention"
-msgstr "%s (@%s) us ha enviat un avís a la vostra atenció"
+msgstr "%1$s (@%2$s) us ha enviat un avís a la vostra atenció"
#. TRANS: Body of @-reply notification e-mail.
#. TRANS: %1$s is the sending user's long name, $2$s is the StatusNet sitename,
@@ -8215,15 +8362,13 @@ msgstr "Envia un avís directe"
#. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
#: lib/messageform.php:137
-#, fuzzy
msgid "Select recipient:"
-msgstr "Seleccioneu la llicència"
+msgstr "Seleccioneu el destinatari"
#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
#: lib/messageform.php:150
-#, fuzzy
msgid "No mutual subscribers."
-msgstr "No hi esteu subscrit!"
+msgstr "No teniu subscriptors mutus."
#: lib/messageform.php:153
msgid "To"
@@ -8239,24 +8384,24 @@ msgid "Send"
msgstr "Envia"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"El sobrenom ha de tenir només lletres minúscules i números i no pot tenir "
"espais."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
-msgstr ""
+msgstr "El sobrenom no pot estar en blanc."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "El sobrenom no pot contenir més de %d caràcter."
+msgstr[1] "El sobrenom no pot contenir més de %d caràcters."
#: lib/noticeform.php:160
msgid "Send a notice"
@@ -8494,10 +8639,9 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Revoca el rol «%s» de l'usuari"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
-#, fuzzy
+#: lib/router.php:957
msgid "Page not found."
-msgstr "No s'ha trobat el mètode API!"
+msgstr "No s'ha trobat la pàgina."
#: lib/sandboxform.php:67
msgid "Sandbox"
@@ -8601,9 +8745,8 @@ msgstr "Cap"
#. TRANS: Server exception displayed if a theme name was invalid.
#: lib/theme.php:74
-#, fuzzy
msgid "Invalid theme name."
-msgstr "El nom del fitxer no és vàlid."
+msgstr "El nom del tema no és vàlid."
#: lib/themeuploader.php:50
msgid "This server cannot handle theme uploads without ZIP support."
@@ -8624,12 +8767,12 @@ msgid "Invalid theme: bad directory structure."
msgstr "El tema no és vàlid: l'estructura del directori no és correcta"
#: lib/themeuploader.php:166
-#, fuzzy, php-format
+#, php-format
msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
msgid_plural ""
"Uploaded theme is too large; must be less than %d bytes uncompressed."
msgstr[0] ""
-"El tema pujat és massa gran; ha de tenir menys de %d bytes descomprimit."
+"El tema pujat és massa gran; ha de tenir menys de %d byte descomprimit."
msgstr[1] ""
"El tema pujat és massa gran; ha de tenir menys de %d bytes descomprimit."
@@ -8664,7 +8807,6 @@ msgstr "Qui més publica"
#. TRANS: Title for the form to unblock a user.
#: lib/unblockform.php:67
-#, fuzzy
msgctxt "TITLE"
msgid "Unblock"
msgstr "Desbloca"
@@ -8747,17 +8889,17 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "fa pocs segons"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "fa un minut"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8765,12 +8907,12 @@ msgstr[0] "aproximadament fa un minut"
msgstr[1] "aproximadament fa %d minuts"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "fa una hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8778,12 +8920,12 @@ msgstr[0] "aproximadament fa una hora"
msgstr[1] "aproximadament fa %d hores"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "fa un dia"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8791,12 +8933,12 @@ msgstr[0] "aproximadament fa un dia"
msgstr[1] "aproximadament fa %d dies"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "fa un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8804,7 +8946,7 @@ msgstr[0] "aproximadament fa un mes"
msgstr[1] "aproximadament fa %d mesos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "fa un any"
@@ -8816,7 +8958,7 @@ msgstr "%s no és un color vàlid!"
#. TRANS: Validation error for a web colour.
#. TRANS: %s is the provided (invalid) text for colour.
#: lib/webcolor.php:120
-#, fuzzy, php-format
+#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s no és un color vàlid! Feu servir 3 o 6 caràcters hexadecimals."
@@ -8824,35 +8966,34 @@ msgstr "%s no és un color vàlid! Feu servir 3 o 6 caràcters hexadecimals."
#: lib/xmppmanager.php:287
#, php-format
msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
+msgstr "Usuari desconegut. Aneu a %s per afegir una adreça al vostre compte"
#. TRANS: Response to XMPP source when it sent too long a message.
#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
#: lib/xmppmanager.php:406
-#, fuzzy, php-format
+#, php-format
msgid "Message too long. Maximum is %1$d character, you sent %2$d."
msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
msgstr[0] ""
-"El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d."
+"El missatge és massa llarg - el màxim és %1$d caràcter, i n'heu enviat %2$d."
msgstr[1] ""
"El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d."
#. TRANS: Exception.
#: lib/xrd.php:64
-#, fuzzy
msgid "Invalid XML."
-msgstr "La mida no és vàlida."
+msgstr "L'XML no és vàlid."
#. TRANS: Exception.
#: lib/xrd.php:69
msgid "Invalid XML, missing XRD root."
-msgstr ""
+msgstr "L'XML no és vàlid, hi manca l'arrel XRD."
#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
#: scripts/restoreuser.php:61
#, php-format
msgid "Getting backup from file '%s'."
-msgstr ""
+msgstr "Es recupera la còpia de seguretat del fitxer '%s'."
#. TRANS: Commandline script output.
#: scripts/restoreuser.php:91
@@ -8861,8 +9002,8 @@ msgstr "No s'ha especificat cap usuari; s'utilitza l'usuari de reserva."
#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
#: scripts/restoreuser.php:98
-#, fuzzy, php-format
+#, php-format
msgid "%d entry in backup."
msgid_plural "%d entries in backup."
-msgstr[0] "%d entrades a la còpia de seguretat."
+msgstr[0] "%d entrada a la còpia de seguretat."
msgstr[1] "%d entrades a la còpia de seguretat."
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 355c0d7a2..ea427b9ef 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:17:51+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:30+0000\n"
"Language-Team: Czech <http://translatewiki.net/wiki/Portal:cs>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
"2 );\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -88,11 +88,11 @@ msgstr "uložit nastavení přístupu"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -385,20 +385,38 @@ msgstr "Nelze uložit vaše nastavení designu."
msgid "Could not update your design."
msgstr "Nelze uložit design."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "časová osa %s"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "Odběry uživatele %s"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Oblíbené"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "členové skupiny %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -755,7 +773,7 @@ msgstr "Nejste autorizován."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -792,7 +810,7 @@ msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -867,7 +885,7 @@ msgstr "Heslo"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -944,7 +962,8 @@ msgstr "Nesmíte odstraňovat status jiného uživatele."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Žádné takové oznámení."
@@ -960,7 +979,10 @@ msgstr "Nelze opakovat své vlastní oznámení."
msgid "Already repeated that notice."
msgstr "Již jste zopakoval toto oznámení."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr " API metoda nebyla nalezena."
@@ -980,16 +1002,16 @@ msgstr "Status smazán."
msgid "No status with that ID found."
msgstr "Nenalezen status s tímto ID."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Toto oznámení nelze odstranit."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "Odstranit oznámení"
@@ -1114,34 +1136,58 @@ msgstr "Noticy taglé %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Aktualizace označené %1$s na %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "Pouze uživatel může přečíst své vlastní schránky."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Najít v obsahu oznámení"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "Oznámení s tímto id neexistuje."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1157,6 +1203,147 @@ msgstr "API metoda ve výstavbě."
msgid "User not found."
msgstr " API metoda nebyla nalezena."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Žádný takový profil."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Nelze vložit odebírání"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Najít v obsahu oznámení"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Neznámé"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Přidat do oblíbených"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Žádný takový profil."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "členové skupiny %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Skupiny kterých je %s členem"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Neznámé"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Všichni členové"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Žádný takový soubor."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Nelze smazat oblíbenou položku."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Žádný takový uživatel."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Všichni členové"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr " API metoda nebyla nalezena."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Žádný takový profil."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Nejste přihlášen k tomuto profilu."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Nelze smazat odebírání sebe sama"
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Lidé přihlášení k %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Neznámý typ souboru"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1446,8 +1633,8 @@ msgstr "Adresa již byla potvrzena"
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1978,12 +2165,12 @@ msgstr "Spravovat posílání e-mailů z %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "E-mailová adresa"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Aktuální potvrzená e-mailová adresa."
@@ -1992,14 +2179,14 @@ msgstr "Aktuální potvrzená e-mailová adresa."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Odstranit"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2012,14 +2199,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "E-mailová adresa, ve stylu \"UzivatelskeJmeno@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2027,110 +2214,117 @@ msgstr "Přidat"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Příchozí e-mail"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Chci posílat oznámení e-mailem."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Pošlete e-mail na tuto adresu pro poslání nového oznámení."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Vytvoření nové e-mailové adresy pro zasílání, ruší starou."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Nová"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Nastavení e-mailu"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Pošlete mi oznámení o nových přihlášeních e-mailem."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Pošlete mi e-mail, když někdo přidá moje oznámení mezi oblíbené."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Pošlete mi e-mail, když mi někdo pošle soukromou zprávu."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Pošlete mi e-mail, když mi někdo pošle \"@-odpověď\"."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Povolit přátelům mě pošťouchnout a poslat mi email."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Chci posílat oznámení e-mailem."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Publikovat MicroID pro mou e-mailovou adresu."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "Email nastavení uloženo."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Chybí e-mailová adresa."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Nepodařilo se normalizovat (kanonizovat) e-mailovou adresu."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Není platnou mailovou adresou."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "To je již vaší e-mailovou adresou."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Tato e-mailová adresa již patří jinému uživateli."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Nelze vložit potvrzující kód."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2142,56 +2336,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Žádné potvrzení ke zrušení."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Toto je špatná e-mailová adresa."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Nelze smazat potvrzení emailu"
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Potvrzení e-mailu zrušeno."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "To není vaše e-mailová adresa."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "E-mailová adresa byla odstraněna."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Nemáte příchozí e-mailovou adresu."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Nelze aktualizovat záznam uživatele."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Příchozí e-mailová adresa odstraněna."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Přidána nová příchozí e-mailová adresa."
@@ -5399,7 +5593,7 @@ msgstr "Nejste přihlášen k tomuto profilu."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Nelze uložit odebírání"
@@ -5407,10 +5601,6 @@ msgstr "Nelze uložit odebírání"
msgid "This action only accepts POST requests."
msgstr "Tato akce přijímá pouze POST požadavky."
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Žádný takový profil."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
@@ -5478,13 +5668,6 @@ msgstr ""
"Uživatele %s nikdo nesleduje. Proč ne [zaregistrovat účet](%%action.register%"
"%) a nebýt první?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "Odběry uživatele %s"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5533,13 +5716,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s nikoho nesleduje."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Feed oznámení pro %1$s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5950,13 +6138,13 @@ msgid "Author(s)"
msgstr "Autoři"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Oblíbit"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%s (@%s) přidal vaše oznámení jako oblíbené"
@@ -6019,42 +6207,42 @@ msgid "Invalid filename."
msgstr "Neplatné jméno souboru."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Nepodařilo se připojit ke skupině."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "Není součástí skupiny."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "Nepodařilo se opustit skupinu."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "Chyba při ukládaní uživatele; neplatný."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Připojit se"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6082,12 +6270,12 @@ msgid "You are banned from sending direct messages."
msgstr "Nemůžete posílat přímé zprávy (banned)"
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Nemohu vložit zprávu."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Nelze aktualizovat zprávu novým URI."
@@ -6105,17 +6293,17 @@ msgid "Database error inserting hashtag: %s"
msgstr "Chyba databáze při vkládání nálepky: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Problém ukládání sdělení. Příliš dlouhé."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Problém při ukládání sdělení. Neznámý uživatel."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6123,7 +6311,7 @@ msgstr ""
"několik minut."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6132,37 +6320,37 @@ msgstr ""
"několik minut."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Máte zakázáno (banned) posílat upozornění na tomto webu."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Problém při ukládání sdělení"
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
#, fuzzy
msgid "Bad type provided to saveKnownGroups."
msgstr "saveKnownGroups obdrželo špatný typ."
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "Problém při ukládání skupinového inboxu"
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Nelze uložit místní info skupiny."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6176,14 +6364,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr "Nelze zrušit roli \"%1$s\" pro uživatele #%2$d, neexistuje."
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr "Nelze zrušit roli \"%1$s\" pro uživatele #%2$d, chyba databáze."
@@ -6199,48 +6387,48 @@ msgid "Unable to save tag."
msgstr "Nelze uložit tag."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "Byl jste vykázán (banned) z přihlašování se."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Již přihlášen!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "Uživatel vás zablokoval."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Nepřihlášen!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Nelze smazat odebírání sebe sama"
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Nelze smazat OMB token přihlášení."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Nelze smazat odebírání"
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s od teď naslouchá tvým sdělením na %2$s."
@@ -6609,10 +6797,15 @@ msgid "Before"
msgstr "Před"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr "Očekávám kořenový element feedu, ale dostal jsem celý XML dokument."
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Fotka"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8203,17 +8396,17 @@ msgid "Send"
msgstr "Odeslat"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Přezdívka může obsahovat pouze malá písmena a čísla a žádné mezery."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8457,7 +8650,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Odebrat uživateli roli \"%s\""
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr " API metoda nebyla nalezena."
@@ -8712,17 +8905,17 @@ msgid "Moderator"
msgstr "Moderátor"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "před pár sekundami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "asi před minutou"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8731,12 +8924,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "asi před hodinou"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8745,12 +8938,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "asi přede dnem"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8759,12 +8952,12 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "asi před měsícem"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8773,7 +8966,7 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "asi před rokem"
diff --git a/locale/da/LC_MESSAGES/statusnet.po b/locale/da/LC_MESSAGES/statusnet.po
index d6378f65f..32e65b0fe 100644
--- a/locale/da/LC_MESSAGES/statusnet.po
+++ b/locale/da/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:17:52+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:31+0000\n"
"Language-Team: Danish <http://translatewiki.net/wiki/Portal:da>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: da\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -86,11 +86,11 @@ msgstr "Gem adgangsindstillinger"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -377,20 +377,38 @@ msgstr "Kunne ikke gemme dine design indstillinger."
msgid "Could not update your design."
msgstr "Kunne ikke opdatere dit design."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s tidslinie"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr ""
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Tilføj til favoritter"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "%s gruppe medlemmer"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -737,7 +755,7 @@ msgstr ""
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -773,7 +791,7 @@ msgstr ""
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -844,7 +862,7 @@ msgstr "Adgangskode"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -917,7 +935,8 @@ msgstr "Du kan ikke slette en anden brugers status."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Ingen sådan meddelelse."
@@ -933,7 +952,10 @@ msgstr "Kan ikke gentage din egen meddelelse."
msgid "Already repeated that notice."
msgstr "Allerede gentaget denne medelelse."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
msgstr ""
@@ -952,16 +974,16 @@ msgstr "Status slettet."
msgid "No status with that ID found."
msgstr "Ingen status med dette ID fundet."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Kan ikke slette denne meddelelse."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, php-format
msgid "Deleted notice %d"
msgstr ""
@@ -1082,33 +1104,57 @@ msgstr "Bekendtgørelser tagged med %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Opdateringer tagged med %1$s på %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
msgid "Only the user can add to their own timeline."
msgstr ""
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Kan ikke gentage din egen meddelelse."
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr ""
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1123,6 +1169,145 @@ msgstr "API metode under udvikling."
msgid "User not found."
msgstr ""
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Ingen sådan fil."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Kunne ikke indsætte bekræftelseskode."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Kunne ikke gemme dine design indstillinger."
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Ingen meddelelse."
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Tilføj til favoritter"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Ingen sådan fil."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "%s gruppe medlemmer"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "%1$s grupper som %2$s er medlem af."
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Ny gruppe"
+
+#: actions/atompubmembershipfeed.php:263
+msgid "Already a member."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Ingen sådan fil."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Kunne ikke slette favorit."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Ingen sådan gruppe."
+
+#: actions/atompubshowmembership.php:90
+msgid "Not a member"
+msgstr ""
+
+#: actions/atompubshowmembership.php:115
+msgid "Method not supported"
+msgstr ""
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Ingen sådan fil."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Du er ikke medlem af denne gruppe."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Kunne ikke slette favorit."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "This person is subscribed to you:"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Brugeren har ingen profil."
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1409,8 +1594,8 @@ msgstr "Denne adresse er allerede blevet bekræftet."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1930,12 +2115,12 @@ msgstr "Administrer hvordan du får e-mail fra %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "E-mail adresse"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Nuværende bekræftet email-adresse."
@@ -1944,14 +2129,14 @@ msgstr "Nuværende bekræftet email-adresse."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Fjern"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1964,14 +2149,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "E-mail adresse, som \"UserName@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -1979,111 +2164,118 @@ msgstr "Tilføj"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Indgående e-mail"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Jeg ønsker at sende meddelelser via e-mail."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Send e-mail til denne adresse for at skrive nye bekendtgørelser."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Opret en ny e-mail adresse til postering af beskeder; annullerer den gamle."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Ny"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Email indstillinger"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Send mig meddelelser om nye abonnementer via e-mail."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Send mig email, når nogen har tilføjet min meddelelse som en favorit."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Send mig email, når nogen sender mig en privat besked."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Send mig email, når nogen sender mig et \"@-svar\"."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Tillad venner at puffe mig og at sende mig en e-mail."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Jeg ønsker at sende meddelelser via e-mail."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Udgiv et MicroID til min email adresse."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "Email indstillinger gemt."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Ingen e-mail-adresse."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Kan ikke normalisere denne e-mail adresse"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ikke en gyldig e-mail adresse."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Det er allerede din e-mail adresse."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Denne e-mail adresse tilhører allerede en anden bruger."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Kunne ikke indsætte bekræftelseskode."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2095,56 +2287,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Ingen afventende bekræftelse at annullere."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Det er den forkerte e-mail adresse."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Kunne ikke slette e-mail bekræftelse."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Email bekræftelse aflyst."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Det er ikke din e-mail adresse."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "E-mail adressen blev fjernet."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Ingen indkommende e-mail adresse."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Kunne ikke opdatere bruger oplysninger."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Indgående e-mail adresse fjernet."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Ny indkommende e-mail adresse tilføjet."
@@ -5341,7 +5533,7 @@ msgstr "Du er ikke medlem af denne gruppe."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
#, fuzzy
msgid "Could not save subscription."
msgstr "Kunne ikke gemme profilen."
@@ -5350,11 +5542,6 @@ msgstr "Kunne ikke gemme profilen."
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "Ingen sådan fil."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
@@ -5418,13 +5605,6 @@ msgstr ""
"Hvorfor ikke [registrere en konto](%%action.register%%), og vær den første "
"til at tilføje en meddelelse til dine favoritter!"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr ""
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5468,13 +5648,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr ""
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Feed for venner af %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr ""
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr ""
@@ -5875,13 +6060,13 @@ msgid "Author(s)"
msgstr ""
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr ""
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr ""
@@ -5936,44 +6121,44 @@ msgid "Invalid filename."
msgstr "Ugyldig størrelse."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
#, fuzzy
msgid "Group join failed."
msgstr "Gruppen blev ikke fundet."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
#, fuzzy
msgid "Not part of group."
msgstr "Kunne ikke opdatere gruppe."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr ""
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, php-format
msgid "Group ID %s is invalid."
msgstr ""
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr ""
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6002,13 +6187,13 @@ msgid "You are banned from sending direct messages."
msgstr ""
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
#, fuzzy
msgid "Could not insert message."
msgstr "Kunne ikke finde mål bruger."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
#, fuzzy
msgid "Could not update message with new URI."
msgstr "Kunne ikke opdatere brugeren."
@@ -6027,60 +6212,60 @@ msgid "Database error inserting hashtag: %s"
msgstr "Databasefejl ved tilføjelse af OAuth applikationsbruger."
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr ""
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
#, fuzzy
msgid "You are banned from posting notices on this site."
msgstr "Du kan ikke tildele brugerroller på dette site."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr ""
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr ""
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -6094,14 +6279,14 @@ msgstr ""
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6119,53 +6304,53 @@ msgid "Unable to save tag."
msgstr "Kunne ikke gemme dine design indstillinger."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Denne bruger har blokeret dig fra at abonnere."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr ""
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
#, fuzzy
msgid "User has blocked you."
msgstr "Bruger er allerede blokeret fra gruppen."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr ""
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
#, fuzzy
msgid "Could not delete self-subscription."
msgstr "Kunne ikke slette favorit."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
#, fuzzy
msgid "Could not delete subscription OMB token."
msgstr "Kunne ikke slette favorit."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
#, fuzzy
msgid "Could not delete subscription."
msgstr "Kunne ikke slette favorit."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, php-format
msgid "%1$s is now following %2$s."
msgstr ""
@@ -6550,10 +6735,14 @@ msgid "Before"
msgstr ""
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+msgid "Post"
+msgstr ""
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8013,17 +8202,17 @@ msgid "Send"
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Kaldenavn må kun have små bogstaver og tal og ingen mellemrum."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8283,7 +8472,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Bloker denne bruger fra denne gruppe"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
msgid "Page not found."
msgstr ""
@@ -8543,17 +8732,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8561,12 +8750,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8574,12 +8763,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8587,12 +8776,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8600,7 +8789,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr ""
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 07b8d42a6..e10a3eac0 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -19,17 +19,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:17:53+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:33+0000\n"
"Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: de\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -96,11 +96,11 @@ msgstr "Zugangs-Einstellungen speichern"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -391,20 +391,38 @@ msgstr "Konnte Twitter-Einstellungen nicht speichern."
msgid "Could not update your design."
msgstr "Konnte Benutzerdesign nicht aktualisieren."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s-Zeitleiste"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s Abonnements"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Favoriten"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "%s Gruppen-Mitglieder"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -759,7 +777,7 @@ msgstr "Anfrage-Token bereits autorisiert."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -795,7 +813,7 @@ msgstr "Datenbankfehler beim Einfügen von oauth_token_association."
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -869,7 +887,7 @@ msgstr "Passwort"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -946,7 +964,8 @@ msgstr "Du kannst den Status eines anderen Benutzers nicht löschen."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Unbekannte Nachricht."
@@ -962,7 +981,10 @@ msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen."
msgid "Already repeated that notice."
msgstr "Nachricht bereits wiederholt"
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "API-Methode nicht gefunden."
@@ -982,16 +1004,16 @@ msgstr "Status gelöscht."
msgid "No status with that ID found."
msgstr "Keine Nachricht mit dieser ID gefunden."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Die Nachricht konnte nicht gelöscht werden."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "Notiz löschen"
@@ -1120,34 +1142,58 @@ msgstr "Mit „%s“ getaggte Nachrichten"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Mit „%1$s“ getaggte Nachrichten auf „%2$s“!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "Nur der Benutzer selbst kann seinen Posteingang lesen."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Durchsuche den Inhalt der Nachrichten"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "Nachricht mit dieser ID existiert nicht."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1162,6 +1208,147 @@ msgstr "API-Methode im Aufbau."
msgid "User not found."
msgstr "API-Methode nicht gefunden."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Profil nicht gefunden."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Konnte neues Abonnement nicht eintragen."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Durchsuche den Inhalt der Nachrichten"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Unbekannt"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Zu Favoriten hinzufügen"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Profil nicht gefunden."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "%s Gruppen-Mitglieder"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Gruppen, in denen „%s“ Mitglied ist"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Unbekannt"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Alle Mitglieder"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Datei nicht gefunden."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Konnte Favoriten nicht löschen."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Keine derartige Gruppe."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Alle Mitglieder"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "API-Methode nicht gefunden."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Profil nicht gefunden."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Du hast dieses Profil nicht abonniert."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Konnte Selbst-Abonnement nicht löschen."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Leute, die „%s“ abonniert haben"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Unbekannter Dateityp"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1449,8 +1636,8 @@ msgstr "Diese Adresse wurde bereits bestätigt."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1973,12 +2160,12 @@ msgstr "Einstellen, wie und wann du E-Mails von %%site.name%% bekommst."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "E-Mail-Adresse"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Aktuelle bestätigte E-Mail-Adresse."
@@ -1987,14 +2174,14 @@ msgstr "Aktuelle bestätigte E-Mail-Adresse."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Entfernen"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2007,14 +2194,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "E-Mail-Adresse, beispielsweise „Benutzername@example.org“"
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2022,114 +2209,121 @@ msgstr "Hinzufügen"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Eingehende E-Mail"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Ich möchte Einträge per E-Mail veröffentlichen."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Schicke eine E-Mail an diese Adresse um eine Nachricht zu posten."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Neue E-Mail-Adresse für Postings aktivieren; die alte wird automatisch "
"deaktiviert."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Neu"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "E-Mail Einstellungen"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Informiere mich über neues Abonnements per E-Mail."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Mir eine E-Mail schicken, wenn jemand meine Nachricht als Favorit speichert."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr ""
"Mir eine E-Mail schicken, wenn mir jemand eine private Nachricht schickt."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Schick mir eine E-Mail, wenn mir jemand eine @Nachricht schickt."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Erlaube Freunden mich zu stupsen und mir E-Mails zu senden."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Ich möchte Einträge per E-Mail veröffentlichen."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "MicroID für meine E-Mail-Adresse veröffentlichen."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "E-Mail-Einstellungen gespeichert."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Keine E-Mail-Adresse."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Konnte diese E-Mail-Adresse nicht normalisieren"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ungültige E-Mail-Adresse."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Dies ist bereits deine E-Mail-Adresse."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Diese E-Mail-Adresse gehört bereits einem anderen Benutzer."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Konnte keinen Bestätigungscode einfügen."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2141,56 +2335,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Keine ausstehende Bestätigung, die abgebrochen werden kann."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Dies ist die falsche E-Mail Adresse"
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Konnte E-Mail-Bestätigung nicht löschen."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "E-Mail-Bestätigung abgebrochen."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Dies ist nicht deine E-Mail-Adresse."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "Die E-Mail-Adresse wurde entfernt."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Keine Eingangs-E-Mail-Adresse."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Konnte Benutzereintrag nicht schreiben"
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Eingehende E-Mail-Adresse entfernt"
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Neue Eingangs-E-Mail-Adresse hinzugefügt."
@@ -5411,7 +5605,7 @@ msgstr "Du hast dieses Profil nicht abonniert."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Konnte Abonnement nicht erstellen."
@@ -5419,10 +5613,6 @@ msgstr "Konnte Abonnement nicht erstellen."
msgid "This action only accepts POST requests."
msgstr "Diese Aktion nimmt nur POST-Requests"
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Profil nicht gefunden."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr "Du hast dieses OMB 0.1 Profil nicht abonniert."
@@ -5488,13 +5678,6 @@ msgstr ""
"% hat keine Abonnenten. Warum [registrierst du nicht einen Account](%%%%"
"action.register%%%%) und bist der erste?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "%s Abonnements"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5543,13 +5726,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s hat niemanden abonniert."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Feed der Nachrichten von %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5960,13 +6148,13 @@ msgid "Author(s)"
msgstr "Autor(en)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Zu Favoriten hinzufügen"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%1$s markierte Nachricht %2$s als Favorit."
@@ -6030,42 +6218,42 @@ msgid "Invalid filename."
msgstr "Ungültiger Dateiname."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Konnte Gruppe nicht beitreten"
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "Nicht Mitglied der Gruppe"
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "Konnte Gruppe nicht verlassen"
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr "Profil-ID %s ist ungültig."
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, php-format
msgid "Group ID %s is invalid."
msgstr "Gruppen-ID %s ist ungültig."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Beitreten"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr "%1$s ist der Gruppe „%2$s“ beigetreten."
@@ -6093,12 +6281,12 @@ msgid "You are banned from sending direct messages."
msgstr "Direktes Senden von Nachrichten wurde blockiert"
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Konnte Nachricht nicht einfügen."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Konnte Nachricht nicht mit neuer URI versehen."
@@ -6116,17 +6304,17 @@ msgid "Database error inserting hashtag: %s"
msgstr "Datenbankfehler beim Einfügen des Hashtags: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Problem bei Speichern der Nachricht. Sie ist zu lang."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6134,7 +6322,7 @@ msgstr ""
"ein paar Minuten ab."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6143,39 +6331,39 @@ msgstr ""
"ein paar Minuten ab."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr ""
"Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Problem bei Speichern der Nachricht."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
"Der Methode „saveKnownGroups“ wurde ein schlechter Typ zur Verfügung "
"gestellt."
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "Problem bei Speichern der Nachricht."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Konnte Antwort auf %1$d, %2$d nicht speichern."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6189,7 +6377,7 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
@@ -6198,7 +6386,7 @@ msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6216,48 +6404,48 @@ msgid "Unable to save tag."
msgstr "Konnte Tag nicht speichern."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Bereits abonniert!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "Dieser Benutzer hat dich blockiert."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Nicht abonniert!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Konnte Selbst-Abonnement nicht löschen."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Konnte OMB-Abonnement-Token nicht löschen."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Konnte Abonnement nicht löschen."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr "Folgen"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s folgt nun %2$s."
@@ -6630,10 +6818,15 @@ msgid "Before"
msgstr "Vorher"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr "Root-Element eines Feeds erwartet, aber ganzes XML-Dokument erhalten."
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Foto"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8208,19 +8401,19 @@ msgid "Send"
msgstr "Senden"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Der Benutzername darf nur aus Kleinbuchstaben und Zahlen bestehen. "
"Leerzeichen sind nicht erlaubt."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8463,7 +8656,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Widerrufe die „%s“-Rolle von diesem Benutzer"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
msgid "Page not found."
msgstr "Seite nicht gefunden."
@@ -8716,17 +8909,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "vor wenigen Sekunden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "vor einer Minute"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8734,12 +8927,12 @@ msgstr[0] "vor ca. einer Minute"
msgstr[1] "vor ca. %d Minuten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "vor einer Stunde"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8747,12 +8940,12 @@ msgstr[0] "vor ca. einer Stunde"
msgstr[1] "vor ca. %d Stunden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "vor einem Tag"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8760,12 +8953,12 @@ msgstr[0] "vor ca. einem Tag"
msgstr[1] "vor ca. %d Tagen"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "vor einem Monat"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8773,7 +8966,7 @@ msgstr[0] "vor ca. einem Monat"
msgstr[1] "vor ca. %d Monaten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "vor ca. einem Jahr"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index e8a5df677..5978efd55 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -13,17 +13,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:17:54+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:35+0000\n"
"Language-Team: British English <http://translatewiki.net/wiki/Portal:en-gb>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -89,11 +89,11 @@ msgstr "Save access settings"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -383,20 +383,38 @@ msgstr "Unable to save your design settings."
msgid "Could not update your design."
msgstr "Could not update your design."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s timeline"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s subscriptions"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Favourites"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "%s group members"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -748,7 +766,7 @@ msgstr "You are not authorised."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -785,7 +803,7 @@ msgstr "Database error inserting OAuth application user."
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -860,7 +878,7 @@ msgstr "Password"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -935,7 +953,8 @@ msgstr "You may not delete another user's status."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "No such notice."
@@ -951,7 +970,10 @@ msgstr "Cannot repeat your own notice."
msgid "Already repeated that notice."
msgstr "Already repeated that notice."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "API method not found."
@@ -971,16 +993,16 @@ msgstr "Status deleted."
msgid "No status with that ID found."
msgstr "No status with that ID found."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Can't delete this notice."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "Delete notice"
@@ -1103,34 +1125,58 @@ msgstr "Notices tagged with %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Updates tagged with %1$s on %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "Only the user can read their own mailboxes."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Find content of notices"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "Notice with that id does not exist."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1145,6 +1191,147 @@ msgstr "API method under construction."
msgid "User not found."
msgstr "API method not found."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "No such profile."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Couldn't insert new subscription."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Find content of notices"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Unknown"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Add to favourites"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "No such profile."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "%s group members"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Groups %s is a member of"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Unknown"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "All members"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "No such file."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Could not delete favourite."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "No such group."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "All members"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "API method not found."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "No such profile."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "You are not subscribed to that profile."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Could not delete self-subscription."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "People subscribed to %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Unknown file type"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1434,8 +1621,8 @@ msgstr "That address has already been confirmed."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1961,12 +2148,12 @@ msgstr "Manage how you get e-mail from %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "E-mail address"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Current confirmed e-mail address."
@@ -1975,14 +2162,14 @@ msgstr "Current confirmed e-mail address."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Remove"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1995,14 +2182,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "E-mail address, like \"UserName@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2010,110 +2197,117 @@ msgstr "Add"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Incoming e-mail"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "I want to post notices by e-mail."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Send e-mail to this address to post new notices."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Make a new e-mail address for posting to - cancels the old one."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "New"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Email preferences"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Send me notices of new subscriptions through e-mail."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Send me e-mail when someone adds my notice as a favourite."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Send me e-mail when someone sends me a private message."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Send me e-mail when someone sends me an \"@-reply\"."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Allow friends to nudge me and send me an e-mail."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "I want to post notices by e-mail."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Publish a MicroID for my e-mail address."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "E-mail preferences saved."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "No e-mail address."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Cannot normalise that e-mail address"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Not a valid e-mail address."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "That is already your e-mail address."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "That e-mail address already belongs to another user."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Couldn't insert confirmation code."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2124,56 +2318,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "No pending confirmation to cancel."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "That is the wrong e-mail address."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Couldn't delete email confirmation."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "E-mail confirmation cancelled."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "That is not your e-mail address."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "The email address was removed."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "No incoming e-mail address."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Couldn't update user record."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Incoming e-mail address removed."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "New incoming e-mail address added."
@@ -5351,7 +5545,7 @@ msgstr "You are not subscribed to that profile."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Could not save subscription."
@@ -5359,10 +5553,6 @@ msgstr "Could not save subscription."
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "No such profile."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr "You cannot subscribe to an OMB 0.1 remote profile with this action."
@@ -5429,13 +5619,6 @@ msgstr ""
"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
"%) and be the first?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "%s subscriptions"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5479,13 +5662,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s is not listening to anyone."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Notice feed for %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5890,13 +6078,13 @@ msgid "Author(s)"
msgstr ""
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Favour"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%1$s marked notice %2$s as a favourite."
@@ -5950,42 +6138,42 @@ msgid "Invalid filename."
msgstr "Invalid filename."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Group join failed."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "Not part of group."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "Group leave failed."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, php-format
msgid "Group ID %s is invalid."
msgstr "Group ID %s is invalid."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Join"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6013,12 +6201,12 @@ msgid "You are banned from sending direct messages."
msgstr "You are banned from sending direct messages."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Could not insert message."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Could not update message with new URI."
@@ -6036,24 +6224,24 @@ msgid "Database error inserting hashtag: %s"
msgstr "Database error inserting hashtag: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Problem saving notice. Too long."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Problem saving notice. Unknown user."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
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."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6062,36 +6250,36 @@ msgstr ""
"few minutes."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "You are banned from posting notices on this site."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Problem saving notice."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "Problem saving group inbox."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Could not save reply for %1$d, %2$d."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6105,14 +6293,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6128,48 +6316,48 @@ msgid "Unable to save tag."
msgstr "Unable to save tag."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "You have been banned from subscribing."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Already subscribed!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "User has blocked you."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Not subscribed!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Could not delete self-subscription."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Could not delete subscription OMB token."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Could not delete subscription."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s is now following %2$s."
@@ -6538,10 +6726,15 @@ msgid "Before"
msgstr "Before"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Photo"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8017,17 +8210,17 @@ msgid "Send"
msgstr "Send"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8268,7 +8461,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Revoke the \"%s\" role from this user"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "API method not found."
@@ -8517,17 +8710,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "a few seconds ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "about a minute ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8535,12 +8728,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "about an hour ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8548,12 +8741,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "about a day ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8561,12 +8754,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "about a month ago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8574,7 +8767,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "about a year ago"
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index b9d28445a..2b7e513e4 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/locale/eo/LC_MESSAGES/statusnet.po
@@ -16,17 +16,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:17:55+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:36+0000\n"
"Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: eo\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -92,11 +92,11 @@ msgstr "Konservu atingan agordon"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -386,20 +386,38 @@ msgstr "Malsukcesis konservi vian desegnan agordon"
msgid "Could not update your design."
msgstr "Malsukcesis ĝisdatigi vian desegnon."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "Tempstrio de %s"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s abonatoj"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Ŝatolisto"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "%s grupanoj"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -751,7 +769,7 @@ msgstr "Vi ne estas rajtigita."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -788,7 +806,7 @@ msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -862,7 +880,7 @@ msgstr "Pasvorto"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -939,7 +957,8 @@ msgstr "Vi ne povas forigi la staton de alia uzanto."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Ne estas tiu avizo."
@@ -955,7 +974,10 @@ msgstr "Vi ne povas ripeti vian propran avizon."
msgid "Already repeated that notice."
msgstr "La avizo jam ripetiĝis."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "Metodo de API ne troviĝas."
@@ -975,16 +997,16 @@ msgstr "Stato forigita."
msgid "No status with that ID found."
msgstr "Neniu stato kun tiu ID troviĝas."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Ne povas forigi ĉi tiun avizon."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "Forigi avizon"
@@ -1109,34 +1131,58 @@ msgstr "Avizoj etikeditaj %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Ĝisdatigoj etikeditaj %1$s ĉe %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "Nur uzanto povas legi sian propran paŝton."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Serĉi enhavon ĉe la retejo"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "Avizo kun tiu identigaĵo ne ekzistas."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1152,6 +1198,147 @@ msgstr "API-metodo farata."
msgid "User not found."
msgstr "Metodo de API ne troviĝas."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Ne ekzistas tia profilo."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Eraris enmeti novan abonon."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Serĉi enhavon ĉe la retejo"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Nekonata"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Aldoni al ŝatolisto"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Ne ekzistas tia profilo."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "%s grupanoj"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Grupoj de %s"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Nekonata"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Ĉiuj grupanoj"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Ne ekzistas tia dosiero."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Malsukcesis forigi ŝataton."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Ne estas tiu grupo."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Ĉiuj grupanoj"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "Metodo de API ne troviĝas."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Ne ekzistas tia profilo."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Vi ne abonis tiun profilon."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Ne eblas forigi abonon al vi mem."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Abonantoj de %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Nekonata dosiertipo"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1440,8 +1627,8 @@ msgstr "La adreso jam estis konfirmita."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1970,12 +2157,12 @@ msgstr "Administri kiel ricevi mesaĝon de %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "Retpoŝtadreso"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Nuna konfirmita retpoŝtadreso."
@@ -1984,14 +2171,14 @@ msgstr "Nuna konfirmita retpoŝtadreso."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Forigi"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2004,14 +2191,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "Retpoŝtadreso, ekzemple \"ViaNomo@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2019,110 +2206,117 @@ msgstr "Aldoni"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Alveninta poŝto"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Mi volas afiŝi avizon per retpoŝto."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Sendu mesaĝon al la adreso por afiŝi novan avizon."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Krei novan retpoŝtadreson por afiŝado kaj nuligi la antaŭan."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Nova"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Retpoŝta agordo."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Sendu al mi avizon pri nova abonado per retpoŝto."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Sendu al mi mesaĝon tiam, kiam iu ŝatas mian avizon ."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Sendu al mi mesaĝon tiam, kiam iu sendas al mi privatan mesaĝon."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Sendu al mi mesaĝon tiam, kiam iu sendas al mi \"@-respondon\"."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Permesi al amikoj puŝeti min kaj sendi al mi retpoŝtan mesaĝon."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Mi volas afiŝi avizon per retpoŝto."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Publikigi MikroID por mia retpoŝtadreso."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "Retpoŝta prefero konserviĝis."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Neniu retpoŝta adreso."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Malsukcesis normigi tiun retpoŝtadreson"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Retpoŝta adreso ne valida"
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Tiu jam estas via retpoŝtadreso."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Tiu retpoŝtadreso jam apartenas al alia uzanto."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Malsukcesis enmeti konfirmkodon."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2133,56 +2327,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Ne estas peto-konfirmo por nuligi."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Tiu retpoŝtadreso estas malĝusta."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Ne povas forigi retpoŝtan konfirmon."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Retpoŝta konfirmo nuligita."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Tiu ne estas via retpoŝtadreso."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "La retpoŝtadreso estas forigita."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Ne estas alvena retpoŝtadreso"
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Malsukcesis ĝisdatigi uzantan informon."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Alvena retpoŝtadreso forigita."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Nova alvena retpoŝtadreso aldonita."
@@ -4363,17 +4557,17 @@ msgid ""
msgstr ""
"Gratulon, %1$s! Kaj bovenon al %%%%site.name%%%%. Nun eble vi volus...\n"
"\n"
-"* Al [via profilo](%2$s) kaj afiŝi vian unuan mesaĝon.\n"
+"* Iri al [via profilo](%2$s) kaj afiŝi vian unuan mesaĝon.\n"
"* Aldoni [Jabber/GTalk-adreson](%%%%action.imsettings%%%%) por afiŝi avizon "
"per tujmesaĝilo.\n"
-"* [Serŝi personon](%%%%action.peoplesearch%%%%), kiun vi konas aŭ havas "
-"similan ŝatokupon kiel vi. \n"
-"* Ĝisdatigi vian [profila agordon](%%%%action.profilesettings%%%%) por "
+"* [Serĉi personojn](%%%%action.peoplesearch%%%%), kiujn vi konas aŭ kiuj "
+"havas interesojn similajn al viaj.\n"
+"* Ĝisdatigi vian [profilan agordon](%%%%action.profilesettings%%%%) por "
"sciigi pli pri vi. \n"
"* Relegi la [enretaĵojn](%%%%doc.help%%%%) pri iu funkcio, kiun vi ne "
"rimarkus. \n"
"\n"
-"Dankon pro registri kaj ni esperas al vi ĝuo de uzi ĉi servon."
+"Dankon pro registriĝo, kaj ni esperas al vi ĝuon de uzi ĉi servon."
#: actions/register.php:613
msgid ""
@@ -4966,7 +5160,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
"**%s** havas konton ĉe %%%%site.name%%%%, [mikrobloga](http://en.wikipedia."
-"org/wiki/Micro-blogging) servo surbaze de ilaro de Libera Molvaro [StatusNet]"
+"org/wiki/Micro-blogging) servo surbaze de libera programaro [StatusNet]"
"(http://status.net/). [Aniĝu](%%%%action.register%%%%) por sekvi avizojn de "
"**%s** kaj multe pli! ([Pli](%%%%doc.help%%%%))"
@@ -4980,7 +5174,7 @@ msgid ""
"[StatusNet](http://status.net/) tool. "
msgstr ""
"**%s** havas konton ĉe %%%%site.name%%%%, [mikrobloga](http://en.wikipedia."
-"org/wiki/Micro-blogging) servo surbaze de ilaro de Libera Molvaro [StatusNet]"
+"org/wiki/Micro-blogging) servo surbaze de libera programaro [StatusNet]"
"(http://status.net/). "
#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
@@ -5350,7 +5544,7 @@ msgstr "Vi ne abonis tiun profilon."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Malsukcesis konservi abonon."
@@ -5358,10 +5552,6 @@ msgstr "Malsukcesis konservi abonon."
msgid "This action only accepts POST requests."
msgstr "La ago akceptas nur POST-an peton."
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Ne ekzistas tia profilo."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr "Vi ne povas aboni foran OMB 0.1-an profilon per ĉi tiu ago."
@@ -5426,13 +5616,6 @@ msgstr ""
"%s ne havas abonantojn. Kial ne [krei konton](%%%%*action.*Register%%%%) kaj "
"esti la unua?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "%s abonatoj"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5480,13 +5663,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s ne abonas iun ajn."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Avizofluo pri %1$s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5887,13 +6075,13 @@ msgid "Author(s)"
msgstr "Aŭtoro(j)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Ŝati"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%s (@%s) ŝatis vian avizon"
@@ -5951,42 +6139,42 @@ msgid "Invalid filename."
msgstr "Nevalida dosiernomo."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Malsukcesis aniĝi al grupon."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "Ne grupano."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "Malsukcesis foriri de grupo."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "Eraris konservi uzanton: nevalida."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Aniĝi"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6014,12 +6202,12 @@ msgid "You are banned from sending direct messages."
msgstr "Vi blokiĝis de sendi rektan mesaĝon."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Malsukcesis enmeti mesaĝon."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Malsukcesis ĝisdatigi mesaĝon per nova URI"
@@ -6037,24 +6225,24 @@ msgid "Database error inserting hashtag: %s"
msgstr "Datumbaze eraris enmeti heketetikedo: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Malsukcesis konservi avizon. Ĝi tro longas."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Malsukcesis konservi avizon. Uzanto ne kontata."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"Tro da avizoj tro rapide; pace spiru kaj reafiŝu post kelke da minutoj."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6062,37 +6250,37 @@ msgstr ""
"Tro da refojado tro rapide; pace spiru kaj reafiŝu post kelke da minutoj."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Vi estas blokita de afiŝi ĉe tiu ĉi retejo."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Malsukcesis konservi avizon."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
#, fuzzy
msgid "Bad type provided to saveKnownGroups."
msgstr "Fuŝa tipo donita al saveKnownGroups"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "Malsukcesis konservi grupan alvenkeston."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Malsukcesis lokan grupan informon."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6106,14 +6294,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr "Malsukcesis revoki rolon \"%1$s\" de uzanto #%2$d; ĝi ne ekzistas."
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr "Malsukcesis revoki rolon \"%1$s\" de uzanto #%2$d; datumbaza eraro."
@@ -6129,48 +6317,48 @@ msgid "Unable to save tag."
msgstr "Malsukcesis konservi etikedon."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "Vi esatas blokita de aboni."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Jam abonato!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "La uzanto blokis vin."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Ne abonato!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Ne eblas forigi abonon al vi mem."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Malsukcesis forigi abonan OMB-ĵetonon."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Malsukcesis forigi abonon."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr "Sekvi"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s nun rigardas viajn avizojn ĉe %2$s."
@@ -6542,10 +6730,15 @@ msgid "Before"
msgstr "Antaŭe"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Foto"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8128,18 +8321,18 @@ msgid "Send"
msgstr "Sendi"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Kromnomo devas havi nur minuskulajn literojn kaj numerojn sed neniun spacon."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8383,7 +8576,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Revoki rolon %s de la uzanto"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "Metodo de API ne troviĝas."
@@ -8636,17 +8829,17 @@ msgid "Moderator"
msgstr "Moderanto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "antaŭ kelkaj sekundoj"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "antaŭ ĉirkaŭ unu minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8654,12 +8847,12 @@ msgstr[0] "antaŭ ĉirkaŭ unu minuto"
msgstr[1] "antaŭ ĉirkaŭ %d minutoj"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "antaŭ ĉirkaŭ unu horo"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8667,12 +8860,12 @@ msgstr[0] "antaŭ ĉirkaŭ unu horo"
msgstr[1] "antaŭ ĉirkaŭ %d horoj"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "antaŭ ĉirkaŭ unu tago"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8680,12 +8873,12 @@ msgstr[0] "antaŭ ĉirkaŭ unu tago"
msgstr[1] "antaŭ ĉirkaŭ %d tagoj"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "Antaŭ ĉrikaŭ unu monato"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8693,7 +8886,7 @@ msgstr[0] "antaŭ ĉirkaŭ unu monato"
msgstr[1] "antaŭ ĉirkaŭ %d monatoj"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "antaŭ ĉirkaŭ unu jaro"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index ca3ed793f..39cebc687 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -16,17 +16,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:17:56+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:37+0000\n"
"Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: es\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -92,11 +92,11 @@ msgstr "Guardar la configuración de acceso"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -387,20 +387,38 @@ msgstr "No se pudo grabar tu configuración de diseño."
msgid "Could not update your design."
msgstr "No se pudo actualizar tu diseño."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "línea temporal de %s"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "Suscripciones %s"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Favoritos"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "Miembros del grupo %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -754,7 +772,7 @@ msgstr "No estás autorizado."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -792,7 +810,7 @@ msgstr "Error de base de datos al insertar usuario de la aplicación OAuth."
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -867,7 +885,7 @@ msgstr "Contraseña"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -944,7 +962,8 @@ msgstr "No puedes borrar el estado de otro usuario."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "No existe ese mensaje."
@@ -960,7 +979,10 @@ msgstr "No puedes repetir tus propios mensajes"
msgid "Already repeated that notice."
msgstr "Este mensaje ya se ha repetido."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "Método de API no encontrado."
@@ -980,16 +1002,16 @@ msgstr "Status borrado."
msgid "No status with that ID found."
msgstr "No hay estado para ese ID"
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "No se puede eliminar este mensaje."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "Borrar mensaje"
@@ -1114,34 +1136,58 @@ msgstr "Mensajes etiquetados con %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualizaciones etiquetadas con %1$s en %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "Sólo el usuario puede leer sus bandejas de correo."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Buscar en el contenido de mensajes"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "No existe ningún mensaje con ese ID."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1156,6 +1202,147 @@ msgstr "Método API en construcción."
msgid "User not found."
msgstr "Método de API no encontrado."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "No existe tal perfil."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "No se pudo insertar una nueva suscripción."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Buscar en el contenido de mensajes"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Desconocido"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Agregar a favoritos"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "No existe tal perfil."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "Miembros del grupo %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "%s es miembro de los grupos"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Desconocido"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Todos los miembros"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "No existe tal archivo."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "No se pudo borrar favorito."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "No existe ese grupo."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Todos los miembros"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "Método de API no encontrado."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "No existe tal perfil."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "No te has suscrito a ese perfil."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "No se pudo eliminar la auto-suscripción."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Personas suscritas a %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Tipo de archivo desconocido"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1446,8 +1633,8 @@ msgstr "Esa dirección ya fue confirmada."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1980,12 +2167,12 @@ msgstr "Gestiona la forma en que recibes correo desde %%site.name%%"
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "Dirección de correo electrónico"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Actual dirección de correo electrónico confirmada"
@@ -1994,14 +2181,14 @@ msgstr "Actual dirección de correo electrónico confirmada"
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Eliminar"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2014,14 +2201,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "Correo electrónico, como \"NombredeUsuario@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2029,113 +2216,120 @@ msgstr "Añadir"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Correo entrante"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Quiero publicar mensajes por correo electrónico."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Envie emails a esta dirección para ingresar nuevos avisos"
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Hace una nueva dirección de correo para postear; cancela la anterior."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Nuevo"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Preferencias de correo electrónico"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Enviarme mensajes de nuevas suscripciones por correo electrónico."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Enviarme un correo electrónico cuando alguien agrega mi aviso a favoritos."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr ""
"Enviarme un correo electrónico cuando alguien me envía un mensaje privado."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
"Enviarme un correo electrónico cuando alguien me envíe una \"@-respuesta\"."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Permitir que amigos me den un toque y me envien un correo electrónico."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Quiero publicar mensajes por correo electrónico."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Publicar un MicroID para mi dirección de correo."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "Preferencias de correo electrónico guardadas."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Sin dirección de correo electrónico"
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "No se puede normalizar esta dirección de correo electrónico."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Correo electrónico no válido"
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Esa ya es tu dirección de correo electrónico"
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Esa dirección de correo pertenece a otro usuario."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "No se pudo insertar el código de confirmación."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2147,56 +2341,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Ninguna confirmación pendiente para cancelar."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Esa es la dirección de correo electrónico incorrecta."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "No se pudo eliminar la confirmación de correo electrónico."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Confirmación de correo electrónico cancelada."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Esa no es tu dirección de correo electrónico"
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "La dirección de correo electrónico ha sido eliminada."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "No hay dirección de correo entrante."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "No se pudo actualizar información de usuario."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Dirección de correo entrante removida."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Nueva dirección de correo entrante agregada."
@@ -5442,7 +5636,7 @@ msgstr "No te has suscrito a ese perfil."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "No se ha podido guardar la suscripción."
@@ -5450,10 +5644,6 @@ msgstr "No se ha podido guardar la suscripción."
msgid "This action only accepts POST requests."
msgstr "Esta acción sólo acepta solicitudes POST."
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "No existe tal perfil."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr "No puedes suscribirte a un perfil remoto 0.1 de OMB con esta acción."
@@ -5521,13 +5711,6 @@ msgstr ""
"%s no tiene suscriptores. ¿Por qué no [registrar una cuenta](%%%%action."
"register%%%%) y ser la primera persona?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "Suscripciones %s"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5576,13 +5759,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s no está escuchando a nadie."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Canal de mensajes para %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5994,13 +6182,13 @@ msgid "Author(s)"
msgstr "Autor(es)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Aceptar"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%s (@%s) agregó tu mensaje a los favoritos"
@@ -6062,42 +6250,42 @@ msgid "Invalid filename."
msgstr "Nombre de archivo inválido."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Ha fallado la acción de unirse el grupo"
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "No es parte del grupo."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "Ha fallado la acción de abandonar el grupo"
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "Error al guardar el usuario; inválido."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Unirse"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6125,12 +6313,12 @@ msgid "You are banned from sending direct messages."
msgstr "Se te ha inhabilitado para enviar mensajes directos."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "No se pudo insertar mensaje."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "No se pudo actualizar mensaje con nuevo URI."
@@ -6148,17 +6336,17 @@ msgid "Database error inserting hashtag: %s"
msgstr "Error de la BD al insertar la etiqueta clave: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Ha habido un problema al guardar el mensaje. Es muy largo."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Ha habido un problema al guardar el mensaje. Usuario desconocido."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6166,7 +6354,7 @@ msgstr ""
"minutos."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6175,37 +6363,37 @@ msgstr ""
"pasados unos minutos."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Tienes prohibido publicar avisos en este sitio."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Hubo un problema al guardar el mensaje."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
#, fuzzy
msgid "Bad type provided to saveKnownGroups."
msgstr "Mal tipo proveído a saveKnownGroups"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "Hubo un problema al guarda la bandeja de entrada del grupo."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "No se ha podido guardar la información del grupo local."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6219,14 +6407,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr "No se puede revocar rol \"%1$s\" para usuario #%2$d; no existe."
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6243,49 +6431,49 @@ msgid "Unable to save tag."
msgstr "Incapaz de grabar etiqueta."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "Se te ha prohibido la suscripción."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "¡Ya te has suscrito!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "El usuario te ha bloqueado."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
#, fuzzy
msgid "Not subscribed!"
msgstr "¡No estás suscrito!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "No se pudo eliminar la auto-suscripción."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "No se pudo eliminar la ficha OMB de suscripción."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "No se pudo eliminar la suscripción."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s ahora está escuchando tus avisos en %2$s"
@@ -6659,12 +6847,17 @@ msgid "Before"
msgstr "Antes"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
"A espera de un elemento de alimentación de raíz, pero se obtuvo un documento "
"XML entero."
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Foto"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8259,19 +8452,19 @@ msgid "Send"
msgstr "Enviar"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"El usuario debe tener solamente letras minúsculas y números y no puede tener "
"espacios."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8514,7 +8707,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Revocar el rol \"%s\" de este usuario"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "Método de API no encontrado."
@@ -8769,17 +8962,17 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "hace unos segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "hace un minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8787,12 +8980,12 @@ msgstr[0] "hace aproximadamente un minuto"
msgstr[1] "hace aproximadamente %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "hace una hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8800,12 +8993,12 @@ msgstr[0] "hace aproximadamente una hora"
msgstr[1] "hace aproximadamente %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "hace un día"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8813,12 +9006,12 @@ msgstr[0] "hace aproximadamente un día"
msgstr[1] "hace aproximadamente %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "hace un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8826,7 +9019,7 @@ msgstr[0] "hace aproximadamente un mes"
msgstr[1] "hace aproximadamente %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
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 2ada3e464..383e6d515 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:17:57+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:39+0000\n"
"Last-Translator: Ahmad Sufi Mahmudi\n"
"Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
"MIME-Version: 1.0\n"
@@ -25,9 +25,9 @@ msgstr ""
"X-Language-Code: fa\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -93,11 +93,11 @@ msgstr "ذخیرهٔ تنظیمات دسترسی"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -381,20 +381,38 @@ msgstr "نمی‌توان تنظیمات طرح‌تان را ذخیره کرد.
msgid "Could not update your design."
msgstr "نمی‌توان طرح‌تان به‌هنگام‌سازی کرد."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr "اصلی"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "خط‌زمانی %s"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s اشتراک"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "برگزیده‌ها"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "اعضای گروه %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -745,7 +763,7 @@ msgstr "شما شناسایی نشده اید."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -782,7 +800,7 @@ msgstr "هنگام افزودن کاربر برنامهٔ OAuth در پایگا
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -859,7 +877,7 @@ msgstr "گذرواژه"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -936,7 +954,8 @@ msgstr "شما توانایی حذف وضعیت کاربر دیگری را ند
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "چنین پیامی وجود ندارد."
@@ -952,7 +971,10 @@ msgstr "نمی توانید پیام خود را تکرار کنید."
msgid "Already repeated that notice."
msgstr "قبلا آن پیام تکرار شده است."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "رابط مورد نظر پیدا نشد."
@@ -972,16 +994,16 @@ msgstr "وضعیت حذف شد."
msgid "No status with that ID found."
msgstr "هیچ وضعیتی با آن شناسه یافت نشد."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "نمی‌توان این پیام را پاک کرد."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "پیام را پاک کن"
@@ -1102,34 +1124,58 @@ msgstr "پیام‌هایی که با %s نشانه گزاری شده اند."
msgid "Updates tagged with %1$s on %2$s!"
msgstr "پیام‌های نشانه گزاری شده با %1$s در %2$s"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "تنها کاربران می تواند صندوق نامهٔ خودشان را بخوانند."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "پیدا کردن محتوای پیام‌ها"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "پیامی با آن شناسه وجود ندارد."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1145,6 +1191,147 @@ msgstr "روش API در دست ساخت."
msgid "User not found."
msgstr "رابط مورد نظر پیدا نشد."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "چنین نمایه‌ای وجود ندارد."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "نمی‌توان اشتراک تازه‌ای افزود."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "پیدا کردن محتوای پیام‌ها"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "ناشناخته"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "افزودن به برگزیده‌ها"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "چنین نمایه‌ای وجود ندارد."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "اعضای گروه %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "هست عضو %s گروه"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "ناشناخته"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "همهٔ اعضا"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "چنین پرونده‌ای وجود ندارد."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "نمی‌توان پیام برگزیده را حذف کرد."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "چنین گروهی وجود ندارد."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "همهٔ اعضا"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "رابط مورد نظر پیدا نشد."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "چنین نمایه‌ای وجود ندارد."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "شما مشترک آن نمایه نیستید."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "نمی‌توان اشتراک را ذخیره کرد."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "افراد مشترک %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "نوع فایل پشتیبانی نشده"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1437,8 +1624,8 @@ msgstr "آن نشانی در حال حاضر تصدیق شده است."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1975,12 +2162,12 @@ msgstr "چگونگی دریافت نامه از %%site.name%% را اداره ک
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "نشانی پست الکترونیک"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "نشانی پست الکترونیکی تایید شدهٔ کنونی"
@@ -1989,14 +2176,14 @@ msgstr "نشانی پست الکترونیکی تایید شدهٔ کنونی"
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "حذف"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2009,14 +2196,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "نشانی پست الکترونیکی، مانند «UserName@example.org»"
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2024,113 +2211,120 @@ msgstr "افزودن"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "پست الکترونیک ورودی"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "می‌خواهم با نامه پیام بفرستم."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
"برای فرستادن پیام با استفاده از پست الکترونیک به این نشانی نامه بفرستید."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "نشانی جدید برای فرستادن پیام ایجاد کن؛ نشانی قبلی لغو می‌شود."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "تازه"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "ترجیحات پست الکترونیکی"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "پیام‌های کسانی را که به تازگی دنبال می‌کنم با پست الکترونیک برایم بفرست."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"هرگاه کسی پیام من را به عنوان برگزیده اضافه کرد، به من نامه فرستاده شود."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "هر وقت کسی برای من پیام خصوصی فرستاد، مرا با پست الکترونیک با خبر کن."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "هرگاه کسی به من یک «@-پاسخ» می‌فرستد، به من نامه بفرست."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr ""
"به دوستان اجازه داده شود که به من یادآوری کنند و یک نامه به من بفرستند."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "می‌خواهم با نامه پیام بفرستم."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "یک شناسه برای پست الکترونیک من منتشر کن."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "ترجیحات پست الکترونیکی ذخیره شد."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "پست الکترونیک وجود ندارد."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "نمی‌توان نشانی را قانونی کرد"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "یک نشانی پست الکترونیکی معتبر نیست."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "هم اکنون نشانی شما همین است."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "این نشانی در حال حاضر متعلق به فرد دیگری است."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "نمی‌توان کد تایید را اضافه کرد."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2141,56 +2335,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "هیچ تاییدی برای فسخ کردن وجود ندارد."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "این نشانی پست الکترونیکی نادرست است."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "تایید پست الکترونیکی لغو شد."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "آن نشانی شما نیست."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "نشانی پست الکترونیکی پاک شده است."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "هیچ نشانی ورودی وجود ندارد."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "نمی‌توان اطلاعات کاربر را به روز کرد."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "نشانی ورودی پاک شد."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "نشانی ورودی جدید اضافه شد."
@@ -5392,7 +5586,7 @@ msgstr "شما مشترک آن نمایه نیستید."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "نمی‌توان اشتراک را ذخیره کرد."
@@ -5400,10 +5594,6 @@ msgstr "نمی‌توان اشتراک را ذخیره کرد."
msgid "This action only accepts POST requests."
msgstr "این عمل تنها درخواست‌های POST را می‌پذیرد."
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "چنین نمایه‌ای وجود ندارد."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr "نمی‌توان با این کار مشترک یک نمایهٔ از راه دور OMB 0.1شد."
@@ -5470,13 +5660,6 @@ msgstr ""
"%s هیچ مشترکی ندارد. چرا ]یک حساب ثبت نمی‌کنید[(%%%%action.register%%%%) و "
"اولین مشترک نمی‌شوید؟"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "%s اشتراک"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5526,13 +5709,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s هیچ‌کس را دنبال نمی‌کند."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "خوراک پیام‌های %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "پیامک"
@@ -5934,13 +6122,13 @@ msgid "Author(s)"
msgstr "مؤلف(ها)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "برگزیده‌کردن"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "پیام شما را به برگزیده‌های خود اضافه کرد %s (@%s)"
@@ -5996,42 +6184,42 @@ msgid "Invalid filename."
msgstr "نام‌پرونده نادرست است."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "پیوستن به گروه شکست خورد."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "بخشی از گروه نیست."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "ترک کردن گروه شکست خورد."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "هنگام ذخیرهٔ کاربر خطا رخ داد؛ نامعتبر است."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "مشارکت کردن"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6059,12 +6247,12 @@ msgid "You are banned from sending direct messages."
msgstr "شما از فرستادن پیام مستقیم مردود شده اید."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "پیغام نمی تواند درج گردد"
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
#, fuzzy
msgid "Could not update message with new URI."
msgstr "نمی‌توان پیام را تجزیه کرد."
@@ -6083,17 +6271,17 @@ msgid "Database error inserting hashtag: %s"
msgstr "هنگام افزودن برچسب خطا در پایگاه داده رخ داد: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "مشکل در ذخیره کردن پیام. بسیار طولانی."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "مشکل در ذخیره کردن پیام. کاربر نا شناخته."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6101,7 +6289,7 @@ msgstr ""
"دوباره بفرستید."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6110,36 +6298,36 @@ msgstr ""
"ارسال کنید."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "شما از فرستادن پیام در این وب‌گاه منع شده‌اید."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "هنگام ذخیرهٔ پیام مشکلی ایجاد شد."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "هنگام ذخیرهٔ صندوق ورودی گروه مشکلی رخ داد."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "نمی‌توان اطلاعات گروه محلی را ذخیره کرد."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6153,14 +6341,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr "نمی‌توان نقش «%1$s» را از کاربر #%2$d گرفت، وجود ندارد."
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6178,48 +6366,48 @@ msgid "Unable to save tag."
msgstr "نمی‌توان پیام وب‌گاه را ذخیره کرد."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "شما از اشتراک منع شده‌اید."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "قبلا اشتراک انجام شده است!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "کاربر شما را مسدود کرده است."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "تایید نشده!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "نمی‌توان اشتراک را ذخیره کرد."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "نمی‌توان اشتراک را ذخیره کرد."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "نمی‌توان اشتراک را ذخیره کرد."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s اکنون پیام‌های شما را در %2$s دنبال می‌کند."
@@ -6589,11 +6777,16 @@ msgid "Before"
msgstr "قبل از"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
"در حال انتظار برای یک عامل خوراک ریشه‌ای، اما یک سند XML کامل دریافت شد."
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "تصویر"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8164,17 +8357,17 @@ msgid "Send"
msgstr "فرستادن"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "لقب باید شامل حروف کوچک و اعداد و بدون فاصله باشد."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8418,7 +8611,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "دسترسی کاربر به گروه مسدود شود"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "رابط مورد نظر پیدا نشد."
@@ -8671,60 +8864,60 @@ msgid "Moderator"
msgstr "مدیر"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "چند ثانیه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "حدود یک دقیقه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "حدود یک ساعت پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "حدود یک روز پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "حدود یک ماه پیش"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "حدود یک سال پیش"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 5c0622c05..fb4e34469 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:00+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:40+0000\n"
"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fi\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -96,11 +96,11 @@ msgstr "Profiilikuva-asetukset"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -384,20 +384,38 @@ msgstr "Ulkoasun tallennus epäonnistui."
msgid "Could not update your design."
msgstr "Ei voitu päivittää käyttäjää."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s aikajana"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "Käyttäjän %s tilaukset"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Suosikit"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "Ryhmän %s jäsenet"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -755,7 +773,7 @@ msgstr "Sinulla ei ole valtuutusta tähän."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -795,7 +813,7 @@ msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -864,7 +882,7 @@ msgstr "Salasana"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
#, fuzzy
@@ -941,7 +959,8 @@ msgstr "Et voi poistaa toisen käyttäjän päivitystä."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Päivitystä ei ole."
@@ -958,7 +977,10 @@ msgstr "Ilmoituksia ei voi pistää päälle."
msgid "Already repeated that notice."
msgstr "Tätä päivitystä ei voi poistaa."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "API-metodia ei löytynyt."
@@ -978,16 +1000,16 @@ msgstr "Päivitys poistettu."
msgid "No status with that ID found."
msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Tätä päivitystä ei voi poistaa."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "Poista päivitys"
@@ -1111,34 +1133,58 @@ msgstr "Päivitykset joilla on tagi %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Käyttäjän %1$s suosikit palvelussa %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Hae päivityksien sisällöstä"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "Ei profiilia tuolla id:llä."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1153,6 +1199,148 @@ msgstr "API-metodi on työn alla!"
msgid "User not found."
msgstr "API-metodia ei löytynyt."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Tiedostoa ei ole."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Ei voitu lisätä uutta tilausta."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Hae päivityksien sisällöstä"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Tuntematon toiminto"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Lisää suosikkeihin"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Tiedostoa ei ole."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "Ryhmän %s jäsenet"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Ryhmät, joiden jäsen %s on"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Tuntematon toiminto"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Kaikki jäsenet"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Tiedostoa ei ole."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Ei voitu poistaa suosikkia."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Tuota ryhmää ei ole."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Kaikki jäsenet"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "API-metodia ei löytynyt."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Tiedostoa ei ole."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Tilausta ei onnistuttu tallentamaan."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Tunnistamaton tiedoston tyyppi"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1441,8 +1629,8 @@ msgstr "Tämä osoite on jo vahvistettu."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1991,13 +2179,13 @@ msgstr "Määritä miten saat sähköpostin palvelusta %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
#, fuzzy
msgid "Email address"
msgstr "Sähköpostiosoitteet"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Tämän hetken vahvistettu sähköpostiosoite."
@@ -2006,14 +2194,14 @@ msgstr "Tämän hetken vahvistettu sähköpostiosoite."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Poista"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2027,14 +2215,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "Sähköpostiosoite, esimerkiksi \"käyttäjätunnus@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
#, fuzzy
msgctxt "BUTTON"
@@ -2043,114 +2231,121 @@ msgstr "Lisää"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Saapuva sähköposti"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Haluan lähettää päivityksiä sähköpostilla."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Lähetä sähköpostia tähän osoitteeseen tehdäksesi päivityksiä."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Tee uusi sähköpostiosoite johon lähettää päivityksiä; tämä poistaa vanhan "
"osoitteen"
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Uusi"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Sähköpostiosoitteet"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Lähetä sähköpostilla tieto uusista tilaajista."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Lähetä sähköpostia, jos joku lähettää minulle yksityisviestin."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Lähetä sähköpostia, jos joku lähettää minulle \"@-vastauksen\"."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Salli kavereiden tönäistä minua ja lähetä sähköpostilla ilmoitus."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Haluan lähettää päivityksiä sähköpostilla."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Julkaise MicroID sähköpostiosoitteelleni."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
#, fuzzy
msgid "Email preferences saved."
msgstr "Ulkoasuasetukset tallennettu."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Sähköpostiosoitetta ei ole."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Ei voida normalisoida sähköpostiosoitetta"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Tämä on jo sähköpostiosoitteesi."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Tämä sähköpostiosoite kuuluu jo toisella käyttäjällä."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Ei voitu asettaa vahvistuskoodia."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2162,57 +2357,57 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Avoimia vahvistuksia ei ole peruutettavana."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
#, fuzzy
msgid "That is the wrong email address."
msgstr "Tämä on väärä pikaviestiosoite."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Ei voitu poistaa sähköpostivahvistusta."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Avoimia vahvistuksia ei ole peruutettavana."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Tämä ei ole sähköpostiosoitteesi."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "Saapuvan sähköpostin osoite poistettu."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Saapuvan sähköpostin osoitetta ei ole."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Ei voitu päivittää käyttäjätietoja."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Saapuvan sähköpostin osoite poistettu."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Uusi saapuvan sähköpostin osoite lisätty."
@@ -5451,7 +5646,7 @@ msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Tilausta ei onnistuttu tallentamaan."
@@ -5459,11 +5654,6 @@ msgstr "Tilausta ei onnistuttu tallentamaan."
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "Tiedostoa ei ole."
-
#: actions/subscribe.php:117
#, fuzzy
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
@@ -5526,13 +5716,6 @@ msgid ""
"%) and be the first?"
msgstr ""
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "Käyttäjän %s tilaukset"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5576,13 +5759,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s ei seuraa ketään käyttäjää."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Syöte ryhmän %s päivityksille (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5993,13 +6181,13 @@ msgid "Author(s)"
msgstr ""
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Lisää suosikiksi"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi."
@@ -6054,45 +6242,45 @@ msgid "Invalid filename."
msgstr "Koko ei kelpaa."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
#, fuzzy
msgid "Group join failed."
msgstr "Ryhmän profiili"
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
#, fuzzy
msgid "Not part of group."
msgstr "Ei voitu päivittää ryhmää."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
#, fuzzy
msgid "Group leave failed."
msgstr "Ryhmän profiili"
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Liity"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6122,12 +6310,12 @@ msgid "You are banned from sending direct messages."
msgstr "Tapahtui virhe suoran viestin lähetyksessä."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Viestin tallennus ei onnistunut."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut."
@@ -6145,18 +6333,18 @@ msgid "Database error inserting hashtag: %s"
msgstr "Virhe tapahtui profiilikuvan lisäämisessä"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Ongelma päivityksen tallentamisessa."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6164,7 +6352,7 @@ msgstr ""
"päivityksien lähettämista muutaman minuutin päästä."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6173,37 +6361,37 @@ msgstr ""
"päivityksien lähettämista muutaman minuutin päästä."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Päivityksesi tähän palveluun on estetty."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Ongelma päivityksen tallentamisessa."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Ongelma päivityksen tallentamisessa."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Tilausta ei onnistuttu tallentamaan."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6217,14 +6405,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6241,51 +6429,51 @@ msgid "Unable to save tag."
msgstr "Tagien tallennus epäonnistui."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
#, fuzzy
msgid "Already subscribed!"
msgstr "Ei ole tilattu!."
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "Käyttäjä on asettanut eston sinulle."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
#, fuzzy
msgid "Not subscribed!"
msgstr "Ei ole tilattu!."
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Tilausta ei onnistuttu tallentamaan."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Tilausta ei onnistuttu tallentamaan."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Tilausta ei onnistuttu tallentamaan."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s seuraa nyt päivityksiäsi palvelussa %2$s."
@@ -6668,10 +6856,15 @@ msgid "Before"
msgstr "Aiemmin"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Kuva"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8158,19 +8351,19 @@ msgid "Send"
msgstr "Lähetä"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Käyttäjätunnuksessa voi olla ainoastaan pieniä kirjaimia ja numeroita ilman "
"välilyöntiä."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8422,7 +8615,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "API-metodia ei löytynyt."
@@ -8684,17 +8877,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "muutama sekunti sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "noin minuutti sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8702,12 +8895,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "noin tunti sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8715,12 +8908,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "noin päivä sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8728,12 +8921,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "noin kuukausi sitten"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8741,7 +8934,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
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 8f9fdd5bf..ee415abb4 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -21,17 +21,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:01+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:42+0000\n"
"Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -97,11 +97,11 @@ msgstr "Sauvegarder les paramètres d’accès"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -393,20 +393,38 @@ msgstr "Impossible de sauvegarder les parmètres de la conception."
msgid "Could not update your design."
msgstr "Impossible de mettre à jour votre conception."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
-msgstr ""
+msgstr "Principal"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "Activité de %s"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "Abonnements de %s"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Favoris"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "Membres du groupe %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -535,9 +553,8 @@ msgstr "Vous ne pouvez pas ne plus vous suivre vous-même."
#. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
#: actions/apifriendshipsexists.php:88
-#, fuzzy
msgid "Two valid IDs or nick names must be supplied."
-msgstr "Vous devez fournir deux identifiants ou pseudonymes."
+msgstr "Vous devez fournir deux identifiants ou pseudonymes valides."
#. TRANS: Client error displayed when a source user could not be determined showing friendship.
#: actions/apifriendshipsshow.php:131
@@ -758,7 +775,7 @@ msgstr "Le jeton de requête a déjà été autorisé."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -798,7 +815,7 @@ msgstr ""
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -874,7 +891,7 @@ msgstr "Mot de passe"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -951,7 +968,8 @@ msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Avis non trouvé."
@@ -967,15 +985,17 @@ msgstr "Vous ne pouvez pas reprendre votre propre avis."
msgid "Already repeated that notice."
msgstr "Vous avez déjà repris cet avis."
-#: actions/apistatusesshow.php:117
-#, fuzzy
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
-msgstr "Méthode API non trouvée !"
+msgstr "Méthode HTTP non trouvée !"
#: actions/apistatusesshow.php:141
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported format: %s"
-msgstr "Format non supporté."
+msgstr "Format non supporté : %s"
#. TRANS: Client error displayed requesting a deleted status.
#: actions/apistatusesshow.php:152
@@ -987,19 +1007,19 @@ msgstr "Statut supprimé."
msgid "No status with that ID found."
msgstr "Aucun statut trouvé avec cet identifiant."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
-msgstr ""
+msgstr "Vous ne pouvez supprimer qu’en utilisant le format Atom."
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Impossible de supprimer cet avis."
-#: actions/apistatusesshow.php:247
-#, fuzzy, php-format
+#: actions/apistatusesshow.php:243
+#, php-format
msgid "Deleted notice %d"
-msgstr "Supprimer cet avis"
+msgstr "A supprimé l’avis %d"
#. TRANS: Client error displayed when the parameter "status" is missing.
#: actions/apistatusesupdate.php:221
@@ -1123,37 +1143,64 @@ msgstr "Avis marqués avec %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Mises à jour marquées avec %1$s dans %2$s !"
-#: actions/apitimelineuser.php:300
-#, fuzzy
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
msgid "Only the user can add to their own timeline."
-msgstr "L’accès à cette boîte de réception est réservé à son utilisateur."
+msgstr "Seul l’utilisateur peut ajouter des éléments son flux."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
-msgstr ""
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+#, fuzzy
+msgid "Only accept AtomPub for Atom feeds."
+msgstr "N’accepter que des AtomPub pour les flux atom."
-#: actions/apitimelineuser.php:316
+#: actions/apitimelineuser.php:310
+#, fuzzy
+msgid "Atom post must not be empty."
+msgstr "Une publication Atom doit être une entrée « Atom »."
+
+#: actions/apitimelineuser.php:315
+#, fuzzy
+msgid "Atom post must be well-formed XML."
+msgstr "Une publication Atom doit être une entrée « Atom »."
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
-msgstr ""
+msgstr "Une publication Atom doit être une entrée « Atom »."
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
-msgstr ""
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+#, fuzzy
+msgid "Can only handle POST activities."
+msgstr "Ne peut gérer que les activités de publication."
-#: actions/apitimelineuser.php:334
-#, php-format
-msgid "Cannot handle activity object type \"%s\""
-msgstr ""
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
+#, fuzzy, php-format
+msgid "Cannot handle activity object type \"%s\"."
+msgstr "Ne peut gérer l’objet d’activité de type « %s »"
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Chercher dans le contenu des avis"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
+#, php-format
msgid "Notice with URI \"%s\" already exists."
-msgstr "Aucun avis avec cet identifiant n’existe."
+msgstr "L’avis d’URI « %s » existe déjà."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
+msgstr "Publication AtomPost avec l’URI d’attention inconnu %s"
#. TRANS: Server error for unfinished API method showTrends.
#: actions/apitrends.php:85
@@ -1165,6 +1212,150 @@ msgstr "Méthode API en construction."
msgid "User not found."
msgstr "Page non trouvée."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Profil non-trouvé."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Impossible d’insérer un nouvel abonnement."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+#, fuzzy
+msgid "Can only handle Favorite activities."
+msgstr "Ne peut gérer que les activités de publication."
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Ne peut gérer que les activités de publication."
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Inconnu"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Ajouter aux favoris"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Profil non-trouvé."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "Membres du groupe %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Groupes de %s"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+#, fuzzy
+msgid "Can only handle Join activities."
+msgstr "Ne peut gérer que les activités de publication."
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Inconnu"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Tous les membres"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Fichier non trouvé."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Impossible de supprimer le favori."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Aucun groupe trouvé."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Tous les membres"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "Méthode HTTP non trouvée !"
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Profil non-trouvé."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Vous n’êtes pas abonné(e) à ce profil."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Impossible de supprimer l’abonnement à soi-même."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Abonnés de %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+#, fuzzy
+msgid "Can only handle Follow activities."
+msgstr "Ne peut gérer que les activités de publication."
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Type de fichier inconnu"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1452,8 +1643,8 @@ msgstr "Cette adresse a déjà été confirmée."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1978,12 +2169,12 @@ msgstr "Configurez les courriels que vous souhaitez recevoir de %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "Adresse électronique"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Adresse courriel actuellement confirmée."
@@ -1992,14 +2183,14 @@ msgstr "Adresse courriel actuellement confirmée."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Enlever"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2012,14 +2203,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "Adresse de courriel (ex : nom@example.org)"
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2027,112 +2218,119 @@ msgstr "Ajouter"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Courriel entrant"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Je veux envoyer mes avis par courriel."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Écrivez à cette adresse courriel pour poster de nouveaux avis."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Nouvelle adresse courriel pour poster ; annule l’ancienne."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Nouveau"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Préférences de courrier électronique"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Avertissez-moi par courriel des nouveaux abonnements."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Envoyez-moi un courriel quand un utilisateur ajoute un de mes avis à ses "
"favoris."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Envoyez-moi un courriel quand quelqu’un m’envoie un message personnel."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Envoyez-moi un courriel quand quelqu’un m’envoie une réponse « @ »."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Autoriser mes amis à m’envoyer des courriels et des clins d’œil."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Je veux envoyer mes avis par courriel."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Publier un MicroID pour mon adresse courriel."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "Préférences de courrier électronique enregistrées."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Aucune adresse électronique."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Impossible d’utiliser cette adresse courriel"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Adresse courriel invalide."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Vous utilisez déjà cette adresse courriel."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Cette adresse courriel appartient déjà à un autre utilisateur."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Impossible d’insérer le code de confirmation."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2143,56 +2341,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Aucune confirmation à annuler."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Cette adresse de messagerie électronique est erronée."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Impossible de supprimer le courriel de confirmation."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Confirmation de courrier électronique annulée."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Ceci n’est pas votre adresse courriel."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "L’adresse électronique a été supprimée."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Aucune adresse de courriel entrant."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Impossible de mettre à jour le dossier de l’utilisateur."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "L’adresse de courriel entrant a été supprimée."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Nouvelle adresse de courriel entrant ajoutée."
@@ -5436,7 +5634,7 @@ msgstr "Vous n’êtes pas abonné(e) à ce profil."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Impossible d’enregistrer l’abonnement."
@@ -5444,10 +5642,6 @@ msgstr "Impossible d’enregistrer l’abonnement."
msgid "This action only accepts POST requests."
msgstr "Cette action n'accepte que les requêtes de type POST."
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Profil non-trouvé."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
@@ -5515,13 +5709,6 @@ msgstr ""
"%s n’a pas d’abonnés. Vous pourriez [créer un compte](%%%%action.register%%%"
"%) et être le premier ?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "Abonnements de %s"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5571,13 +5758,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s ne suit actuellement personne."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Flux des avis de %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5991,13 +6183,13 @@ msgid "Author(s)"
msgstr "Auteur(s)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Ajouter à mes favoris"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%1$s a marqué l’avis %2$s comme favori."
@@ -6059,42 +6251,42 @@ msgid "Invalid filename."
msgstr "Nom de fichier non valide."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "L’inscription au groupe a échoué."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "N’appartient pas au groupe."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "La désinscription du groupe a échoué."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr "L’identifiant de profil « %s » est invalide."
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
-#, fuzzy, php-format
+#: classes/Group_member.php:98
+#, php-format
msgid "Group ID %s is invalid."
-msgstr "Erreur lors de l’enregistrement de l’utilisateur ; invalide."
+msgstr "L’identifiant de groupe %s est invalide."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Rejoindre"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr "%1$s a rejoint le groupe %2$s."
@@ -6122,12 +6314,12 @@ msgid "You are banned from sending direct messages."
msgstr "Il vous est interdit d’envoyer des messages directs."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Impossible d’insérer le message."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Impossible de mettre à jour le message avec un nouvel URI."
@@ -6145,17 +6337,17 @@ msgid "Database error inserting hashtag: %s"
msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Problème lors de l’enregistrement de l’avis ; trop long."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Erreur lors de l’enregistrement de l’avis. Utilisateur inconnu."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6163,7 +6355,7 @@ msgstr ""
"minutes."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6172,36 +6364,36 @@ msgstr ""
"dans quelques minutes."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Il vous est interdit de poster des avis sur ce site."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Problème lors de l’enregistrement de l’avis."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr "Le type renseigné pour la méthode saveKnownGroups() est incorrect."
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "Problème lors de l’enregistrement de la boîte de réception du groupe."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Impossible d’enregistrer la réponse à %1$d, %2$d."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6215,7 +6407,7 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
@@ -6224,7 +6416,7 @@ msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6242,48 +6434,48 @@ msgid "Unable to save tag."
msgstr "Impossible d’enregistrer l’étiquette."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "Il vous a été interdit de vous abonner."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Déjà abonné !"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "Cet utilisateur vous a bloqué."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Pas abonné !"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Impossible de supprimer l’abonnement à soi-même."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Impossible de supprimer le jeton OMB de l'abonnement."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Impossible de supprimer l’abonnement"
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr "Suivre"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s suit à présent %2$s."
@@ -6657,10 +6849,15 @@ msgid "Before"
msgstr "Avant"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr "Attendait un élément racine mais a reçu tout un document XML."
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Photo"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -6840,10 +7037,10 @@ msgstr "Icône pour cette application"
#. TRANS: Form input field instructions.
#. TRANS: %d is the number of available characters for the description.
#: lib/applicationeditform.php:201
-#, fuzzy, php-format
+#, php-format
msgid "Describe your application in %d character"
msgid_plural "Describe your application in %d characters"
-msgstr[0] "Décrivez votre application en %d caractères"
+msgstr[0] "Décrivez votre application en %d caractère"
msgstr[1] "Décrivez votre application en %d caractères"
#. TRANS: Form input field instructions.
@@ -6947,9 +7144,8 @@ msgid "Revoke"
msgstr "Révoquer"
#: lib/atom10feed.php:112
-#, fuzzy
msgid "author element must contain a name element."
-msgstr "l’élément « auteur » doit contenir un élément « nom »."
+msgstr "l’élément « author » doit contenir un élément « name »."
#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:294
@@ -6973,15 +7169,13 @@ msgstr "Marques de cette pièce jointe"
#. TRANS: Exception thrown when a password change fails.
#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
-#, fuzzy
msgid "Password changing failed."
-msgstr "La modification du mot de passe a échoué"
+msgstr "La modification du mot de passe a échoué."
#. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
#: lib/authenticationplugin.php:238
-#, fuzzy
msgid "Password changing is not allowed."
-msgstr "La modification du mot de passe n’est pas autorisée"
+msgstr "La modification du mot de passe n’est pas autorisée."
#. TRANS: Title for the form to block a user.
#: lib/blockform.php:68
@@ -6995,9 +7189,8 @@ msgstr "Résultats de la commande"
#. TRANS: Title for command results.
#: lib/channel.php:194
-#, fuzzy
msgid "AJAX error"
-msgstr "Erreur Ajax"
+msgstr "Erreur AJAX"
#. TRANS: E-mail subject when a command has completed.
#: lib/channel.php:233 lib/mailhandler.php:143
@@ -7416,7 +7609,6 @@ msgstr "Aller au programme d’installation"
#. TRANS: Menu item for Instant Messaging settings.
#: lib/connectsettingsaction.php:106
-#, fuzzy
msgctxt "MENU"
msgid "IM"
msgstr "IM"
@@ -7428,7 +7620,6 @@ msgstr "Suivi des avis par messagerie instantanée"
#. TRANS: Menu item for Short Message Service settings.
#: lib/connectsettingsaction.php:113
-#, fuzzy
msgctxt "MENU"
msgid "SMS"
msgstr "SMS"
@@ -7440,7 +7631,6 @@ msgstr "Suivi des avis par SMS"
#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
-#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Connexions"
@@ -8236,15 +8426,13 @@ msgstr "Envoyer un message direct"
#. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
#: lib/messageform.php:137
-#, fuzzy
msgid "Select recipient:"
-msgstr "Sélectionner une licence"
+msgstr "Sélectionner le destinataire :"
#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
#: lib/messageform.php:150
-#, fuzzy
msgid "No mutual subscribers."
-msgstr "Pas abonné !"
+msgstr "Aucun abonné réciproque."
#: lib/messageform.php:153
msgid "To"
@@ -8260,24 +8448,24 @@ msgid "Send"
msgstr "Envoyer"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Les pseudos ne peuvent contenir que des caractères minuscules et des "
"chiffres, sans espaces."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
-msgstr ""
+msgstr "Le pseudonyme ne peut pas être vide."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Le pseudonyme ne peut pas contenir plus de %d caractère."
+msgstr[1] "Le pseudonyme ne peut pas contenir plus de %d caractères."
#: lib/noticeform.php:160
msgid "Send a notice"
@@ -8515,7 +8703,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Révoquer le rôle « %s » de cet utilisateur"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
msgid "Page not found."
msgstr "Page non trouvée."
@@ -8771,17 +8959,17 @@ msgid "Moderator"
msgstr "Modérateur"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "il y a quelques secondes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "il y a 1 minute"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8789,12 +8977,12 @@ msgstr[0] "il y a environ une minute"
msgstr[1] "il y a environ %d minutes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "il y a 1 heure"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8802,12 +8990,12 @@ msgstr[0] "il y a environ une heure"
msgstr[1] "il y a environ %d heures"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "il y a 1 jour"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8815,12 +9003,12 @@ msgstr[0] "il y a environ un jour"
msgstr[1] "il y a environ %d jours"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "il y a 1 mois"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8828,7 +9016,7 @@ msgstr[0] "il y a environ un mois"
msgstr[1] "il y a environ %d mois"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "il y a environ 1 an"
@@ -8867,14 +9055,13 @@ msgstr[1] ""
#. TRANS: Exception.
#: lib/xrd.php:64
-#, fuzzy
msgid "Invalid XML."
-msgstr "Taille incorrecte."
+msgstr "XML invalide."
#. TRANS: Exception.
#: lib/xrd.php:69
msgid "Invalid XML, missing XRD root."
-msgstr ""
+msgstr "XML invalide, racine XRD manquante."
#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
#: scripts/restoreuser.php:61
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 6033f0d5b..a576a5b95 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -9,18 +9,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:02+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:43+0000\n"
"Language-Team: Irish <http://translatewiki.net/wiki/Portal:ga>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ga\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=5; plural=(n == 1) ? 0 : ( (n == 2) ? 1 : ( (n < 7) ? "
"2 : ( (n < 11) ? 3 : 4 ) ) );\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -92,11 +92,11 @@ msgstr "Configuracións de Twitter"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
#, fuzzy
@@ -384,20 +384,38 @@ msgstr "Non se puideron gardar os teus axustes de Twitter!"
msgid "Could not update your design."
msgstr "Non se puido actualizar o usuario."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "Liña de tempo de %s"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Tódalas subscricións"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Favoritos"
+
+#: actions/apiatomservice.php:123
+#, php-format
+msgid "%s memberships"
+msgstr ""
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
#, fuzzy
@@ -769,7 +787,7 @@ msgstr "Non estás suscrito a ese perfil"
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -807,7 +825,7 @@ msgstr "Erro ó inserir o hashtag na BD: %s"
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -876,7 +894,7 @@ msgstr "Contrasinal"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
#, fuzzy
@@ -953,7 +971,8 @@ msgstr "Non deberías eliminar o estado de outro usuario"
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Ningún chío."
@@ -970,7 +989,10 @@ msgstr "Non se pode activar a notificación."
msgid "Already repeated that notice."
msgstr "Non se pode eliminar este chíos."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "Método da API non atopado"
@@ -991,16 +1013,16 @@ msgstr "Avatar actualizado."
msgid "No status with that ID found."
msgstr "Non existe ningún estado con esa ID atopada."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Non se pode eliminar este chíos."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "Eliminar chío"
@@ -1130,34 +1152,58 @@ msgstr "Chíos tagueados con %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualizacións dende %1$s en %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "Só o usuario pode ler os seus propios buzóns."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Atopar no contido dos chíos"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "Non se atopou un perfil con ese ID."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1172,6 +1218,146 @@ msgstr "Método da API en contrución."
msgid "User not found."
msgstr "Método da API non atopado"
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Ningún chío."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Non se puido inserir a nova subscrición."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Atopar no contido dos chíos"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Acción descoñecida"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Engadir a favoritos"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Ningún chío."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "Non se pode gardar a subscrición."
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "%1s non é unha orixe fiable."
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Acción descoñecida"
+
+#: actions/atompubmembershipfeed.php:263
+msgid "Already a member."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Ningún chío."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Non se puido eliminar o favorito."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Non existe a etiqueta."
+
+#: actions/atompubshowmembership.php:90
+msgid "Not a member"
+msgstr ""
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "Método da API non atopado"
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Ningún chío."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Non estás suscrito a ese perfil"
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Non se pode gardar a subscrición."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Suscrito a %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "tipo de ficheiro non soportado"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1469,8 +1655,8 @@ msgstr "Esa dirección xa foi confirmada."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -2029,13 +2215,13 @@ msgstr "Xestina como recibir correo dende %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
#, fuzzy
msgid "Email address"
msgstr "Enderezos de correo"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Direccións de correo confirmadas actualmente."
@@ -2044,14 +2230,14 @@ msgstr "Direccións de correo confirmadas actualmente."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Recuperar"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2065,14 +2251,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "Dirección de correo, coma \"Nomede Usuario@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
#, fuzzy
msgctxt "BUTTON"
@@ -2081,113 +2267,120 @@ msgstr "Engadir"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Correo Entrante"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Quero enviar chíos dende o mail."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Enviar un correo a esta dirección para enviar novos chíos."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Crear unha nova dirección de correo para enviar, elimina a antiga."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Novo"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Enderezos de correo"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Envíame chios de novas suscricións por email."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Enviar un correo cando alguen enganda un chío meu coma favorito."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Enviarme un email cando alguén me envíe unha mensaxe privada."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Enviarme un email cando alguén me envíe unha mensaxe privada."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Permitir aos amigos darme toques e enviarme correos electrónicos."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Quero enviar chíos dende o mail."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Publicar unha MicroID dende a miña dirección de correo."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
#, fuzzy
msgid "Email preferences saved."
msgstr "Preferencias gardadas."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Non se inseriu unha dirección de correo"
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Esa dirección de correo non se pode normalizar "
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Non é un enderezo de correo válido."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Xa é o teu enderezo de correo."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Este enderezo de correo xa pertence a outro usuario."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Non se puido inserir o código de confirmación."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2199,57 +2392,57 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Non hai ningunha confirmación pendente para cancelar."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
#, fuzzy
msgid "That is the wrong email address."
msgstr "Esa é unha enderezo IM incorrecto."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Non se pode eliminar a confirmación de email."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Non hai ningunha confirmación pendente para cancelar."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Esa non é a túa dirección de correo."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "Dirección de correo entrante eliminada."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Non hai direccións de correo entrante"
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Non se puido actualizar o rexistro de usuario."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Dirección de correo entrante eliminada."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Engadida nova dirección de correo entrante."
@@ -5519,7 +5712,7 @@ msgstr "Non estás suscrito a ese perfil"
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Non se pode gardar a subscrición."
@@ -5527,11 +5720,6 @@ msgstr "Non se pode gardar a subscrición."
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "Ningún chío."
-
#: actions/subscribe.php:117
#, fuzzy
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
@@ -5594,13 +5782,6 @@ msgid ""
"%) and be the first?"
msgstr ""
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Tódalas subscricións"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5644,13 +5825,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%1$s está a escoitar os teus chíos %2$s."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Fonte para os amigos de %s"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber."
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -6064,13 +6250,13 @@ msgid "Author(s)"
msgstr ""
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Gostame"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "Enviar un correo cando alguen enganda un chío meu coma favorito."
@@ -6134,46 +6320,46 @@ msgid "Invalid filename."
msgstr "Tamaño inválido."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
#, fuzzy
msgid "Group join failed."
msgstr "Non existe o perfil."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
#, fuzzy
msgid "Not part of group."
msgstr "Non se puido actualizar o usuario."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
#, fuzzy
msgid "Group leave failed."
msgstr "Non existe o perfil."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "Acounteceu un erro gardando o usuario: é inválido."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
#, fuzzy
msgid "Join"
msgstr "Inicio de sesión"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6203,12 +6389,12 @@ msgid "You are banned from sending direct messages."
msgstr "Erro ó enviar a mensaxe directa."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Non se pode inserir unha mensaxe."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Non se puido actualizar a mensaxe coa nova URI."
@@ -6226,18 +6412,18 @@ msgid "Database error inserting hashtag: %s"
msgstr "Acounteceu un erro ó inserir o avatar"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Aconteceu un erro ó gardar o chío."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6245,7 +6431,7 @@ msgstr ""
"duns minutos."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -6255,37 +6441,37 @@ msgstr ""
"duns minutos."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Tes restrinxido o envio de chíos neste sitio."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Aconteceu un erro ó gardar o chío."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Aconteceu un erro ó gardar o chío."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Non se pode gardar a subscrición."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6299,14 +6485,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6323,51 +6509,51 @@ msgid "Unable to save tag."
msgstr "Non se poden gardar as etiquetas."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Este usuario non che permite suscribirte a el."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
#, fuzzy
msgid "Already subscribed!"
msgstr "Non está suscrito!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "O usuario bloqueoute."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
#, fuzzy
msgid "Not subscribed!"
msgstr "Non está suscrito!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Non se pode gardar a subscrición."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Non se pode gardar a subscrición."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Non se pode gardar a subscrición."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s está a escoitar os teus chíos %2$s."
@@ -6761,10 +6947,14 @@ msgid "Before"
msgstr "Antes »"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+msgid "Post"
+msgstr ""
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8362,17 +8552,17 @@ msgid "Send"
msgstr "Enviar"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "O alcume debe ter só letras minúsculas e números, e sen espazos."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8634,7 +8824,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr ""
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "Método da API non atopado"
@@ -8906,17 +9096,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "fai uns segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "fai un minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8927,12 +9117,12 @@ msgstr[3] ""
msgstr[4] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "fai unha hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8943,12 +9133,12 @@ msgstr[3] ""
msgstr[4] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "fai un día"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8959,12 +9149,12 @@ msgstr[3] ""
msgstr[4] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "fai un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8975,7 +9165,7 @@ msgstr[3] ""
msgstr[4] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "fai un ano"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 42afe39ec..23654f9d4 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:04+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:44+0000\n"
"Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: gl\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -87,11 +87,11 @@ msgstr "Gardar a configuración de acceso"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -382,20 +382,38 @@ msgstr "Non se puido gardar a súa configuración de deseño."
msgid "Could not update your design."
msgstr "Non se puido actualizar o seu deseño."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "Liña do tempo de %s"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s subscricións"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Favoritas"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "Membros do grupo %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -751,7 +769,7 @@ msgstr "Non está autorizado."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -790,7 +808,7 @@ msgstr ""
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -864,7 +882,7 @@ msgstr "Contrasinal"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -938,7 +956,8 @@ msgstr "Non pode borrar o estado doutro usuario."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Non existe tal nota."
@@ -954,7 +973,10 @@ msgstr "Non pode repetir a súa propia nota."
msgid "Already repeated that notice."
msgstr "Xa repetiu esa nota."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "Non se atopou o método da API."
@@ -974,16 +996,16 @@ msgstr "Borrouse o estado."
msgid "No status with that ID found."
msgstr "Non se atopou ningún estado con esa ID."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Non se pode borrar esta nota."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "Borrar a nota"
@@ -1110,34 +1132,58 @@ msgstr "Notas etiquetadas con %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualizacións etiquetadas con %1$s en %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "Só o usuario pode ler as súas caixas de entrada."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Buscar nos contidos das notas"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "Non hai ningunha nota con esa id."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1153,6 +1199,147 @@ msgstr "Método API en desenvolvemento."
msgid "User not found."
msgstr "Non se atopou o método da API."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Non existe ese perfil."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Non se puido inserir unha subscrición nova."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Buscar nos contidos das notas"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Descoñecida"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Engadir aos favoritos"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Non existe ese perfil."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "Membros do grupo %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Grupos aos que pertence %s"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Descoñecida"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Todos os membros"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Non existe tal ficheiro."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Non se puido eliminar o favorito."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Non existe tal grupo."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Todos os membros"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "Non se atopou o método da API."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Non existe ese perfil."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Non está subscrito a ese perfil."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Non se puido borrar a subscrición a si mesmo."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Persoas subscritas a %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Non se coñece o tipo de ficheiro"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1440,8 +1627,8 @@ msgstr "Ese enderezo xa se confirmou."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1974,12 +2161,12 @@ msgstr "Xestiona a forma en que recibes correo electrónico de %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "Enderezo de correo electrónico"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Enderezo de correo electrónico confirmado actualmente."
@@ -1988,14 +2175,14 @@ msgstr "Enderezo de correo electrónico confirmado actualmente."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Borrar"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2008,14 +2195,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "Enderezo de correo electrónico, coma \"nomedeusuario@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2023,117 +2210,124 @@ msgstr "Engadir"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Correo entrante"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Quero publicar notas por correo electrónico."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
"Enviar un correo electrónico a este enderezo para publicar novas notas."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Establece un novo enderezo de correo electrónico no que publicar, e cancela "
"o vello."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Novo"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Preferencias de correo electrónico"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Enviarme notas acerca de novas subscricións por correo electrónico."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Enviádeme un correo electrónico cando alguén marque como favorito algunha "
"das miñas notas."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr ""
"Enviádeme un correo electrónico cando alguén me envíe unha mensaxe privada."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Enviádeme un correo electrónico cando alguén me envíe unha resposta."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr ""
"Permitirlles aos meus amigos facerme acenos e enviarme correos electrónicos."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Quero publicar notas por correo electrónico."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Publicar unha MicroID para o meu enderezo de correo electrónico."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "Gardáronse as preferencias de correo electrónico."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Non hai enderezo de correo electrónico."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Non se pode normalizar ese enderezo de correo electrónico"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "O enderezo de correo electrónico é incorrecto."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Ese enderezo de correo electrónico é o que ten agora."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Ese enderezo de correo electrónico xa pertence a outro usuario."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Non se puido inserir o código de confirmación."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2145,56 +2339,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Non hai ningunha confirmación pendente que cancelar."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Ese enderezo de correo electrónico é incorrecto."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Non se puido borrar a confirmación por correo electrónico."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Cancelouse a confirmación por correo electrónico."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Ese non é o seu enderezo de correo electrónico."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "Borrouse o enderezo de correo electrónico."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Non hai ningún enderezo ao que enviar."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Non se puido actualizar o rexistro do usuario."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Borrouse o enderezo de correo electrónico entrante."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Engadiuse un novo enderezo de correo electrónico entrante."
@@ -5438,7 +5632,7 @@ msgstr "Non está subscrito a ese perfil."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Non se puido gardar a subscrición."
@@ -5446,10 +5640,6 @@ msgstr "Non se puido gardar a subscrición."
msgid "This action only accepts POST requests."
msgstr "Esta acción só permite solicitudes POST."
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Non existe ese perfil."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr "Non se pode subscribir a un perfil remoto OMB 0.1 con esta acción."
@@ -5516,13 +5706,6 @@ msgstr ""
"%s non ten subscritores. Por que non [rexistrar unha conta](%%%%action."
"register%%%%) e ser o primeiro?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "%s subscricións"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5571,13 +5754,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s non está seguindo a ninguén."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Fonte de novas das notas para %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5989,13 +6177,13 @@ msgid "Author(s)"
msgstr "Autores"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Marcar como favorito"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%1$s marcou a nota %2$s como favorita"
@@ -6055,42 +6243,42 @@ msgid "Invalid filename."
msgstr "Nome de ficheiro incorrecto."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Non se puido unir ao grupo."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "Non forma parte do grupo."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "Non se puido deixar o grupo."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr "A identificación do perfil, %s, é incorrecta."
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "Houbo un erro ao gardar o usuario. Incorrecto."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Unirse"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr "%1$s uniuse ao grupo %2$s."
@@ -6118,12 +6306,12 @@ msgid "You are banned from sending direct messages."
msgstr "Prohibíuselle enviar mensaxes directas de momento."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Non se puido inserir a mensaxe."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Non se puido actualizar a mensaxe co novo URI."
@@ -6141,17 +6329,17 @@ msgid "Database error inserting hashtag: %s"
msgstr "Houbo un erro na base de datos ao intentar inserir a etiqueta: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Houbo un problema ao gardar a nota. É longa de máis."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Houbo un problema ao gardar a nota. Descoñécese o usuario."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6159,7 +6347,7 @@ msgstr ""
"publicar nuns minutos."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6168,37 +6356,37 @@ msgstr ""
"publicar nuns minutos."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Prohibíuselle publicar notas neste sitio de momento."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Houbo un problema ao gardar a nota."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
#, fuzzy
msgid "Bad type provided to saveKnownGroups."
msgstr "O tipo dado para saveKnownGroups era incorrecto"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "Houbo un problema ao gardar a caixa de entrada do grupo."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Non se puido gardar a resposta a %1$d, %2$d."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6212,7 +6400,7 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
@@ -6220,7 +6408,7 @@ msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6237,48 +6425,48 @@ msgid "Unable to save tag."
msgstr "Non se puido gardar a nota do sitio."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "Prohibíuselle realizar subscricións de momento."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Xa está subscrito!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "O usuario bloqueouno."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Non está subscrito!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Non se puido borrar a subscrición a si mesmo."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Non se puido borrar o pase de subscrición OMB."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Non se puido borrar a subscrición."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr "Seguir"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s xa segue a %2$s."
@@ -6652,11 +6840,16 @@ msgid "Before"
msgstr "Anteriores"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
"Esperábase unha fonte de novas raíz pero recibiuse un documento XML completo."
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Fotografía"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8253,19 +8446,19 @@ msgid "Send"
msgstr "Enviar"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"O alcume debe ter só letras en minúscula e números, e non pode ter espazos "
"en branco."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8508,7 +8701,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Revogarlle o rol \"%s\" a este usuario"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "Non se atopou o método da API."
@@ -8765,17 +8958,17 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "hai uns segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "hai como un minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8783,12 +8976,12 @@ msgstr[0] "hai un minuto"
msgstr[1] "hai %d minutos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "hai como unha hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8796,12 +8989,12 @@ msgstr[0] "hai unha hora"
msgstr[1] "hai %d horas"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "hai como un día"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8809,12 +9002,12 @@ msgstr[0] "hai un día"
msgstr[1] "hai %d días"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "hai como un mes"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8822,7 +9015,7 @@ msgstr[0] "hai un mes"
msgstr[1] "hai %d meses"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "hai como un ano"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index bc5f656fd..f53d6917f 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:06+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:53+0000\n"
"Language-Team: Upper Sorbian <http://translatewiki.net/wiki/Portal:hsb>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: hsb\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
"n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -88,11 +88,11 @@ msgstr "Přistupne nastajenja składować"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -371,20 +371,38 @@ msgstr "Njeje móžno, designowe nastajenja składować."
msgid "Could not update your design."
msgstr "Design njeda so aktualizować."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
-msgstr ""
+msgstr "Hłowny"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr ""
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s abonementow"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Fawority"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "%s skupinskich čłonow"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -513,9 +531,8 @@ msgstr "Njemóžeš slědowanje swójskich aktiwitow blokować."
#. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
#: actions/apifriendshipsexists.php:88
-#, fuzzy
msgid "Two valid IDs or nick names must be supplied."
-msgstr "Dyrbitej so dwaj płaćiwej wužiwarskej ID abo wužiwarskej mjenje podać."
+msgstr "Dyrbitej so dwaj płaćiwej wužiwarskej ID abo wpřimjenje podać."
#. TRANS: Client error displayed when a source user could not be determined showing friendship.
#: actions/apifriendshipsshow.php:131
@@ -740,7 +757,7 @@ msgstr "Naprašowanski token hižo awtorizowany."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -776,7 +793,7 @@ msgstr "Zmylk datoweje banki při zasunjenju oauth_token_association."
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -844,7 +861,7 @@ msgstr "Hesło"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -917,7 +934,8 @@ msgstr "Njemóžeš status druheho wužiwarja zničić."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Zdźělenka njeeksistuje."
@@ -933,15 +951,17 @@ msgstr "Njemóžno twoju zdźělenku wospjetować."
msgid "Already repeated that notice."
msgstr "Tuta zdźělenka bu hižo wospjetowana."
-#: actions/apistatusesshow.php:117
-#, fuzzy
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
-msgstr "API-metoda njenamakana."
+msgstr "HTTP-metoda so njepodpěruje."
#: actions/apistatusesshow.php:141
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported format: %s"
-msgstr "Njepodpěrany format."
+msgstr "Njepodpěrany format: %s"
#. TRANS: Client error displayed requesting a deleted status.
#: actions/apistatusesshow.php:152
@@ -953,24 +973,24 @@ msgstr "Status zničeny."
msgid "No status with that ID found."
msgstr "Žadyn status z tym ID namakany."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Tuta zdźělenka njeda so zničić."
-#: actions/apistatusesshow.php:247
-#, fuzzy, php-format
+#: actions/apistatusesshow.php:243
+#, php-format
msgid "Deleted notice %d"
-msgstr "Zdźělenku wušmórnyć"
+msgstr "Zhašana zdźělenka %d"
#. TRANS: Client error displayed when the parameter "status" is missing.
#: actions/apistatusesupdate.php:221
msgid "Client must provide a 'status' parameter with a value."
-msgstr ""
+msgstr "Klient dyrbi parameter 'status' z hódnotu podać."
#. TRANS: Client error displayed when the parameter "status" is missing.
#. TRANS: %d is the maximum number of character for a notice.
@@ -1087,34 +1107,58 @@ msgstr ""
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Aktualizacije z %1$s na %2$s markěrowane!"
-#: actions/apitimelineuser.php:300
-#, fuzzy
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
msgid "Only the user can add to their own timeline."
-msgstr "Jenož wužiwar móže swoje póstowe kašćiki čitać."
+msgstr "Jenož wužiwar móže swojsku časowu lajstu přidać."
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+#, fuzzy
+msgid "Only accept AtomPub for Atom feeds."
+msgstr "Jenož AtomPub za Atom-kanale akceptować."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
msgstr ""
-#: actions/apitimelineuser.php:316
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
+msgstr ""
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Wobsah zdźělenkow přepytać"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
+#, php-format
msgid "Notice with URI \"%s\" already exists."
-msgstr "Zdźělenka z tym ID njeeksistuje."
+msgstr "Zdźělenka z URI \"%s\" hižo eksistuje."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1129,6 +1173,147 @@ msgstr "API-metoda njeskónčena."
msgid "User not found."
msgstr "Wužiwar njenamakany."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Profil njeeksistuje."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Nowy abonement njeda so zasunyć."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Wobsah zdźělenkow přepytać"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Njeznaty"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "K faworitam přidać"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Profil njeeksistuje."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "%s skupinskich čłonow"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Skupiny, w kotrychž %s je čłon"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Njeznaty"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Wšitcy čłonojo"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Dataja njeeksistuje."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Faworit njeda so zhašeć."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Skupina njeeksistuje."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Wšitcy čłonojo"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "HTTP-metoda so njepodpěruje."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Profil njeeksistuje."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Njejsy tón profil abonował."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Sebjeabonement njeda so zhašeć."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Ludźo, kotřiž su %s abonowali"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Njeznaty datajowy typ"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1412,8 +1597,8 @@ msgstr "Tuta adresa bu hižo wobkrućena."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1624,7 +1809,7 @@ msgstr "Design"
#: actions/designadminpanel.php:74
msgid "Design settings for this StatusNet site"
-msgstr ""
+msgstr "Designowe nastajenja za tute sydło StatusNet"
#: actions/designadminpanel.php:335
msgid "Invalid logo URL."
@@ -1925,12 +2110,12 @@ msgstr ""
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "E-mejlowa adresa"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Aktualna wobkrućena e-mejlowa adresa."
@@ -1939,14 +2124,14 @@ msgstr "Aktualna wobkrućena e-mejlowa adresa."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Wotstronić"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1957,14 +2142,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "E-mejlowa adresa, kaž na př. \"WužiwarskeMjeno@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -1972,110 +2157,117 @@ msgstr "Přidać"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Dochadźaca e-mejl"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Chcu zdźělenki přez e-mejl pósłać."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
-msgstr ""
+msgstr "Pósćel e-mejl na tutu adresu, zo by nowe zdźělenki pósłał."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Nowy"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "E-mejlowe nastajenja"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
-msgstr ""
+msgstr "Pósćel mi zdźělenki wo nowych abonementach přez e-mejl."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "E-mejl pósłać, hdyž něchtó moju powěsć jako faworit přidawa."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "E-mejl pósłać, hdyž něchtó priwatnu powěsć sćele."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "E-mejl pósłać, hdyž něchtó mi \"@-reply\" sćele."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
-msgstr ""
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Chcu zdźělenki přez e-mejl pósłać."
+msgstr "Přećelam dowolić mje storkać a mi e-mejl pósłać."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "MicroID za moju e-mejlowu adresu publikować"
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "E-mejlowe nastajenja składowane."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Žana e-mejlowa adresa."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Tuta e-mejlowa adresa njehodźi so normalizować"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Njepłaćiwa e-mejlowa adresa."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "To je hižo twoja e-mejlowa adresa."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Ta e-mejlowa adresa hižo słuša k druhemu wužiwarjej."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Wobkrućenski kod njehodźi so zasunyć."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2084,56 +2276,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Njeje žane njesćinjene wobkrućenje, kotrež da so přetorhnyć,"
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "To je wopačna e-mejlowa adresa."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "E-mejlowe wobkrućenje njeda so zhašeć."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "E-mejlowe wobkrućenje přetorhnjene."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "To njeje twoja e-mejlowa adresa."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "E-mejlowa adresa bu wotstronjena."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Žana adresa za dochadźace e-mejle."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Datowa sadźba wužiwarja njeda so aktualizować."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Adresa za dochadźaće e-mejle wotstronjena."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Nowa adresa za dochadźace e-mejle přidata."
@@ -2420,13 +2612,13 @@ msgstr "Administrator"
#: actions/groupmembers.php:399
msgctxt "BUTTON"
msgid "Block"
-msgstr ""
+msgstr "Blokować"
#. TRANS: Submit button title.
#: actions/groupmembers.php:403
msgctxt "TOOLTIP"
msgid "Block this user"
-msgstr ""
+msgstr "Tutoho wužiwarja blokować"
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
@@ -2436,13 +2628,13 @@ msgstr "Wužiwarja k administratorej skupiny činić"
#: actions/groupmembers.php:533
msgctxt "BUTTON"
msgid "Make Admin"
-msgstr ""
+msgstr "K administratorej činić"
#. TRANS: Submit button title.
#: actions/groupmembers.php:537
msgctxt "TOOLTIP"
msgid "Make this user an admin"
-msgstr ""
+msgstr "Tutoho wužiwarja k administratorej činić"
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
#: actions/grouprss.php:142
@@ -2580,7 +2772,7 @@ msgstr "IM-nastajenja"
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:163
msgid "Send me notices through Jabber/GTalk."
-msgstr ""
+msgstr "Pósćel mi zdźělenki přez Jabber/GTalk."
#. TRANS: Checkbox label in IM preferences form.
#: actions/imsettings.php:169
@@ -2800,7 +2992,7 @@ msgstr "Pósłać"
#: actions/invite.php:263
#, php-format
msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+msgstr "%1$s je će přeprosył, na %2$s sobu činić"
#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral
#. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, %2$s is the
@@ -2865,15 +3057,15 @@ msgstr "%1$s je skupinu %2$s wopušćił"
#: actions/licenseadminpanel.php:56
msgctxt "TITLE"
msgid "License"
-msgstr ""
+msgstr "Licenca"
#: actions/licenseadminpanel.php:67
msgid "License for this StatusNet site"
-msgstr ""
+msgstr "Licenca za tute sydło StatusNet"
#: actions/licenseadminpanel.php:139
msgid "Invalid license selection."
-msgstr ""
+msgstr "Njepłaćiwy wuběr licency."
#: actions/licenseadminpanel.php:149
msgid ""
@@ -2887,23 +3079,23 @@ msgstr "Njepłaćiwy titul licency. Maksimalna dołhosć je 255 znamješkow."
#: actions/licenseadminpanel.php:168
msgid "Invalid license URL."
-msgstr ""
+msgstr "Njepłaćiwy URL licency."
#: actions/licenseadminpanel.php:171
msgid "Invalid license image URL."
-msgstr ""
+msgstr "Njepłaćiwy URL wobraza licency."
#: actions/licenseadminpanel.php:179
msgid "License URL must be blank or a valid URL."
-msgstr ""
+msgstr "Licencowy URL dyrbi prózdny abo płaćiwy URL być."
#: actions/licenseadminpanel.php:187
msgid "License image must be blank or valid URL."
-msgstr ""
+msgstr "Licencowy wobraz dyrbi prózdny abo płaćiwy URL być."
#: actions/licenseadminpanel.php:239
msgid "License selection"
-msgstr ""
+msgstr "Wuběr licency"
#: actions/licenseadminpanel.php:245
msgid "Private"
@@ -2911,27 +3103,27 @@ msgstr "Priwatny"
#: actions/licenseadminpanel.php:246
msgid "All Rights Reserved"
-msgstr ""
+msgstr "Wšě prawa wuměnjene."
#: actions/licenseadminpanel.php:247
msgid "Creative Commons"
-msgstr ""
+msgstr "Cresative Commons"
#: actions/licenseadminpanel.php:252
msgid "Type"
-msgstr ""
+msgstr "Typ"
#: actions/licenseadminpanel.php:254
msgid "Select license"
-msgstr ""
+msgstr "Licencu wubrać"
#: actions/licenseadminpanel.php:268
msgid "License details"
-msgstr ""
+msgstr "Podrobnosće licency"
#: actions/licenseadminpanel.php:274
msgid "Owner"
-msgstr ""
+msgstr "Wobsedźer"
#: actions/licenseadminpanel.php:275
msgid "Name of the owner of the site's content (if applicable)."
@@ -2939,31 +3131,31 @@ msgstr ""
#: actions/licenseadminpanel.php:283
msgid "License Title"
-msgstr ""
+msgstr "Titul licency"
#: actions/licenseadminpanel.php:284
msgid "The title of the license."
-msgstr ""
+msgstr "Titul licency."
#: actions/licenseadminpanel.php:292
msgid "License URL"
-msgstr ""
+msgstr "URL licency"
#: actions/licenseadminpanel.php:293
msgid "URL for more information about the license."
-msgstr ""
+msgstr "URL za dalše informacije wo licency."
#: actions/licenseadminpanel.php:300
msgid "License Image URL"
-msgstr ""
+msgstr "URL wobraza licency"
#: actions/licenseadminpanel.php:301
msgid "URL for an image to display with the license."
-msgstr ""
+msgstr "URL za wobraz, kotryž ma so z licencu zwobraznić."
#: actions/licenseadminpanel.php:319
msgid "Save license settings"
-msgstr ""
+msgstr "Licencne nastajenja składować"
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
@@ -3203,7 +3395,7 @@ msgstr "Zwjazane aplikacije"
#. TRANS: Instructions for OAuth connection settings.
#: actions/oauthconnectionssettings.php:83
msgid "The following connections exist for your account."
-msgstr ""
+msgstr "Slědowace zwiski za twoje konto eksistuja."
#. TRANS: Client error when trying to revoke access for an application while not being a user of it.
#: actions/oauthconnectionssettings.php:168
@@ -3310,7 +3502,7 @@ msgstr "Profilowe designy sej wobhladać"
#. TRANS: Tooltip for checkbox.
#: actions/othersettings.php:130
msgid "Show or hide profile designs."
-msgstr ""
+msgstr "Profilowe designy pokazać abo schować."
#. TRANS: Form validation error for form "Other settings" in user profile.
#: actions/othersettings.php:162
@@ -3423,7 +3615,7 @@ msgstr "Šćežki"
#. TRANS: Form instructions for Path admin panel.
#: actions/pathsadminpanel.php:69
msgid "Path and server settings for this StatusNet site"
-msgstr ""
+msgstr "Šćežka a serwerowe nastajenja za tute sydło StatusNet"
#. TRANS: Client error in Paths admin panel.
#. TRANS: %s is the directory that could not be read from.
@@ -3457,7 +3649,7 @@ msgstr "Zapis lokalow njeda so čitać: %s"
#. TRANS: %s is the SSL server URL that is too long.
#: actions/pathsadminpanel.php:189
msgid "Invalid SSL server. The maximum length is 255 characters."
-msgstr ""
+msgstr "Njepłaćiwy SSL-serwer. Maksimalna dołhosć je 255 znamješkow."
#. TRANS: Fieldset legend in Paths admin panel.
#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
@@ -3514,7 +3706,7 @@ msgstr "Serwer za šaty."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:290
msgid "Web path to themes."
-msgstr ""
+msgstr "Webšćežka k šatam."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
@@ -3525,7 +3717,7 @@ msgstr "SSL-serwer"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:299
msgid "SSL server for themes (default: SSL server)."
-msgstr ""
+msgstr "SSL-serwer za šaty (standard: SSL-serwer)."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
@@ -3536,7 +3728,7 @@ msgstr "SSL-šćežka"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:308
msgid "SSL path to themes (default: /theme/)."
-msgstr ""
+msgstr "SSL-šćežka k šatam (standard: /theme/)."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
@@ -3597,17 +3789,17 @@ msgstr "Serwer za pozadki."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:381
msgid "Web path to backgrounds."
-msgstr ""
+msgstr "Webšćežka k pozadkam."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:390
msgid "Server for backgrounds on SSL pages."
-msgstr ""
+msgstr "Serwer za pozadki na SSL-stronach."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:399
msgid "Web path to backgrounds on SSL pages."
-msgstr ""
+msgstr "Webšćežka k pozadkam na SSL-stronach."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:408
@@ -3638,7 +3830,7 @@ msgstr "Serwer za přiwěški na SSL-stronach."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:454
msgid "Web path to attachments on SSL pages."
-msgstr ""
+msgstr "Serwer za přiwěški na SSL-stronach."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:463
@@ -3832,7 +4024,7 @@ msgstr "Časowe pasmo"
#. TRANS: Tooltip for dropdown list label in form for profile settings.
#: actions/profilesettings.php:187
msgid "What timezone are you normally in?"
-msgstr ""
+msgstr "W kotrym časowym pasmje sy zwjetša?"
#. TRANS: Checkbox label in form for profile settings.
#: actions/profilesettings.php:193
@@ -4165,6 +4357,8 @@ msgstr ""
#: actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr ""
+"1-64 małopisanych pismikow abo ličbow, žane interpunkciske znamješka abo "
+"mjezery. Trěbne."
#: actions/register.php:438
msgid "6 or more characters. Required."
@@ -4843,7 +5037,7 @@ msgstr "Njeznata rěč \"%s\"."
#: actions/siteadminpanel.php:165
msgid "Minimum text limit is 0 (unlimited)."
-msgstr ""
+msgstr "Minimalna tekstowa dołhosć je 0 (njewobmjezowany)."
#: actions/siteadminpanel.php:171
msgid "Dupe limit must be one or more seconds."
@@ -5107,7 +5301,7 @@ msgstr "Žadyn kod zapodaty"
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
#: lib/adminpanelaction.php:395
msgid "Snapshots"
-msgstr ""
+msgstr "Njejapke fota"
#: actions/snapshotadminpanel.php:65
msgid "Manage snapshot configuration"
@@ -5168,7 +5362,7 @@ msgstr "Njejsy tón profil abonował."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Abonement njeda so składować."
@@ -5176,10 +5370,6 @@ msgstr "Abonement njeda so składować."
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Profil njeeksistuje."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr "Njemóžeš zdaleny profil OMB 0.1 z tutej akciju abonować."
@@ -5243,13 +5433,6 @@ msgstr ""
"%s nima abonentow. Čehodla nochceš [konto registrować] (%%%%action.register%%"
"%%) a prěni być?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "%s abonementow"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5289,39 +5472,44 @@ msgstr ""
#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
#. TRANS: as an anonymous user. %s is the user nickname.
#: actions/subscriptions.php:143 actions/subscriptions.php:149
-#, fuzzy, php-format
+#, php-format
msgid "%s is not listening to anyone."
-msgstr "%s čłon w žanej skupinje njeje."
+msgstr "%s na nikoho njesłucha."
+
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Zdźělenski kanal za %s (Atom)"
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
#: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
msgid "Notices tagged with %1$s, page %2$d"
-msgstr "%1$s, strona %2$d"
+msgstr "Zdźělenki su z %1$s woznamjenjene, strona %2$d"
#: actions/tag.php:87
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Powěsćowy kanal za %1$s je %2$s (RSS 1.0) markěrował"
+msgstr "Zdźělenski kanal za tafličku %s (RSS 1.0)"
#: actions/tag.php:93
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Powěsćowy kanal za %1$s je %2$s (RSS 1.0) markěrował"
+msgstr "Zdźělenski kanal za tafličku %s (RSS 2.0)"
#: actions/tag.php:99
-#, fuzzy, php-format
+#, php-format
msgid "Notice feed for tag %s (Atom)"
-msgstr "Powěsćowy kanal za %1$s je %2$s (RSS 1.0) markěrował"
+msgstr "Zdźělenski kanal za tafličku %s (Atom)"
#: actions/tagother.php:39
msgid "No ID argument."
@@ -5357,33 +5545,29 @@ msgid ""
msgstr ""
#: actions/tagother.php:200
-#, fuzzy
msgid "Could not save tags."
-msgstr "Profil njeje so składować dał."
+msgstr "Taflički njedadźa so składować."
#: actions/tagother.php:236
-#, fuzzy
msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr "Wužij tutón formular, zo by aplikaciju wobdźěłał."
+msgstr ""
+"wužij tutón formular, zo by swojim abonentam abo abonementam taflički přidał."
#: actions/tagrss.php:35
-#, fuzzy
msgid "No such tag."
-msgstr "Strona njeeksistuje."
+msgstr "Taflička njeeksistuje."
#: actions/unblock.php:59
msgid "You haven't blocked that user."
msgstr "Njejsy toho wužiwarja zablokował."
#: actions/unsandbox.php:72
-#, fuzzy
msgid "User is not sandboxed."
-msgstr "Wužiwar njeje zablokowany za skupinu."
+msgstr "Wužiwar njeje w pěskowym kašćiku."
#: actions/unsilence.php:72
-#, fuzzy
msgid "User is not silenced."
-msgstr "Wužiwar nima profil."
+msgstr "Wužiwarjej huba zatykana njeje."
#: actions/unsubscribe.php:77
msgid "No profile ID in request."
@@ -5408,7 +5592,7 @@ msgstr "Wužiwar"
#. TRANS: Instruction for user admin panel.
#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site"
-msgstr ""
+msgstr "Wužiwarske nastajenja za sydło StatusNet"
#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
#: actions/useradminpanel.php:147
@@ -5423,7 +5607,7 @@ msgstr ""
#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
#. TRANS: users in user admin panel. %1$s is the invalid nickname.
#: actions/useradminpanel.php:166
-#, fuzzy, php-format
+#, php-format
msgid "Invalid default subscripton: '%1$s' is not a user."
msgstr "Njepłaćiwy standardny abonement: '%1$s' wužiwar njeje."
@@ -5435,9 +5619,8 @@ msgstr "Profil"
#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
#: actions/useradminpanel.php:220
-#, fuzzy
msgid "Bio Limit"
-msgstr "Limity"
+msgstr "Limit biografije"
#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
#: actions/useradminpanel.php:222
@@ -5456,7 +5639,6 @@ msgstr "Powitanje noweho wužiwarja"
#. TRANS: Tooltip in user admin panel for setting new user welcome text.
#: actions/useradminpanel.php:238
-#, fuzzy
msgid "Welcome text for new users (maximum 255 characters)."
msgstr "Powitanski tekst za nowych wužiwarjow (maks. 255 znamješkow)."
@@ -5467,9 +5649,8 @@ msgstr "Standardny abonement"
#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
#: actions/useradminpanel.php:246
-#, fuzzy
msgid "Automatically subscribe new users to this user."
-msgstr "Tutoho wužiwarja abonować"
+msgstr "Nowych wužiwarjow za tutoho wužiwarja abonować."
#. TRANS: Form legend in user admin panel.
#: actions/useradminpanel.php:256
@@ -5489,7 +5670,7 @@ msgstr ""
#. TRANS: Title for button to save user settings in user admin panel.
#: actions/useradminpanel.php:302
msgid "Save user settings"
-msgstr ""
+msgstr "Wužiwarske nastajenja składować"
#: actions/userauthorization.php:105
msgid "Authorize subscription"
@@ -5552,14 +5733,14 @@ msgid ""
msgstr ""
#: actions/userauthorization.php:303
-#, fuzzy, php-format
+#, php-format
msgid "Listener URI ‘%s’ not found here."
-msgstr "URL awatara '%s' njeje płaćiwy"
+msgstr "URI posłucharja'%s' njebu tu namakany"
#: actions/userauthorization.php:308
-#, fuzzy, php-format
+#, php-format
msgid "Listenee URI ‘%s’ is too long."
-msgstr "URL awatara '%s' njeje płaćiwy"
+msgstr "URI posłucharki '%s' je předołhi."
#: actions/userauthorization.php:314
#, php-format
@@ -5567,9 +5748,9 @@ msgid "Listenee URI ‘%s’ is a local user."
msgstr ""
#: actions/userauthorization.php:329
-#, fuzzy, php-format
+#, php-format
msgid "Profile URL ‘%s’ is for a local user."
-msgstr "URL awatara '%s' njeje płaćiwy"
+msgstr "Profilowy URL '%s' je za lokalneho wužiwarja."
#: actions/userauthorization.php:345
#, php-format
@@ -5577,9 +5758,9 @@ msgid "Avatar URL ‘%s’ is not valid."
msgstr "URL awatara '%s' njeje płaćiwy"
#: actions/userauthorization.php:350
-#, fuzzy, php-format
+#, php-format
msgid "Can’t read avatar URL ‘%s’."
-msgstr "Wopačny wobrazowy typ za awatarowy URL '%s'."
+msgstr "Awatarowy URL '%s' njeda so čitać."
#: actions/userauthorization.php:355
#, php-format
@@ -5588,9 +5769,8 @@ msgstr "Wopačny wobrazowy typ za awatarowy URL '%s'."
#. TRANS: Page title for profile design page.
#: actions/userdesignsettings.php:76 lib/designsettings.php:63
-#, fuzzy
msgid "Profile design"
-msgstr "Profilowe nastajenja"
+msgstr "Profilowy design"
#. TRANS: Instructions for profile design page.
#: actions/userdesignsettings.php:87 lib/designsettings.php:74
@@ -5687,28 +5867,27 @@ msgid "Author(s)"
msgstr "Awtorojo"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
-#, fuzzy
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
-msgstr "Fawority"
+msgstr "Faworit"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
-#, fuzzy, php-format
+#: classes/Fave.php:154
+#, php-format
msgid "%1$s marked notice %2$s as a favorite."
-msgstr "%s (@%s) je twoju zdźělenku jako faworit přidał"
+msgstr "%1$s je zdźělenku %2$s jako faworit markěrował."
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:156
#, php-format
msgid "Cannot process URL '%s'"
-msgstr ""
+msgstr "URL '%s' njeda so předźěłać"
#. TRANS: Server exception thrown when... Robin thinks something is impossible!
#: classes/File.php:188
msgid "Robin thinks something is impossible."
-msgstr ""
+msgstr "Robin měni, zo něšto je njemóžno."
#. TRANS: Message given if an upload is larger than the configured maximum.
#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
@@ -5754,42 +5933,42 @@ msgid "Invalid filename."
msgstr "Njepłaćiwe datajowe mjeno."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Přizamknjenje k skupinje je so njeporadźiło."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "Njeje dźěl skupiny."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "Wopušćenje skupiny je so njeporadźiło."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
-msgstr ""
+msgstr "Profilowy ID %s je njepłaćiwy."
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
-#, fuzzy, php-format
+#: classes/Group_member.php:98
+#, php-format
msgid "Group ID %s is invalid."
-msgstr "Zmylk při składowanju wužiwarja; njepłaćiwy."
+msgstr "Skupinski ID %s je njepłaćiwy."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Zastupić"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -5813,27 +5992,25 @@ msgstr ""
#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
#: classes/Message.php:45
-#, fuzzy
msgid "You are banned from sending direct messages."
-msgstr "Zmylk při słanju direktneje powěsće,"
+msgstr "Słanje direktnych powěsćow je ći zakazane."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Powěsć njeda so zasunyć."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
-#, fuzzy
+#: classes/Message.php:80
msgid "Could not update message with new URI."
-msgstr "Powěsć njeda so analyzować."
+msgstr "Powěsć z nowym URI njeda so aktualizować."
#. TRANS: Server exception thrown when a user profile for a notice cannot be found.
#. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
#: classes/Notice.php:98
#, php-format
msgid "No such profile (%1$d) for notice (%2$d)."
-msgstr ""
+msgstr "Žadyn profil (%1$d) za zdźělenku (%2$d)."
#. TRANS: Server exception. %s are the error details.
#: classes/Notice.php:193
@@ -5842,84 +6019,80 @@ msgid "Database error inserting hashtag: %s"
msgstr "Zmylk datoweje banki při zasunjenju hašeje taflički: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
-#, fuzzy
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
-msgstr "Zmylk při składowanju powěsće"
+msgstr "Zmylk při składowanju powěsće. Wona je předołha."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
-#, fuzzy
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
-msgstr "Zmylk při składowanju powěsće"
+msgstr "Zmylk při składowanju powěsće. Njeznaty wužiwar."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
-#, fuzzy
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
-msgstr "Njemóžeš wužiwarske róle na tutym sydle wotwołać."
+msgstr "Słanje zdźělenkow na tutym sydle je ći zakazane."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
-#, fuzzy
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
-msgstr "Zmylk při składowanju powěsće"
+msgstr "Zmylk při składowanju powěsće."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr ""
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
-#, fuzzy, php-format
+#: classes/Notice.php:1126
+#, php-format
msgid "Could not save reply for %1$d, %2$d."
-msgstr "Informacije wo lokalnej skupinje njedachu so składować."
+msgstr "Wotmołwa za %1$d, %2$d njeda so składować."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
#. TRANS: Full name of a profile or group followed by nickname in parens
#: classes/Profile.php:172 classes/User_group.php:247
-#, fuzzy, php-format
+#, php-format
msgctxt "FANCYNAME"
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -5935,49 +6108,48 @@ msgid "Unable to save tag."
msgstr "Njeje móžno, tafličku składować."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
-#, fuzzy
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
-msgstr "Tutón wužiwar ći abonowanje njedowoli."
+msgstr "Abonowanje je ći zakazane."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Hižo abonowany!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "Wužiwar je će zablokował."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Njeje abonowany!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Sebjeabonement njeda so zhašeć."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Znamjo OMB-abonementa njeda so zhašeć."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Abonoment njeda so zhašeć ."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
-msgstr ""
+msgstr "Slědować"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, php-format
msgid "%1$s is now following %2$s."
msgstr ""
@@ -6041,9 +6213,8 @@ msgstr ""
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:132
-#, fuzzy
msgid "Design your profile"
-msgstr "Wužiwarski profil"
+msgstr "Twój profil wuhotować"
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:139
@@ -6070,13 +6241,12 @@ msgstr "Strona bjez titula"
#: lib/action.php:312
msgctxt "TOOLTIP"
msgid "Show more"
-msgstr ""
+msgstr "Wjace pokazać"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
#: lib/action.php:531
-#, fuzzy
msgid "Primary site navigation"
-msgstr "Zakładna sydłowa konfiguracija"
+msgstr "Primarna sydłowa nawigacija"
#. TRANS: Tooltip for main menu option "Personal"
#: lib/action.php:537
@@ -6201,27 +6371,23 @@ msgstr "Pytać"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
#: lib/action.php:620 lib/adminpanelaction.php:387
-#, fuzzy
msgid "Site notice"
msgstr "Sydłowa zdźělenka"
#. TRANS: DT element for local views block. String is hidden in default CSS.
#: lib/action.php:687
-#, fuzzy
msgid "Local views"
-msgstr "Lokalny"
+msgstr "Lokalne napohlady"
#. TRANS: DT element for page notice. String is hidden in default CSS.
#: lib/action.php:757
-#, fuzzy
msgid "Page notice"
-msgstr "Nowa zdźělenka"
+msgstr "Zdźělenka strony"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
#: lib/action.php:858
-#, fuzzy
msgid "Secondary site navigation"
-msgstr "Zakładna sydłowa konfiguracija"
+msgstr "Sekundarna sydłowa nawigacija"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
#: lib/action.php:864
@@ -6241,7 +6407,7 @@ msgstr "Huste prašenja"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
#: lib/action.php:875
msgid "TOS"
-msgstr ""
+msgstr "Wužiwarske wuměnjenja"
#. TRANS: Secondary navigation menu option leading to privacy policy.
#: lib/action.php:879
@@ -6267,7 +6433,7 @@ msgstr ""
#. TRANS: DT element for StatusNet software license.
#: lib/action.php:921
msgid "StatusNet software license"
-msgstr ""
+msgstr "Softwarowa licenca StatusNet"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
#. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6300,9 +6466,8 @@ msgstr ""
#. TRANS: DT element for StatusNet site content license.
#: lib/action.php:954
-#, fuzzy
msgid "Site content license"
-msgstr "Wobsah zdźělenkow přepytać"
+msgstr "Licenca sydłoweho wobsaha"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
@@ -6332,9 +6497,8 @@ msgstr ""
#. TRANS: DT element for pagination (previous/next, etc.).
#: lib/action.php:1340
-#, fuzzy
msgid "Pagination"
-msgstr "Registrowanje"
+msgstr "Paginowanje"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
@@ -6349,10 +6513,15 @@ msgid "Before"
msgstr "Před"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Foto"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -6391,9 +6560,8 @@ msgstr "saveSettings() njeimplementowany."
#. TRANS: Client error message thrown if design settings could not be deleted in
#. TRANS: the admin panel Design.
#: lib/adminpanelaction.php:274
-#, fuzzy
msgid "Unable to delete design setting."
-msgstr "Njeje móžno, sydłowu zdźělenku składować."
+msgstr "Njeje móžno, designowe nastajenje zhašeć."
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:337
@@ -6408,9 +6576,8 @@ msgstr "Sydło"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:345
-#, fuzzy
msgid "Design configuration"
-msgstr "Konfiguracija posedźenjow"
+msgstr "Designowa konfiguracija"
#. TRANS: Menu item for site administration
#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
@@ -6436,9 +6603,8 @@ msgstr "Přistupna konfiguracija"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:369
-#, fuzzy
msgid "Paths configuration"
-msgstr "Wužiwarska konfiguracija"
+msgstr "Konfiguracija šćežkow"
#. TRANS: Menu item title/tooltip
#: lib/adminpanelaction.php:377
@@ -6488,15 +6654,13 @@ msgstr ""
#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
#: lib/apioauthstore.php:45
-#, fuzzy
msgid "Could not create anonymous consumer."
-msgstr "Aliasy njejsu so dali wutworić."
+msgstr "Anonymny přetrjebowar njeda so wutworić."
#. TRANS: Server error displayed when trying to create an anynymous OAuth application.
#: lib/apioauthstore.php:69
-#, fuzzy
msgid "Could not create anonymous OAuth application."
-msgstr "Aplikacija njeda so wutworić."
+msgstr "Anonymna OAuth-aplikacija njeda so wutworić."
#. TRANS: Exception thrown when no token association could be found.
#: lib/apioauthstore.php:151
@@ -6506,9 +6670,8 @@ msgstr ""
#. TRANS: Exception thrown when no access token can be issued.
#: lib/apioauthstore.php:186
-#, fuzzy
msgid "Could not issue access token."
-msgstr "Powěsć njeda so zasunyć."
+msgstr "Přistupny token njeda so wudać."
#. TRANS: Server error displayed when a database error occurs.
#: lib/apioauthstore.php:243
@@ -6533,7 +6696,7 @@ msgstr "Symbol za tutu aplikaciju"
#. TRANS: Form input field instructions.
#. TRANS: %d is the number of available characters for the description.
#: lib/applicationeditform.php:201
-#, fuzzy, php-format
+#, php-format
msgid "Describe your application in %d character"
msgid_plural "Describe your application in %d characters"
msgstr[0] "Wopisaj swoju aplikaciju z %d znamješkami"
@@ -6548,9 +6711,8 @@ msgstr "Wopisaj swoju aplikaciju"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:216
-#, fuzzy
msgid "URL of the homepage of this application"
-msgstr "URL za startowu stronu organizacije"
+msgstr "URL startoweje strony tuteje aplikacije"
#. TRANS: Form input field label.
#: lib/applicationeditform.php:218
@@ -6661,21 +6823,18 @@ msgstr ""
#. TRANS: Title.
#: lib/attachmenttagcloudsection.php:48
-#, fuzzy
msgid "Tags for this attachment"
-msgstr "Přiwěšk njeeksistuje."
+msgstr "Taflički za tutón přiwěšk"
#. TRANS: Exception thrown when a password change fails.
#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
-#, fuzzy
msgid "Password changing failed."
-msgstr "Změnjenje hesła je so njeporadźiło"
+msgstr "Změnjenje hesła je so njeporadźiło."
#. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
#: lib/authenticationplugin.php:238
-#, fuzzy
msgid "Password changing is not allowed."
-msgstr "Změnjenje hesła njeje dowolene"
+msgstr "Změnjenje hesła njeje dowolene."
#. TRANS: Title for the form to block a user.
#: lib/blockform.php:68
@@ -6689,7 +6848,6 @@ msgstr "Přikazowe wuslědki"
#. TRANS: Title for command results.
#: lib/channel.php:194
-#, fuzzy
msgid "AJAX error"
msgstr "Zmylk Ajax"
@@ -6756,12 +6914,14 @@ msgid ""
"Subscribers: %2$s\n"
"Notices: %3$s"
msgstr ""
+"Abonenementy: %1$s\n"
+"Abonenća: %2$s\n"
+"Zdźělenki: %3$s"
#. TRANS: Text shown when a notice has been marked as favourite successfully.
#: lib/command.php:312
-#, fuzzy
msgid "Notice marked as fave."
-msgstr "Tuta zdźělenka je hižo faworit!"
+msgstr "Zdźělenka je jako faworit markěrowana."
#. TRANS: Message given having added a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
@@ -6780,7 +6940,7 @@ msgstr ""
#. TRANS: Whois output.
#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
#: lib/command.php:426
-#, fuzzy, php-format
+#, php-format
msgctxt "WHOIS"
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -6825,20 +6985,17 @@ msgstr ""
#. TRANS: Message given if content is too long. %1$sd is used for plural.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:488
-#, fuzzy, php-format
+#, php-format
msgid "Message too long - maximum is %1$d character, you sent %2$d."
msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr[0] ""
-"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
-"pósłał."
+"Powěsć je předołho - maksimalna dołhosć je %1$d znamješko, ty sy %2$d pósłał."
msgstr[1] ""
-"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
-"pósłał."
+"Powěsć je předołho - maksimalna dołhosć je %1$d znamješce, ty sy %2$d pósłał."
msgstr[2] ""
-"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
-"pósłał."
+"Powěsć je předołho - maksimalna dołhosć je %1$d znamješka, ty sy %2$d pósłał."
msgstr[3] ""
-"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
+"Powěsć je předołho - maksimalna dołhosć je %1$d znamješkow, ty sy %2$d "
"pósłał."
#. TRANS: Error text shown sending a direct message fails with an unknown reason.
@@ -6861,20 +7018,20 @@ msgstr "Zmylk při wospjetowanju zdźělenki"
#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
#: lib/command.php:591
-#, fuzzy, php-format
+#, php-format
msgid "Notice too long - maximum is %1$d character, you sent %2$d."
msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
msgstr[0] ""
-"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
+"Zdźělenka je předołho - maksimalna dołhosć je %1$d znamješko, ty sy %2$d "
"pósłał."
msgstr[1] ""
-"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
+"Zdźělenka je předołho - maksimalna dołhosć je %1$d znamješce, ty sy %2$d "
"pósłał."
msgstr[2] ""
-"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
+"Zdźělenka je předołho - maksimalna dołhosć je %1$d znamješka, ty sy %2$d "
"pósłał."
msgstr[3] ""
-"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
+"Zdźělenka je předołho - maksimalna dołhosć je %1$d znamješkow, ty sy %2$d "
"pósłał."
#. TRANS: Text shown having sent a reply to a notice successfully.
@@ -6892,7 +7049,7 @@ msgstr "Zmylk při składowanju powěsće"
#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
#: lib/command.php:654
msgid "Specify the name of the user to subscribe to."
-msgstr ""
+msgstr "Podaj mjeno wužiwarja, kotrehož chceš abonować"
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
#: lib/command.php:663
@@ -6904,7 +7061,7 @@ msgstr "OMB-profile njedadźa so přez přikaz abonować."
#: lib/command.php:671
#, php-format
msgid "Subscribed to %s."
-msgstr ""
+msgstr "%s abonowany."
#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
#. TRANS: Error text shown when no username was provided when issuing the command.
@@ -6917,7 +7074,7 @@ msgstr ""
#: lib/command.php:703
#, php-format
msgid "Unsubscribed from %s."
-msgstr ""
+msgstr "%s wotskazany."
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
@@ -6948,7 +7105,7 @@ msgstr "Zdźělenje njeda so zmóžnić."
#. TRANS: Error text shown when issuing the login command while login is disabled.
#: lib/command.php:770
msgid "Login command is disabled."
-msgstr ""
+msgstr "Přizjewjenski přikaz je znjemóžnjeny."
#. TRANS: Text shown after issuing the login command successfully.
#. TRANS: %s is a logon link..
@@ -6962,7 +7119,7 @@ msgstr ""
#: lib/command.php:812
#, php-format
msgid "Unsubscribed %s."
-msgstr ""
+msgstr "%s wotskazany."
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
#: lib/command.php:830
@@ -7059,16 +7216,14 @@ msgstr ""
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#: lib/common.php:147
-#, fuzzy
msgid "No configuration file found."
-msgstr "Žana konfiguraciska dataja namakana. "
+msgstr "Žana konfiguraciska dataja namakana."
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
#: lib/common.php:150
-#, fuzzy
msgid "I looked for configuration files in the following places:"
-msgstr "Sym na slědowacych městnach za konfiguraciskimi datajemi pytał: "
+msgstr "Sym na slědowacych městnach konfiguraciske dataje pytał:"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#: lib/common.php:153
@@ -7083,7 +7238,6 @@ msgstr "K instalaciji"
#. TRANS: Menu item for Instant Messaging settings.
#: lib/connectsettingsaction.php:106
-#, fuzzy
msgctxt "MENU"
msgid "IM"
msgstr "IM"
@@ -7095,7 +7249,6 @@ msgstr "Aktualizacije přez Instant Messenger (IM)"
#. TRANS: Menu item for Short Message Service settings.
#: lib/connectsettingsaction.php:113
-#, fuzzy
msgctxt "MENU"
msgid "SMS"
msgstr "SMS"
@@ -7107,7 +7260,6 @@ msgstr "Aktualizacije přez SMS"
#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
-#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Zwiski"
@@ -7137,40 +7289,34 @@ msgstr ""
#. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
#: lib/designsettings.php:139
-#, fuzzy
msgctxt "RADIO"
msgid "On"
msgstr "Zapinjeny"
#. TRANS: Radio button on profile design page that will disable use of the uploaded profile image.
#: lib/designsettings.php:156
-#, fuzzy
msgctxt "RADIO"
msgid "Off"
msgstr "Wupinjeny"
#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
#: lib/designsettings.php:264
-#, fuzzy
msgctxt "BUTTON"
msgid "Reset"
msgstr "Wróćo stajić"
#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
#: lib/designsettings.php:433
-#, fuzzy
msgid "Design defaults restored."
-msgstr "Designowe nastajenja składowane."
+msgstr "Designowe standardne nastajenja wobnowjene."
#: lib/disfavorform.php:114 lib/disfavorform.php:144
-#, fuzzy
msgid "Disfavor this notice"
-msgstr "Tutu zdźělenku wušmórnyć"
+msgstr "Tutu zdźělenku z faworitow wotstronić"
#: lib/favorform.php:114 lib/favorform.php:143
-#, fuzzy
msgid "Favor this notice"
-msgstr "Tutu zdźělenku wospjetować"
+msgstr "Tutu zdźělenku faworitam přidać"
#: lib/feed.php:84
msgid "RSS 1.0"
@@ -7191,7 +7337,7 @@ msgstr "FOAF"
#. TRANS: Header for feed links (h2).
#: lib/feedlist.php:66
msgid "Feeds"
-msgstr ""
+msgstr "Kanale"
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -7223,36 +7369,34 @@ msgid "Grant this user the \"%s\" role"
msgstr ""
#: lib/groupeditform.php:154
-#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr ""
-"Přimjeno smě jenož małe pismiki a cyfry wobsahować. Mjezery njejsu dowolene."
+"1-64 małopisanych pismikow abo ličbow, žane interpunkciske znamješka abo "
+"mjezery."
#: lib/groupeditform.php:163
-#, fuzzy
msgid "URL of the homepage or blog of the group or topic."
-msgstr "URL za startowu stronu organizacije"
+msgstr "URL startoweje strony abo bloga skupiny abo temy."
#: lib/groupeditform.php:168
msgid "Describe the group or topic"
msgstr "Skupinu abo temu wopisać"
#: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
msgid "Describe the group or topic in %d character or less"
msgid_plural "Describe the group or topic in %d characters or less"
-msgstr[0] "Skupinu abo temu w %d znamješkach wopisać"
-msgstr[1] "Skupinu abo temu w %d znamješkach wopisać"
+msgstr[0] "Skupinu abo temu w %d znamješce wopisać"
+msgstr[1] "Skupinu abo temu w %d znamješkomaj wopisać"
msgstr[2] "Skupinu abo temu w %d znamješkach wopisać"
msgstr[3] "Skupinu abo temu w %d znamješkach wopisać"
#: lib/groupeditform.php:182
-#, fuzzy
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr ""
"Městno za skupinu, jeli eksistuje, na př. \"město, zwjazkowy kraj (abo "
-"region), kraj\""
+"region), kraj\"."
#: lib/groupeditform.php:190
#, php-format
@@ -7271,7 +7415,7 @@ msgstr[3] ""
#: lib/groupnav.php:86
msgctxt "MENU"
msgid "Group"
-msgstr ""
+msgstr "Skupina"
#. TRANS: Tooltip for menu item in the group navigation page.
#. TRANS: %s is the nickname of the group.
@@ -7279,13 +7423,13 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s group"
-msgstr ""
+msgstr "Skupina %s"
#. TRANS: Menu item in the group navigation page.
#: lib/groupnav.php:95
msgctxt "MENU"
msgid "Members"
-msgstr ""
+msgstr "Čłonojo"
#. TRANS: Tooltip for menu item in the group navigation page.
#. TRANS: %s is the nickname of the group.
@@ -7293,13 +7437,13 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s group members"
-msgstr ""
+msgstr "Čłonojo skupiny %s"
#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
#: lib/groupnav.php:108
msgctxt "MENU"
msgid "Blocked"
-msgstr ""
+msgstr "Zablokowany"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -7307,7 +7451,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "%s blocked users"
-msgstr ""
+msgstr "Zablokowani wužiwarjo skupiny %s"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -7315,13 +7459,13 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Edit %s group properties"
-msgstr ""
+msgstr "Kajkosće skupiny %s wobdźěłać"
#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
#: lib/groupnav.php:126
msgctxt "MENU"
msgid "Logo"
-msgstr ""
+msgstr "Logo"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -7329,7 +7473,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Add or edit %s logo"
-msgstr ""
+msgstr "Logo skupiny %s přidać abo wobdźěłać"
#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
#. TRANS: %s is the nickname of the group.
@@ -7337,7 +7481,7 @@ msgstr ""
#, php-format
msgctxt "TOOLTIP"
msgid "Add or edit %s design"
-msgstr ""
+msgstr "Design skupiny %s přidać abo wobdźěłać"
#. TRANS: Title for groups with the most members section.
#: lib/groupsbymemberssection.php:71
@@ -7352,9 +7496,9 @@ msgstr "Skupiny z njawjace powěsćemi"
#. TRANS: Title for group tag cloud section.
#. TRANS: %s is a group name.
#: lib/grouptagcloudsection.php:57
-#, fuzzy, php-format
+#, php-format
msgid "Tags in %s group's notices"
-msgstr "Kajkosće skupiny %s wobdźěłać"
+msgstr "Taflički w zdźělenkach skupiny %s"
#. TRANS: Client exception 406
#: lib/htmloutputter.php:104
@@ -7397,33 +7541,33 @@ msgstr "Njeznaty datajowy typ"
#. TRANS: Number of megabytes. %d is the number.
#: lib/imagefile.php:283
-#, fuzzy, php-format
+#, php-format
msgid "%dMB"
msgid_plural "%dMB"
-msgstr[0] "MB"
-msgstr[1] "MB"
-msgstr[2] "MB"
-msgstr[3] "MB"
+msgstr[0] "%d MB"
+msgstr[1] "%d MB"
+msgstr[2] "%d MB"
+msgstr[3] "%d MB"
#. TRANS: Number of kilobytes. %d is the number.
#: lib/imagefile.php:287
-#, fuzzy, php-format
+#, php-format
msgid "%dkB"
msgid_plural "%dkB"
-msgstr[0] "KB"
-msgstr[1] "KB"
-msgstr[2] "KB"
-msgstr[3] "KB"
+msgstr[0] "%d KB"
+msgstr[1] "%d KB"
+msgstr[2] "%d KB"
+msgstr[3] "%d KB"
#. TRANS: Number of bytes. %d is the number.
#: lib/imagefile.php:290
#, php-format
msgid "%dB"
msgid_plural "%dB"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%d B"
+msgstr[1] "%d B"
+msgstr[2] "%d B"
+msgstr[3] "%d B"
#: lib/jabber.php:387
#, php-format
@@ -7518,9 +7662,9 @@ msgstr "Biografija: %s"
#. TRANS: Subject of notification mail for new posting email address.
#. TRANS: %s is the StatusNet sitename.
#: lib/mail.php:315
-#, fuzzy, php-format
+#, php-format
msgid "New email address for posting to %s"
-msgstr "Wužiwar nima žanu zregistrowanu e-mejlowu adresu."
+msgstr "Nowa e-mejlowa adresa za słanje do %s"
#. TRANS: Body of notification mail for new posting email address.
#. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
@@ -7543,7 +7687,7 @@ msgstr ""
#: lib/mail.php:442
#, php-format
msgid "%s status"
-msgstr ""
+msgstr "Status wužiwarja %s"
#. TRANS: Subject line for SMS-by-email address confirmation message.
#: lib/mail.php:468
@@ -7616,9 +7760,9 @@ msgstr ""
#. TRANS: Subject for favorite notification e-mail.
#. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
#: lib/mail.php:607
-#, fuzzy, php-format
+#, php-format
msgid "%1$s (@%2$s) added your notice as a favorite"
-msgstr "%s (@%s) je twoju zdźělenku jako faworit přidał"
+msgstr "%1$s (@%2$s) je twoju zdźělenku jako faworit přidał"
#. TRANS: Body for favorite notification e-mail.
#. TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
@@ -7661,9 +7805,9 @@ msgstr ""
#. TRANS: E-mail subject for notice notification.
#. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
#: lib/mail.php:680
-#, fuzzy, php-format
+#, php-format
msgid "%1$s (@%2$s) sent a notice to your attention"
-msgstr "%s (@%s) je twoju zdźělenku jako faworit přidał"
+msgstr "%1$s (@%2$s) je zdźělenku k twojej kedźbnosći pósłał"
#. TRANS: Body of @-reply notification e-mail.
#. TRANS: %1$s is the sending user's long name, $2$s is the StatusNet sitename,
@@ -7813,13 +7957,12 @@ msgstr "Direktnu zdźělenku pósłać"
#. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
#: lib/messageform.php:137
msgid "Select recipient:"
-msgstr ""
+msgstr "Přijimowarja wubrać:"
#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
#: lib/messageform.php:150
-#, fuzzy
msgid "No mutual subscribers."
-msgstr "Njeje abonowany!"
+msgstr "Žani wzajomni abonenća."
#: lib/messageform.php:153
msgid "To"
@@ -7835,18 +7978,18 @@ msgid "Send"
msgstr "Pósłać"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Přimjeno smě jenož małe pismiki a cyfry wobsahować. Mjezery njejsu dowolene."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
-msgstr ""
+msgstr "Přimjeno njemóže prózdne być."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -7917,7 +8060,7 @@ msgstr "w"
#: lib/noticelist.php:517
msgid "web"
-msgstr ""
+msgstr "Web"
#: lib/noticelist.php:583
msgid "in context"
@@ -7940,35 +8083,33 @@ msgid "Notice repeated"
msgstr "Zdźělenka wospjetowana"
#: lib/nudgeform.php:116
-#, fuzzy
msgid "Nudge this user"
-msgstr "Tutoho wužiwarja wušmórnyć"
+msgstr "Tutoho wužiwarja storčić"
#: lib/nudgeform.php:128
msgid "Nudge"
-msgstr ""
+msgstr "Stork"
#: lib/nudgeform.php:128
-#, fuzzy
msgid "Send a nudge to this user"
-msgstr "Tutomu wužiwarja direktnu powěsć pósłać"
+msgstr "Tutomu wužiwarjej stork pósłać"
#: lib/oauthstore.php:294
msgid "Error inserting new profile."
-msgstr ""
+msgstr "Zmylk při zasunjenju noweho profila."
#: lib/oauthstore.php:302
msgid "Error inserting avatar."
-msgstr ""
+msgstr "Zmylk při zasunjenju awatara."
#: lib/oauthstore.php:322
msgid "Error inserting remote profile."
-msgstr ""
+msgstr "Zmylk při zasunjenju zdaleneho profila."
#. TRANS: Exception thrown when a notice is denied because it has been sent before.
#: lib/oauthstore.php:362
msgid "Duplicate notice."
-msgstr ""
+msgstr "Dwójna zdźělenka."
#: lib/oauthstore.php:507
msgid "Couldn't insert new subscription."
@@ -8003,9 +8144,9 @@ msgid "Your sent messages"
msgstr "Twoje pósłane powěsće"
#: lib/personaltagcloudsection.php:56
-#, fuzzy, php-format
+#, php-format
msgid "Tags in %s's notices"
-msgstr "Wužiwar nima poslednju powěsć"
+msgstr "Taflički w zdźělenkach wot %s"
#. TRANS: Displayed as version information for a plugin if no version information was found.
#: lib/plugin.php:121
@@ -8062,9 +8203,8 @@ msgid "Recent tags"
msgstr ""
#: lib/publicgroupnav.php:88
-#, fuzzy
msgid "Featured"
-msgstr "Nazhonići wužiwarjo"
+msgstr "Wuběrne"
#: lib/publicgroupnav.php:92
msgid "Popular"
@@ -8092,20 +8232,17 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Rólu \"%s\" tutoho wužiwarja wotwołać"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
-#, fuzzy
+#: lib/router.php:957
msgid "Page not found."
-msgstr "API-metoda njenamakana."
+msgstr "Strona njenamakana."
#: lib/sandboxform.php:67
-#, fuzzy
msgid "Sandbox"
-msgstr "Dochadny póst"
+msgstr "Pěskowy kašćik"
#: lib/sandboxform.php:78
-#, fuzzy
msgid "Sandbox this user"
-msgstr "Tutoho wužiwarja wotblokować"
+msgstr "Tutoho wužiwarja do pěskoweho kašćika pósłać"
#. TRANS: Fieldset legend for the search form.
#: lib/searchaction.php:120
@@ -8122,7 +8259,7 @@ msgstr "Klučowe hesła"
#: lib/searchaction.php:130
msgctxt "BUTTON"
msgid "Search"
-msgstr ""
+msgstr "Pytać"
#. TRANS: Definition list item with instructions on how to get (better) search results.
#: lib/searchaction.php:170
@@ -8154,14 +8291,12 @@ msgid "More..."
msgstr "Wjace..."
#: lib/silenceform.php:67
-#, fuzzy
msgid "Silence"
-msgstr "Sydłowe mjeno"
+msgstr "Hubu zatykać"
#: lib/silenceform.php:78
-#, fuzzy
msgid "Silence this user"
-msgstr "Tutoho wužiwarja wušmórnyć"
+msgstr "Tutomu wužiwarjej hubu zatykać"
#: lib/subgroupnav.php:83
#, php-format
@@ -8183,7 +8318,7 @@ msgid "Invite"
msgstr "Přeprosyć"
#: lib/subgroupnav.php:106
-#, fuzzy, php-format
+#, php-format
msgid "Invite friends and colleagues to join you on %s"
msgstr "Přećelow a kolegow přeprosyć, so tebi na %s přidružić"
@@ -8203,9 +8338,8 @@ msgstr "Žadyn"
#. TRANS: Server exception displayed if a theme name was invalid.
#: lib/theme.php:74
-#, fuzzy
msgid "Invalid theme name."
-msgstr "Njepłaćiwe datajowe mjeno."
+msgstr "Njepłaćiwe šatowe mjeno."
#: lib/themeuploader.php:50
msgid "This server cannot handle theme uploads without ZIP support."
@@ -8213,7 +8347,7 @@ msgstr ""
#: lib/themeuploader.php:58 lib/themeuploader.php:61
msgid "The theme file is missing or the upload failed."
-msgstr ""
+msgstr "Šatowa dataja faluje abo nahraće je so njeporadźiło."
#: lib/themeuploader.php:91 lib/themeuploader.php:102
#: lib/themeuploader.php:279 lib/themeuploader.php:283
@@ -8223,7 +8357,7 @@ msgstr "Składowanje šata je so njeporadźiło."
#: lib/themeuploader.php:147
msgid "Invalid theme: bad directory structure."
-msgstr ""
+msgstr "Njepłaćiwy šat: špatna rjadowakowa struktura."
#: lib/themeuploader.php:166
#, php-format
@@ -8264,7 +8398,6 @@ msgstr ""
#. TRANS: Title for the form to unblock a user.
#: lib/unblockform.php:67
-#, fuzzy
msgctxt "TITLE"
msgid "Unblock"
msgstr "Wotblokować"
@@ -8274,18 +8407,16 @@ msgid "Unsandbox"
msgstr ""
#: lib/unsandboxform.php:80
-#, fuzzy
msgid "Unsandbox this user"
-msgstr "Tutoho wužiwarja wotblokować"
+msgstr "Tutoho wužiwarja z pěskoweho kašćika pušćić"
#: lib/unsilenceform.php:67
msgid "Unsilence"
msgstr ""
#: lib/unsilenceform.php:78
-#, fuzzy
msgid "Unsilence this user"
-msgstr "Tutoho wužiwarja wotblokować"
+msgstr "Tutoho wužiwarja wotprancować"
#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
msgid "Unsubscribe from this user"
@@ -8298,9 +8429,9 @@ msgstr "Wotskazać"
#. TRANS: Exception text shown when no profile can be found for a user.
#. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
#: lib/usernoprofileexception.php:60
-#, fuzzy, php-format
+#, php-format
msgid "User %1$s (%2$d) has no profile record."
-msgstr "Wužiwar nima profil."
+msgstr "Wužiwar %1$s (%2$d) nima profilowu datowu sadźbu."
#: lib/userprofile.php:119
msgid "Edit Avatar"
@@ -8349,17 +8480,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "před něšto sekundami"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "před něhdźe jednej mjeńšinu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8369,12 +8500,12 @@ msgstr[2] ""
msgstr[3] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "před něhdźe jednej hodźinu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8384,12 +8515,12 @@ msgstr[2] ""
msgstr[3] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "před něhdźe jednym dnjom"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8399,12 +8530,12 @@ msgstr[2] ""
msgstr[3] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "před něhdźe jednym měsacom"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8414,7 +8545,7 @@ msgstr[2] ""
msgstr[3] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "před něhdźe jednym lětom"
@@ -8426,7 +8557,7 @@ msgstr "%s płaćiwa barba njeje!"
#. TRANS: Validation error for a web colour.
#. TRANS: %s is the provided (invalid) text for colour.
#: lib/webcolor.php:120
-#, fuzzy, php-format
+#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr ""
"%s płaćiwa barba njeje! Wužij 3 heksadecimalne znamješka abo 6 "
@@ -8441,27 +8572,22 @@ msgstr ""
#. TRANS: Response to XMPP source when it sent too long a message.
#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
#: lib/xmppmanager.php:406
-#, fuzzy, php-format
+#, php-format
msgid "Message too long. Maximum is %1$d character, you sent %2$d."
msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
msgstr[0] ""
-"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
-"pósłał."
+"Powěsć je předołho. Maksimalna dołhosć je %1$d znamješko, ty sy %2$d pósłał."
msgstr[1] ""
-"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
-"pósłał."
+"Powěsć je předołho. Maksimalna dołhosć je %1$d znamješce, ty sy %2$d pósłał."
msgstr[2] ""
-"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
-"pósłał."
+"Powěsć je předołho. Maksimalna dołhosć je %1$d znamješka, ty sy %2$d pósłał."
msgstr[3] ""
-"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
-"pósłał."
+"Powěsć je předołho. Maksimalna dołhosć je %1$d znamješkow, ty sy %2$d pósłał."
#. TRANS: Exception.
#: lib/xrd.php:64
-#, fuzzy
msgid "Invalid XML."
-msgstr "Njepłaćiwa wulkosć."
+msgstr "Njepłaćiwy XML."
#. TRANS: Exception.
#: lib/xrd.php:69
@@ -8476,9 +8602,8 @@ msgstr ""
#. TRANS: Commandline script output.
#: scripts/restoreuser.php:91
-#, fuzzy
msgid "No user specified; using backup user."
-msgstr "Žadyn wužiwarski ID podaty."
+msgstr "Žadyn wužiwarsk podaty; wužiwa so wužiwar ze zawěsćenja."
#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
#: scripts/restoreuser.php:98
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index e43c184ee..9d60a8c20 100644
--- a/locale/hu/LC_MESSAGES/statusnet.po
+++ b/locale/hu/LC_MESSAGES/statusnet.po
@@ -12,13 +12,13 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:06+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:54+0000\n"
"Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: hu\n"
"X-Message-Group: #out-statusnet-core\n"
@@ -90,11 +90,11 @@ msgstr "Hozzáférések beállításainak mentése"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -379,20 +379,38 @@ msgstr "Nem sikerült elmenteni a megjelenítési beállításaid."
msgid "Could not update your design."
msgstr "Nem sikerült frissíteni a megjelenítést."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s története"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr ""
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Kedvencek"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "%s csoport tagjai"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -745,7 +763,7 @@ msgstr "Nincs jogosultságod."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -781,7 +799,7 @@ msgstr ""
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -850,7 +868,7 @@ msgstr "Jelszó"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -926,7 +944,8 @@ msgstr "Nem törölheted más felhasználók állapotait."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Nincs ilyen hír."
@@ -942,7 +961,10 @@ msgstr "Nem ismételheted meg a saját híredet."
msgid "Already repeated that notice."
msgstr "Már megismételted azt a hírt."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "Az API-metódus nem található."
@@ -962,16 +984,16 @@ msgstr "Állapot törölve."
msgid "No status with that ID found."
msgstr "Nem található ilyen azonosítójú állapot."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr ""
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "Hír törlése"
@@ -1095,34 +1117,58 @@ msgstr "Hírek %s címkével"
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "Csak a felhasználó láthatja a saját postaládáját."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Keressünk a hírek tartalmában"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr ""
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1138,6 +1184,145 @@ msgstr "Az API-metódus fejlesztés alatt áll."
msgid "User not found."
msgstr "Az API-metódus nem található."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Nincs ilyen profil."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+msgid "Can't add someone else's subscription"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Keressünk a hírek tartalmában"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Ismeretlen művelet"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Hozzáadás a kedvencekhez"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Nincs ilyen profil."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "%s csoport tagjai"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "A legtöbb tagból álló csoportok"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Ismeretlen művelet"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Összes tag"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Nincs ilyen fájl."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Nem sikerült törölni a kedvencet."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Nincs ilyen csoport."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Összes tag"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "Az API-metódus nem található."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Nincs ilyen profil."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Senkinek sem iratkoztál fel a híreire."
+
+#: actions/atompubshowsubscription.php:154
+msgid "Can't delete someone else's subscription"
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Senki sem követ figyelemmel."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Ismeretlen fájltípus"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1424,8 +1609,8 @@ msgstr "Ez a cím már meg van erősítve."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1951,12 +2136,12 @@ msgstr "Beállíthatod, milyen email-eket kapj a(z) %%site.name%% webhelyről."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "Email-cím"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "A jelenleg megerősített e-mail cím."
@@ -1965,14 +2150,14 @@ msgstr "A jelenleg megerősített e-mail cím."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Eltávolítás"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1986,14 +2171,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "E-mail cím, például „FelhasználóNév@example.org”"
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2001,112 +2186,119 @@ msgstr "Hozzáadás"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Bejövő email"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Szeretnék email segítségével közzétenni."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Erre a címre küldj emailt új hír közzétételéhez."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Új"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "E-mail beállítások"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Kapjak email-t, ha valaki feliratkozott a híreimre."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Kapjak emailt róla, ha valaki kedvenceként jelöl meg egy általam küldött "
"hírt."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Kapjak emailt róla, ha valaki privát üzenetet küld nekem."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Kapjak emailt róla, ha valaki \"@-választ\" küld nekem."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Megengedem a barátaimnak, hogy megbökjenek és emailt küldjenek nekem."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Szeretnék email segítségével közzétenni."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "MicroID közzététele az e-mail címemhez."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "E-mail beállítások elmentve."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Nincs e-mail cím."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Nem sikerült normalizálni az e-mail címet"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Érvénytelen email cím."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Jelenleg is ez az e-mail címed."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Ez az e-mail cím egy másik felhasználóhoz tartozik."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Nem sikerült beilleszteni a megerősítő kódot."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2118,56 +2310,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Nincs várakozó megerősítés, amit vissza lehetne vonni."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr ""
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Nem sikerült törölni az e-mail cím megerősítését."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr ""
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Ez nem a te e-mail címed."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr ""
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Nincs bejövő e-mail cím."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Nem sikerült frissíteni a felhasználó rekordját."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "A bejövő email címet eltávolítottuk."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Új bejövő e-mail cím hozzáadva."
@@ -5255,7 +5447,7 @@ msgstr ""
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr ""
@@ -5263,10 +5455,6 @@ msgstr ""
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Nincs ilyen profil."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
@@ -5328,13 +5516,6 @@ msgid ""
"%) and be the first?"
msgstr ""
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr ""
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5378,13 +5559,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s nem követ figyelemmel senkit."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "%s Atom hírcsatornája"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5765,13 +5951,13 @@ msgid "Author(s)"
msgstr "Szerző(k)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Kedvelem"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%s (@%s) az általad küldött hírt hozzáadta a kedvenceihez"
@@ -5825,42 +6011,42 @@ msgid "Invalid filename."
msgstr ""
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr ""
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr ""
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr ""
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "Hiba a felhasználó mentésekor; érvénytelen."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Csatlakozzunk"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -5888,12 +6074,12 @@ msgid "You are banned from sending direct messages."
msgstr ""
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr ""
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr ""
@@ -5911,59 +6097,59 @@ msgid "Database error inserting hashtag: %s"
msgstr ""
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr ""
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr ""
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Probléma merült fel a hír mentése közben."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr ""
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Nem sikerült menteni a profilt."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5977,14 +6163,14 @@ msgstr "%1$s - %2$s"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6000,48 +6186,48 @@ msgid "Unable to save tag."
msgstr ""
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "Eltiltottak a feliratkozástól."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Már feliratkoztál!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "A felhasználó blokkolt."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Nem követed figyelemmel!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr ""
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr ""
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr ""
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s feliratkozott a híreidre a %2$s webhelyen."
@@ -6405,10 +6591,15 @@ msgid "Before"
msgstr "Előtte"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Fénykép"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -7908,17 +8099,17 @@ msgid "Send"
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "A becenév csak kisbetűket és számokat tartalmazhat, szóközök nélkül."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8159,7 +8350,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr ""
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "Az API-metódus nem található."
@@ -8408,17 +8599,17 @@ msgid "Moderator"
msgstr "Moderátor"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "pár másodperce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "körülbelül egy perce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8426,12 +8617,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "körülbelül egy órája"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8439,12 +8630,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "körülbelül egy napja"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8452,12 +8643,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "körülbelül egy hónapja"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8465,7 +8656,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "körülbelül egy éve"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index f6f6e9978..e21225d63 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:07+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:56+0000\n"
"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ia\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -85,11 +85,11 @@ msgstr "Salveguardar configurationes de accesso"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -380,20 +380,38 @@ msgstr "Impossibile salveguardar le configurationes del apparentia."
msgid "Could not update your design."
msgstr "Non poteva actualisar le apparentia."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
-msgstr ""
+msgstr "Principal"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "Chronologia de %s"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "Subscriptiones de %s"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Favorites"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "Membros del gruppo %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -520,7 +538,6 @@ msgstr "Tu non pote cessar de sequer te mesme."
#. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
#: actions/apifriendshipsexists.php:88
-#, fuzzy
msgid "Two valid IDs or nick names must be supplied."
msgstr "Duo IDs o pseudonymos valide debe esser fornite."
@@ -743,7 +760,7 @@ msgstr "Indicio de requesta jam autorisate."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -780,7 +797,7 @@ msgstr ""
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -854,7 +871,7 @@ msgstr "Contrasigno"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -931,7 +948,8 @@ msgstr "Tu non pote deler le stato de un altere usator."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Nota non trovate."
@@ -947,15 +965,17 @@ msgstr "Non pote repeter tu proprie nota."
msgid "Already repeated that notice."
msgstr "Iste nota ha ja essite repetite."
-#: actions/apistatusesshow.php:117
-#, fuzzy
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
-msgstr "Methodo API non trovate."
+msgstr "Methodo HTTP non supportate."
#: actions/apistatusesshow.php:141
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported format: %s"
-msgstr "Formato non supportate."
+msgstr "Formato non supportate: %s"
#. TRANS: Client error displayed requesting a deleted status.
#: actions/apistatusesshow.php:152
@@ -967,19 +987,19 @@ msgstr "Stato delite."
msgid "No status with that ID found."
msgstr "Nulle stato trovate con iste ID."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
-msgstr ""
+msgstr "Le deletion es solmente possibile con le formato Atom."
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Non pote deler iste nota."
-#: actions/apistatusesshow.php:247
-#, fuzzy, php-format
+#: actions/apistatusesshow.php:243
+#, php-format
msgid "Deleted notice %d"
-msgstr "Deler nota"
+msgstr "Nota %d delite"
#. TRANS: Client error displayed when the parameter "status" is missing.
#: actions/apistatusesupdate.php:221
@@ -1102,37 +1122,64 @@ msgstr "Notas con etiquetta %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualisationes con etiquetta %1$s in %2$s!"
-#: actions/apitimelineuser.php:300
-#, fuzzy
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
msgid "Only the user can add to their own timeline."
-msgstr "Solmente le usator pote leger su proprie cassas postal."
+msgstr "Solmente le usator pote adder cosas a su proprie chronologia."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
-msgstr ""
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+#, fuzzy
+msgid "Only accept AtomPub for Atom feeds."
+msgstr "Solmente acceptar AtomPub pro syndicationes in Atom."
-#: actions/apitimelineuser.php:316
+#: actions/apitimelineuser.php:310
+#, fuzzy
+msgid "Atom post must not be empty."
+msgstr "Message Atom debe esser un entrata Atom."
+
+#: actions/apitimelineuser.php:315
+#, fuzzy
+msgid "Atom post must be well-formed XML."
+msgstr "Message Atom debe esser un entrata Atom."
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
-msgstr ""
+msgstr "Message Atom debe esser un entrata Atom."
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
-msgstr ""
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+#, fuzzy
+msgid "Can only handle POST activities."
+msgstr "Solmente le activitates POST es possibile."
-#: actions/apitimelineuser.php:334
-#, php-format
-msgid "Cannot handle activity object type \"%s\""
-msgstr ""
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
+#, fuzzy, php-format
+msgid "Cannot handle activity object type \"%s\"."
+msgstr "Impossibile manear le typo de objecto de activitate \"%s\""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Cercar in contento de notas"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
+#, php-format
msgid "Notice with URI \"%s\" already exists."
-msgstr "Non existe un nota con iste ID."
+msgstr "Un nota con le URI \"%s\" jam existe."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
+msgstr "Message AtomPub con URI de attention incognite %s"
#. TRANS: Server error for unfinished API method showTrends.
#: actions/apitrends.php:85
@@ -1144,6 +1191,150 @@ msgstr "Methodo API in construction."
msgid "User not found."
msgstr "Usator non trovate."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Profilo non existe."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Non poteva inserer nove subscription."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+#, fuzzy
+msgid "Can only handle Favorite activities."
+msgstr "Solmente le activitates POST es possibile."
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Solmente le activitates POST es possibile."
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Incognite"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Adder al favorites"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Profilo non existe."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "Membros del gruppo %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Gruppos del quales %s es membro"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+#, fuzzy
+msgid "Can only handle Join activities."
+msgstr "Solmente le activitates POST es possibile."
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Incognite"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Tote le membros"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "File non existe."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Non poteva deler le favorite."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Gruppo non existe."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Tote le membros"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "Methodo HTTP non supportate."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Profilo non existe."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Tu non es subscribite a iste profilo."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Non poteva deler auto-subscription."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Personas qui seque %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+#, fuzzy
+msgid "Can only handle Follow activities."
+msgstr "Solmente le activitates POST es possibile."
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Typo de file incognite"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1430,8 +1621,8 @@ msgstr "Iste adresse ha ja essite confirmate."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1956,12 +2147,12 @@ msgstr "Configurar como reciper e-mail de %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "Adresse de e-mail"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Adresse de e-mail actualmente confirmate."
@@ -1970,14 +2161,14 @@ msgstr "Adresse de e-mail actualmente confirmate."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Remover"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1990,14 +2181,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "Le adresse de e-mail, como \"nomine@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2005,111 +2196,118 @@ msgstr "Adder"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "E-mail entrante"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Io vole publicar notas per e-mail."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Invia e-mail a iste adresse pro publicar nove notas."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Face un nove adresse de e-mail per le qual publicar; cancella le vetule."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Nove"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Preferentias de e-mail"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Inviar me notificationes de nove subscriptiones per e-mail."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Inviar me e-mail quando alcuno adde mi nota al favorites."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Inviar me e-mail quando alcuno me invia un message private."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Inviar me e-mail quando alcuno me invia un \"responsa @\"."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Permitte que amicos me pulsa e me invia e-mail."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Io vole publicar notas per e-mail."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Publicar un MicroID pro mi adresse de e-mail."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "Preferentias de e-mail salveguardate."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Nulle adresse de e-mail."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Non pote normalisar iste adresse de e-mail"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Adresse de e-mail invalide."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Isto es ja tu adresse de e-mail."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Iste adresse de e-mail pertine ja a un altere usator."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Non poteva inserer le codice de confirmation."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2121,56 +2319,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Nulle confirmation pendente a cancellar."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Iste adresse de e-mail es erronee."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Non poteva deler confirmation de e-mail."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Confirmation de e-mail cancellate."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Isto non es tu adresse de e-mail."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "Le adresse de e-mail ha essite removite."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Nulle adresse de e-mail entrante."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Non poteva actualisar le datos del usator."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Adresse de e-mail entrante removite."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Nove adresse de e-mail entrante addite."
@@ -5370,7 +5568,7 @@ msgstr "Tu non es subscribite a iste profilo."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Non poteva salveguardar le subscription."
@@ -5378,10 +5576,6 @@ msgstr "Non poteva salveguardar le subscription."
msgid "This action only accepts POST requests."
msgstr "Iste action accepta solmente le requestas de typo POST."
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Profilo non existe."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr "Tu non pote subscriber te a un profilo remote OMB 0.1 con iste action."
@@ -5447,13 +5641,6 @@ msgstr ""
"%s non ha subscriptores. Proque non [crear un conto](%%%%action.register%%%"
"%) e esser le prime?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "Subscriptiones de %s"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5503,13 +5690,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s non seque alcuno."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Syndication de notas pro %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5918,13 +6110,13 @@ msgid "Author(s)"
msgstr "Autor(es)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Favorir"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%1$s marcava le nota %2$s como favorite."
@@ -5982,42 +6174,42 @@ msgid "Invalid filename."
msgstr "Nomine de file invalide."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Le inscription al gruppo ha fallite."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "Non es membro del gruppo."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "Le cancellation del membrato del gruppo ha fallite."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr "Le ID de profilo %s es invalide."
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
-#, fuzzy, php-format
+#: classes/Group_member.php:98
+#, php-format
msgid "Group ID %s is invalid."
-msgstr "Error de salveguardar le usator; invalide."
+msgstr "Le ID de gruppo %s es invalide."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Inscriber"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr "%1$s se ha jungite al gruppo %2$s."
@@ -6045,12 +6237,12 @@ msgid "You are banned from sending direct messages."
msgstr "Il te es prohibite inviar messages directe."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Non poteva inserer message."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Non poteva actualisar message con nove URI."
@@ -6068,17 +6260,17 @@ msgid "Database error inserting hashtag: %s"
msgstr "Error in base de datos durante insertion del marca (hashtag): %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Problema salveguardar nota. Troppo longe."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Problema salveguardar nota. Usator incognite."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6086,7 +6278,7 @@ msgstr ""
"alcun minutas."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6095,36 +6287,36 @@ msgstr ""
"novo post alcun minutas."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Il te es prohibite publicar notas in iste sito."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Problema salveguardar nota."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr "Mal typo fornite a saveKnownGroups."
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "Problema salveguardar le cassa de entrata del gruppo."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Non poteva salveguardar le responsa pro %1$d, %2$d."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6138,14 +6330,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr "Non pote revocar le rolo \"%1$s\" del usator #%2$d; non existe."
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6163,48 +6355,48 @@ msgid "Unable to save tag."
msgstr "Impossibile salveguardar le etiquetta."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "Tu ha essite blocate del subscription."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Ja subscribite!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "Le usator te ha blocate."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Non subscribite!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Non poteva deler auto-subscription."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Non poteva deler le indicio OMB del subscription."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Non poteva deler subscription."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr "Sequer"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s seque ora %2$s."
@@ -6574,12 +6766,17 @@ msgid "Before"
msgstr "Ante"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
"Expectava le elemento-radice de un syndication, ma recipeva un documento XML "
"integre."
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Photo"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -6760,10 +6957,10 @@ msgstr "Icone pro iste application"
#. TRANS: Form input field instructions.
#. TRANS: %d is the number of available characters for the description.
#: lib/applicationeditform.php:201
-#, fuzzy, php-format
+#, php-format
msgid "Describe your application in %d character"
msgid_plural "Describe your application in %d characters"
-msgstr[0] "Describe tu application in %d characteres"
+msgstr[0] "Describe tu application in %d character"
msgstr[1] "Describe tu application in %d characteres"
#. TRANS: Form input field instructions.
@@ -6892,15 +7089,13 @@ msgstr "Etiquettas pro iste annexo"
#. TRANS: Exception thrown when a password change fails.
#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
-#, fuzzy
msgid "Password changing failed."
-msgstr "Cambio del contrasigno fallite"
+msgstr "Cambio del contrasigno fallite."
#. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
#: lib/authenticationplugin.php:238
-#, fuzzy
msgid "Password changing is not allowed."
-msgstr "Cambio del contrasigno non permittite"
+msgstr "Cambio del contrasigno non permittite."
#. TRANS: Title for the form to block a user.
#: lib/blockform.php:68
@@ -6914,9 +7109,8 @@ msgstr "Resultatos del commando"
#. TRANS: Title for command results.
#: lib/channel.php:194
-#, fuzzy
msgid "AJAX error"
-msgstr "Error de Ajax"
+msgstr "Error de AJAX"
#. TRANS: E-mail subject when a command has completed.
#: lib/channel.php:233 lib/mailhandler.php:143
@@ -7324,7 +7518,6 @@ msgstr "Ir al installator."
#. TRANS: Menu item for Instant Messaging settings.
#: lib/connectsettingsaction.php:106
-#, fuzzy
msgctxt "MENU"
msgid "IM"
msgstr "MI"
@@ -7336,7 +7529,6 @@ msgstr "Actualisationes per messageria instantanee (MI)"
#. TRANS: Menu item for Short Message Service settings.
#: lib/connectsettingsaction.php:113
-#, fuzzy
msgctxt "MENU"
msgid "SMS"
msgstr "SMS"
@@ -7348,7 +7540,6 @@ msgstr "Actualisationes per SMS"
#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
-#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Connexiones"
@@ -8137,15 +8328,13 @@ msgstr "Inviar un nota directe"
#. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
#: lib/messageform.php:137
-#, fuzzy
msgid "Select recipient:"
-msgstr "Selige licentia"
+msgstr "Selige destinatario:"
#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
#: lib/messageform.php:150
-#, fuzzy
msgid "No mutual subscribers."
-msgstr "Non subscribite!"
+msgstr "Nulle subscriptores mutual."
#: lib/messageform.php:153
msgid "To"
@@ -8161,22 +8350,22 @@ msgid "Send"
msgstr "Inviar"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Le pseudonymo pote solmente haber minusculas e numeros, sin spatios."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
-msgstr ""
+msgstr "Le pseudonymo non pote esser vacue."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Le pseudonymo non pote haber plus de %d character."
+msgstr[1] "Le pseudonymo non pote haber plus de %d characteres."
#: lib/noticeform.php:160
msgid "Send a notice"
@@ -8414,7 +8603,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Revocar le rolo \"%s\" de iste usator"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
msgid "Page not found."
msgstr "Pagina non trovate."
@@ -8670,17 +8859,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "alcun secundas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "circa un minuta retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8688,12 +8877,12 @@ msgstr[0] "circa un minuta retro"
msgstr[1] "circa %d minutas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "circa un hora retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8701,12 +8890,12 @@ msgstr[0] "circa un hora retro"
msgstr[1] "circa %d horas retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "circa un die retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8714,12 +8903,12 @@ msgstr[0] "circa un die retro"
msgstr[1] "circa %d dies retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "circa un mense retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8727,7 +8916,7 @@ msgstr[0] "circa un mense retro"
msgstr[1] "circa %d menses retro"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "circa un anno retro"
@@ -8760,14 +8949,13 @@ msgstr[1] "Message troppo longe. Maximo es %1$d characteres, tu inviava %2$d."
#. TRANS: Exception.
#: lib/xrd.php:64
-#, fuzzy
msgid "Invalid XML."
-msgstr "Dimension invalide."
+msgstr "XML invalide."
#. TRANS: Exception.
#: lib/xrd.php:69
msgid "Invalid XML, missing XRD root."
-msgstr ""
+msgstr "XML invalide, radice XRD mancante."
#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
#: scripts/restoreuser.php:61
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index b36ff5626..b1b012969 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:08+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:57+0000\n"
"Language-Team: Icelandic <http://translatewiki.net/wiki/Portal:is>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: is\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -91,11 +91,11 @@ msgstr "Stillingar fyrir mynd"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
#, fuzzy
@@ -379,20 +379,38 @@ msgstr ""
msgid "Could not update your design."
msgstr "Gat ekki uppfært hóp."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "Rás %s"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s áskriftir"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Uppáhald"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "Hópmeðlimir %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
#, fuzzy
@@ -760,7 +778,7 @@ msgstr "Þú ert ekki áskrifandi."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -798,7 +816,7 @@ msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -867,7 +885,7 @@ msgstr "Lykilorð"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
#, fuzzy
@@ -944,7 +962,8 @@ msgstr "Þú getur ekki eytt stöðu annars notanda."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Ekkert svoleiðis babl."
@@ -961,7 +980,10 @@ msgstr "Get ekki kveikt á tilkynningum."
msgid "Already repeated that notice."
msgstr "Get ekki eytt þessu babli."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "Aðferð í forritsskilum fannst ekki!"
@@ -981,16 +1003,16 @@ msgstr ""
msgid "No status with that ID found."
msgstr "Engin staða með þessu kenni fannst."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Get ekki eytt þessu babli."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "Eyða babli"
@@ -1114,34 +1136,58 @@ msgstr "Babl merkt með %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Færslur frá %1$s á %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "Aðeins notandinn getur lesið hans eigin pósthólf."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Finna innihald babls"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "Enginn persónuleg síða með þessu einkenni."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1156,6 +1202,148 @@ msgstr "Aðferð í forritsskilum er í þróun."
msgid "User not found."
msgstr "Aðferð í forritsskilum fannst ekki!"
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Ekkert svoleiðis babl."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Gat ekki sett inn nýja áskrift."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Finna innihald babls"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Óþekkt aðgerð"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Bæta við sem uppáhaldsbabli"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Ekkert svoleiðis babl."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "Hópmeðlimir %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Hópar sem %s er meðlimur í"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Óþekkt aðgerð"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Allir meðlimir"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Ekkert svoleiðis babl."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Gat ekki eytt uppáhaldi."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Enginn þannig hópur."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Allir meðlimir"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "Aðferð í forritsskilum fannst ekki!"
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Ekkert svoleiðis babl."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Þú ert ekki áskrifandi."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Gat ekki vistað áskrift."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Fólk sem eru áskrifendur að %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Óþekkt skráargerð"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
#, fuzzy
@@ -1450,8 +1638,8 @@ msgstr "Þetta tölvupóstfang hefur nú þegar verið staðfest."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -2002,13 +2190,13 @@ msgstr "Stilla það hvernig þú færð tölvupóst frá %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
#, fuzzy
msgid "Email address"
msgstr "Tölvupóstföng"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Núverandi staðfesta tölvupóstfangið."
@@ -2017,14 +2205,14 @@ msgstr "Núverandi staðfesta tölvupóstfangið."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Endurheimta"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2037,14 +2225,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "Tölvupóstfang eins og \"notandi@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
#, fuzzy
msgctxt "BUTTON"
@@ -2053,113 +2241,120 @@ msgstr "Bæta við"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Móttökutölvupóstur"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Ég vil babla í gegnum tölvupóst."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Sendu tölvupóst á þetta póstfang til þess að senda inn nýtt babl."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Búa til nýtt tölvupóstfang til að senda til. Skrifar yfir það gamla."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Nýtt"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Tölvupóstföng"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Sendu mér tilkynningu varðandi nýjar áskriftir í gegnum tölvupóst."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Senda mér tölvupóst þegar einhver setur babl í mér í uppáhald hjá sér."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Senda mér tölvupóst þegar einhver sendir mér persónuleg skilaboð."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Senda mér tölvupóst þegar einhver sendir mér persónuleg skilaboð."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Leyfa vinum að ýta við mér og senda mér tölvupóst."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Ég vil babla í gegnum tölvupóst."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Birta MicroID fyrir tölvupóstfangið mitt."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
#, fuzzy
msgid "Email preferences saved."
msgstr "Stillingar vistaðar."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Ekkert tölvupóstfang."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Get ekki staðlað þetta tölvupóstfang"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ekki tækt tölvupóstfang."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Þetta er nú þegar tölvupóstfangið þitt."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Þetta tölvupóstfang tilheyrir öðrum notanda."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Gat ekki sett inn staðfestingarlykil."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2171,57 +2366,57 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Engin staðfesting í bið sem þarf að hætta við."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
#, fuzzy
msgid "That is the wrong email address."
msgstr "Þetta er rangt snarskilaboðafang."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Gat ekki eytt tölvupóstsstaðfestingu."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Engin staðfesting í bið sem þarf að hætta við."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Þetta er ekki tölvupóstfangið þitt."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "Móttökutölvupóstfang fjarlægt."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Ekkert móttökutölvupóstfang."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Gat ekki uppfært skráarfærslu notanda."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Móttökutölvupóstfang fjarlægt."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Nýju móttökutölvupóstfangi bætt við."
@@ -5457,7 +5652,7 @@ msgstr "Þú ert ekki áskrifandi."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Gat ekki vistað áskrift."
@@ -5465,11 +5660,6 @@ msgstr "Gat ekki vistað áskrift."
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "Ekkert svoleiðis babl."
-
#: actions/subscribe.php:117
#, fuzzy
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
@@ -5532,13 +5722,6 @@ msgid ""
"%) and be the first?"
msgstr ""
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "%s áskriftir"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5582,13 +5765,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%1$s er að hlusta á bablið þitt á %2$s."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Svör við %s"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber snarskilaboðaþjónusta"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5999,13 +6187,13 @@ msgid "Author(s)"
msgstr ""
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Uppáhald"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "Senda mér tölvupóst þegar einhver setur babl í mér í uppáhald hjá sér."
@@ -6060,45 +6248,45 @@ msgid "Invalid filename."
msgstr "Ótæk stærð."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
#, fuzzy
msgid "Group join failed."
msgstr "Hópssíðan"
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
#, fuzzy
msgid "Not part of group."
msgstr "Gat ekki uppfært hóp."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
#, fuzzy
msgid "Group leave failed."
msgstr "Hópssíðan"
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "Villa kom upp í vistun notanda: ótækt."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Gerast meðlimur"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6128,12 +6316,12 @@ msgid "You are banned from sending direct messages."
msgstr "Villa kom upp við að senda bein skilaboð"
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Gat ekki skeytt skilaboðum inn í."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Gat ekki uppfært skilaboð með nýju veffangi."
@@ -6151,18 +6339,18 @@ msgid "Database error inserting hashtag: %s"
msgstr "Villa kom upp við að setja inn mynd"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Vandamál komu upp við að vista babl."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Gat ekki vistað babl. Óþekktur notandi."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6170,7 +6358,7 @@ msgstr ""
"mínútur."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -6180,37 +6368,37 @@ msgstr ""
"mínútur."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Vandamál komu upp við að vista babl."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Vandamál komu upp við að vista babl."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Gat ekki vistað áskrift."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6224,14 +6412,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6248,51 +6436,51 @@ msgid "Unable to save tag."
msgstr "Gat ekki vistað merki."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi"
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
#, fuzzy
msgid "Already subscribed!"
msgstr "Ekki í áskrift!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "Notandinn hefur lokað á þig."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
#, fuzzy
msgid "Not subscribed!"
msgstr "Ekki í áskrift!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Gat ekki vistað áskrift."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Gat ekki vistað áskrift."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Gat ekki vistað áskrift."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s er að hlusta á bablið þitt á %2$s."
@@ -6677,10 +6865,15 @@ msgid "Before"
msgstr "Áður"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Ljósmynd"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8151,17 +8344,17 @@ msgid "Send"
msgstr "Senda"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Stuttnefni geta bara verið lágstafir og tölustafir en engin bil."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8413,7 +8606,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr ""
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "Aðferð í forritsskilum fannst ekki!"
@@ -8674,17 +8867,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "fyrir nokkrum sekúndum"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "fyrir um einni mínútu síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8692,12 +8885,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "fyrir um einum klukkutíma síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8705,12 +8898,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "fyrir um einum degi síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8718,12 +8911,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "fyrir um einum mánuði síðan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8731,7 +8924,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
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 027f2167c..4c394f8a1 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:09+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:10:59+0000\n"
"Language-Team: Italian <http://translatewiki.net/wiki/Portal:it>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: it\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -89,11 +89,11 @@ msgstr "Salva impostazioni di accesso"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -382,20 +382,38 @@ msgstr "Impossibile salvare la impostazioni dell'aspetto."
msgid "Could not update your design."
msgstr "Impossibile aggiornare l'aspetto."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "Attività di %s"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "Abbonamenti di %s"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Preferiti"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "Membri del gruppo %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -751,7 +769,7 @@ msgstr "Autorizzazione non presente."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -789,7 +807,7 @@ msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -864,7 +882,7 @@ msgstr "Password"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -941,7 +959,8 @@ msgstr "Non puoi eliminare il messaggio di un altro utente."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Nessun messaggio."
@@ -957,7 +976,10 @@ msgstr "Non puoi ripetere un tuo messaggio."
msgid "Already repeated that notice."
msgstr "Hai già ripetuto quel messaggio."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "Metodo delle API non trovato."
@@ -977,16 +999,16 @@ msgstr "Messaggio eliminato."
msgid "No status with that ID found."
msgstr "Nessuno stato trovato con quel ID."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Impossibile eliminare questo messaggio."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "Elimina messaggio"
@@ -1111,34 +1133,58 @@ msgstr "Messaggi etichettati con %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Messaggi etichettati con %1$s su %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "Solo l'utente può leggere la propria casella di posta."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Trova contenuto dei messaggi"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "Un messaggio con quel ID non esiste."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1153,6 +1199,147 @@ msgstr "Metodo delle API in lavorazione."
msgid "User not found."
msgstr "Metodo delle API non trovato."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Nessun profilo."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Impossibile inserire un nuovo abbonamento."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Trova contenuto dei messaggi"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Sconosciuto"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Aggiungi ai preferiti"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Nessun profilo."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "Membri del gruppo %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Gruppi di cui %s fa parte"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Sconosciuto"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Tutti i membri"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Nessun file."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Impossibile eliminare un preferito."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Nessuna gruppo."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Tutti i membri"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "Metodo delle API non trovato."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Nessun profilo."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Non hai una abbonamento a quel profilo."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Impossibile salvare l'abbonamento."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Persone abbonate a %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Tipo di file sconosciuto"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1443,8 +1630,8 @@ msgstr "Quell'indirizzo è già stato confermato."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1976,12 +2163,12 @@ msgstr "Gestisci la ricezione delle email da %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "Indirizzo email"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Indirizzo email attualmente confermato."
@@ -1990,14 +2177,14 @@ msgstr "Indirizzo email attualmente confermato."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Rimuovi"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2011,14 +2198,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "Indirizzo email, del tipo \"nomeutente@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2026,113 +2213,120 @@ msgstr "Aggiungi"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Email di ricezione"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Voglio inviare i messaggi via email"
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Invia le email a questo indirizzo per scrivere nuovi messaggi."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Crea un nuovo indirizzo email a cui inviare i messaggi e rimuovi quello "
"vecchio."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Nuovo"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Preferenze dell'email"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Inviami avvisi di nuovi abbonamenti via email"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Inviami un'email quando qualcuno aggiunge un mio messaggio ai preferiti"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Inviami un'email quando qualcuno mi invia un messaggio privato"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Inviami un'email quando qualcuno mi invia una \"@-risposta\""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Consenti ai miei amici di richiamarmi e inviami un'email"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Voglio inviare i messaggi via email"
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Pubblica un MicroID per il mio indirizzo email"
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "Preferenze dell'email salvate."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Nessun indirizzo email."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Impossibile normalizzare quell'indirizzo email"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Non è un indirizzo email valido."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Quello è già il tuo indirizzo email."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Quell'indirizzo email appartiene già a un altro utente."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Impossibile inserire il codice di conferma."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2144,56 +2338,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Nessuna conferma da annullare."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Quello è l'indirizzo email sbagliato."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Impossibile eliminare l'email di conferma."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Conferma dell'email annullata."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Quello non è il tuo indirizzo email."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "L'indirizzo email è stato rimosso."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Nessun indirizzo email di ricezione."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Impossibile aggiornare il record dell'utente."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Indirizzo email di ricezione rimosso."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Nuovo indirizzo email di ricezione aggiunto."
@@ -5417,7 +5611,7 @@ msgstr "Non hai una abbonamento a quel profilo."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Impossibile salvare l'abbonamento."
@@ -5425,10 +5619,6 @@ msgstr "Impossibile salvare l'abbonamento."
msgid "This action only accepts POST requests."
msgstr "Quest'azione accetta solo richieste POST."
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Nessun profilo."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
@@ -5496,13 +5686,6 @@ msgstr ""
"%s non ha abbonati. Perché non [crei un account](%%%%action.register%%%%) e "
"ti abboni tu?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "Abbonamenti di %s"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5551,13 +5734,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s non sta seguendo nessuno."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Feed dei messaggi per %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5969,13 +6157,13 @@ msgid "Author(s)"
msgstr "Autori"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Preferisci"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%s (@%s) ha aggiunto il tuo messaggio tra i suoi preferiti"
@@ -6037,42 +6225,42 @@ msgid "Invalid filename."
msgstr "Nome file non valido."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Ingresso nel gruppo non riuscito."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "Non si fa parte del gruppo."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "Uscita dal gruppo non riuscita."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr "L'ID di profilo %s non è valido."
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "Errore nel salvare l'utente; non valido."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Iscriviti"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr "L'utente %1$s è entrato nel gruppo %2$s."
@@ -6100,12 +6288,12 @@ msgid "You are banned from sending direct messages."
msgstr "Ti è proibito inviare messaggi diretti."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Impossibile inserire il messaggio."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Impossibile aggiornare il messaggio con il nuovo URI."
@@ -6123,17 +6311,17 @@ msgid "Database error inserting hashtag: %s"
msgstr "Errore del database nell'inserire un hashtag: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Problema nel salvare il messaggio. Troppo lungo."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Problema nel salvare il messaggio. Utente sconosciuto."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6141,7 +6329,7 @@ msgstr ""
"qualche minuto."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6150,37 +6338,37 @@ msgstr ""
"nuovo tra qualche minuto."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Ti è proibito inviare messaggi su questo sito."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Problema nel salvare il messaggio."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
#, fuzzy
msgid "Bad type provided to saveKnownGroups."
msgstr "Fornito un tipo errato per saveKnownGroups"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "Problema nel salvare la casella della posta del gruppo."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Impossibile salvare le informazioni del gruppo locale."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6194,7 +6382,7 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
@@ -6202,7 +6390,7 @@ msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6220,48 +6408,48 @@ msgid "Unable to save tag."
msgstr "Impossibile salvare l'etichetta."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "Non ti è possibile abbonarti."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Hai già l'abbonamento!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "L'utente non ti consente di seguirlo."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Non hai l'abbonamento!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Impossibile salvare l'abbonamento."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Impossibile salvare l'abbonamento."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Impossibile salvare l'abbonamento."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr "Segui"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "L'utente %1$s è entrato nel gruppo %2$s."
@@ -6635,10 +6823,15 @@ msgid "Before"
msgstr "Precedenti"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr "Atteso un elemento root del feed, ma ricevuto un documento XML intero."
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Fotografia"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8230,19 +8423,19 @@ msgid "Send"
msgstr "Invia"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Il soprannome deve essere composto solo da lettere minuscole e numeri, senza "
"spazi."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8485,7 +8678,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Revoca il ruolo \"%s\" a questo utente"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "Metodo delle API non trovato."
@@ -8740,17 +8933,17 @@ msgid "Moderator"
msgstr "Moderatore"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "pochi secondi fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "circa un minuto fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8758,12 +8951,12 @@ msgstr[0] "circa un minuto fa"
msgstr[1] "circa %d minuti fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "circa un'ora fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8771,12 +8964,12 @@ msgstr[0] "circa un'ora fa"
msgstr[1] "circa %d ore fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "circa un giorno fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8784,12 +8977,12 @@ msgstr[0] "circa un giorno fa"
msgstr[1] "circa %d giorni fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "circa un mese fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8797,7 +8990,7 @@ msgstr[0] "circa un mese fa"
msgstr[1] "circa %d mesi fa"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
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 ca9c2e0fa..2ebba88b1 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -6,6 +6,7 @@
# Author: Fryed-peach
# Author: Sonoda
# Author: Whym
+# Author: 青子守歌
# --
# This file is distributed under the same license as the StatusNet package.
#
@@ -13,17 +14,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:10+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:00+0000\n"
"Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -89,11 +90,11 @@ msgstr "アクセス設定の保存"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
#, fuzzy
@@ -381,20 +382,38 @@ msgstr "あなたのデザイン設定を保存できません。"
msgid "Could not update your design."
msgstr "デザインを更新できませんでした。"
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s のタイムライン"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s フォローしている"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "お気に入り"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "%s グループメンバー"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -748,7 +767,7 @@ msgstr "認証されていません。"
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -785,7 +804,7 @@ msgstr "OAuth アプリケーションユーザの追加時DBエラー。"
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -854,7 +873,7 @@ msgstr "パスワード"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
#, fuzzy
@@ -932,7 +951,8 @@ msgstr "他のユーザのステータスを消すことはできません。"
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "そのようなつぶやきはありません。"
@@ -948,7 +968,10 @@ msgstr "あなたのつぶやきを繰り返せません。"
msgid "Already repeated that notice."
msgstr "すでにつぶやきを繰り返しています。"
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "API メソッドが見つかりません。"
@@ -968,16 +991,16 @@ msgstr "ステータスを削除しました。"
msgid "No status with that ID found."
msgstr "そのIDでのステータスはありません。"
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "このつぶやきを削除できません。"
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "つぶやき削除"
@@ -1098,34 +1121,58 @@ msgstr "%s とタグ付けされたつぶやき"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$s に %1$s による更新があります!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "ユーザだけがかれら自身のメールボックスを読むことができます。"
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "つぶやきの内容を探す"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "その ID によるつぶやきは存在していません"
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1141,6 +1188,148 @@ msgstr "API メソッドが工事中です。"
msgid "User not found."
msgstr "API メソッドが見つかりません。"
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "そのようなファイルはありません。"
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "サブスクリプションを追加できません"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "つぶやきの内容を探す"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "不明"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "お気に入りに加える"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "そのようなファイルはありません。"
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "%s グループメンバー"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "グループ %s はメンバー"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "不明"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "全てのメンバー"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "そのようなファイルはありません。"
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "お気に入りを取り消すことができません。"
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "そのようなグループはありません。"
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "全てのメンバー"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "API メソッドが見つかりません。"
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "そのようなファイルはありません。"
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "あなたはそのプロファイルにフォローされていません。"
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "フォローを保存できません。"
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "人々は %s をフォローしました。"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "不明なファイルタイプ"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1313,10 +1502,9 @@ msgstr "このユーザをアンブロックする"
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
#: actions/deleteuser.php:159 actions/groupblock.php:185
-#, fuzzy
msgctxt "BUTTON"
msgid "Yes"
-msgstr "Yes"
+msgstr "はい"
#. TRANS: Submit button title for 'Yes' when blocking a user.
#. TRANS: Description of the form to block a user.
@@ -1433,8 +1621,8 @@ msgstr "そのアドレスは既に承認されています。"
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1969,12 +2157,12 @@ msgstr "%%site.name%% からのメールを管理。"
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "メールアドレス"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "現在確認されているメールアドレス。"
@@ -1983,14 +2171,14 @@ msgstr "現在確認されているメールアドレス。"
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "回復"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2003,14 +2191,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "メールアドレス、\"UserName@example.org\" のような"
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
#, fuzzy
msgctxt "BUTTON"
@@ -2019,115 +2207,122 @@ msgstr "追加"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "入ってくるメール"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "メールでつぶやきを投稿したい。"
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "新しいつぶやき投稿にこのアドレスへメールする"
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "投稿のための新しいEメールアドレスを作ります; 古い方を取り消します。"
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "New"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "メールアドレス"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "メールで新規フォローの通知を私に送ってください。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"だれかがお気に入りとして私のつぶやきを加えたら、メールを私に送ってください。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr ""
"だれかがプライベート・メッセージを私に送るときには、メールを私に送ってくださ"
"い。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "だれかが\"@-返信\"を私を送るときには、メールを私に送ってください、"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "友達が私に合図とメールを送ることを許可する。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "メールでつぶやきを投稿したい。"
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "私のメールアドレスのためにMicroIDを発行してください。"
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
#, fuzzy
msgid "Email preferences saved."
msgstr "デザイン設定が保存されました。"
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "メールアドレスがありません。"
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "そのメールアドレスを正規化できません"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "有効なメールアドレスではありません。"
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "これはすでにあなたのメールアドレスです。"
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "このメールアドレスは既に他の人が使っています。"
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "承認コードを追加できません"
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2139,57 +2334,57 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "承認待ちのものはありません。"
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
#, fuzzy
msgid "That is the wrong email address."
msgstr "その IM アドレスは不正です。"
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "メール承認を削除できません"
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "承認待ちのものはありません。"
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "これはあなたのメールアドレスではありません。"
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "入ってくるメールアドレスは削除されました。"
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "入ってくるメールアドレスではありません。"
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "ユーザレコードを更新できません。"
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "入ってくるメールアドレスは削除されました。"
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "新しい入ってくるメールアドレスが追加されました。"
@@ -5422,7 +5617,7 @@ msgstr "あなたはそのプロファイルにフォローされていません
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "フォローを保存できません。"
@@ -5430,11 +5625,6 @@ msgstr "フォローを保存できません。"
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "そのようなファイルはありません。"
-
#: actions/subscribe.php:117
#, fuzzy
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
@@ -5502,13 +5692,6 @@ msgstr ""
"%s にはフォローしている人がいません。なぜ[アカウント登録](%%%%action.register"
"%%%%)して最初にならないのですか?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "%s フォローしている"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5558,13 +5741,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s はだれも言うことを聞いていません。"
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "%sのつぶやきフィード (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5964,13 +6152,13 @@ msgid "Author(s)"
msgstr "作者"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "お気に入り"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
@@ -6027,42 +6215,42 @@ msgid "Invalid filename."
msgstr "不正なサイズ。"
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "グループ参加に失敗しました。"
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "グループの一部ではありません。"
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "グループ脱退に失敗しました。"
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "ユーザ保存エラー; 不正なユーザ"
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "参加"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6091,12 +6279,12 @@ msgid "You are banned from sending direct messages."
msgstr "あなたはダイレクトメッセージを送るのが禁止されています。"
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "メッセージを追加できません。"
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "新しいURIでメッセージをアップデートできませんでした。"
@@ -6114,24 +6302,24 @@ msgid "Database error inserting hashtag: %s"
msgstr "OAuth アプリケーションユーザの追加時DBエラー。"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "つぶやきを保存する際に問題が発生しました。長すぎです。"
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "つぶやきを保存する際に問題が発生しました。不明なユーザです。"
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
"多すぎるつぶやきが速すぎます; 数分間の休みを取ってから再投稿してください。"
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6140,36 +6328,36 @@ msgstr ""
"い。"
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "あなたはこのサイトでつぶやきを投稿するのが禁止されています。"
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "つぶやきを保存する際に問題が発生しました。"
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "グループ受信箱を保存する際に問題が発生しました。"
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "フォローを保存できません。"
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -6183,14 +6371,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6207,48 +6395,48 @@ msgid "Unable to save tag."
msgstr "タグをを保存できません。"
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "あなたはフォローが禁止されました。"
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "すでにフォローしています!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "ユーザはあなたをブロックしました。"
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "フォローしていません!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "フォローを保存できません。"
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "フォローを保存できません。"
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "フォローを保存できません。"
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s は %2$s であなたのつぶやきを聞いています。"
@@ -6627,10 +6815,15 @@ msgid "Before"
msgstr "前>>"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "写真"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8149,19 +8342,19 @@ msgid "Send"
msgstr "投稿"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
"できません。"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8395,7 +8588,7 @@ msgstr "このつぶやきを繰り返しますか?"
#: lib/repeatform.php:132
msgid "Yes"
-msgstr "Yes"
+msgstr "はい"
#: lib/repeatform.php:132
msgid "Repeat this notice"
@@ -8407,7 +8600,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "このグループからこのユーザをブロック"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "API メソッドが見つかりません。"
@@ -8660,60 +8853,60 @@ msgid "Moderator"
msgstr "管理"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "数秒前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "約 1 分前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "約 1 時間前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "約 1 日前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "約 1 ヵ月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "約 1 年前"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index 192892d19..adbb1df2a 100644
--- a/locale/ka/LC_MESSAGES/statusnet.po
+++ b/locale/ka/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:11+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:01+0000\n"
"Language-Team: Georgian <http://translatewiki.net/wiki/Portal:ka>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ka\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -85,11 +85,11 @@ msgstr "შეინახე შესვლის პარამეტრე
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -375,20 +375,38 @@ msgstr "სამწუხაროდ თქვენი დიზაინი
msgid "Could not update your design."
msgstr "დიზაინის განახლება ვერ მოხერხდა."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s-ის ნაკადი"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s გამოწერები"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "რჩეულები"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "%s ჯგუფის წევრი"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -738,7 +756,7 @@ msgstr "თქვენ არ ხართ ავტორიზირებუ
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -775,7 +793,7 @@ msgstr "ბაზამ დაუშვა შეცდომა OAuth აპლ
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -844,7 +862,7 @@ msgstr "პაროლი"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -921,7 +939,8 @@ msgstr "სხვა მომხმარებლის სტატუსი
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "ასეთი შეტყობინება არ არსებობს."
@@ -937,7 +956,10 @@ msgstr "საკუთარი შეტყობინების გამ
msgid "Already repeated that notice."
msgstr "ეს შეტყობინება უკვე გამეორებულია."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "API მეთოდი ვერ მოიძებნა."
@@ -957,16 +979,16 @@ msgstr "სტატუსი წაშლილია."
msgid "No status with that ID found."
msgstr "ასეთი ID-ს სტატუსი ვერ მოიძებნა."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "ამ შეტყობინების წაშლა შეუძლებელია."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "შეტყობინების წაშლა"
@@ -1087,34 +1109,58 @@ msgstr "შეტყობინებები მონიშნული რ
msgid "Updates tagged with %1$s on %2$s!"
msgstr "განახლებები მონიშნული როგორც %1$s %2$s-ზე!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "მხოლოდ მომხმარებელს შეუძლია თავისი ფოსტის წაკითხვა."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "მოძებნე შეტყობინებებში"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "შეტყობინებები ამ ID-თ არ არსებობს."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1130,6 +1176,145 @@ msgstr "API მეთოდი დამუშავების პროცე
msgid "User not found."
msgstr "API მეთოდი ვერ მოიძებნა."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "ასეთი პროფილი არ არსებობს."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "ახალი გამოწერის ჩასმა ვერ მოხერხდა."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "მოძებნე შეტყობინებებში"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "უცნობი"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "რჩეულებში დამატება"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "ასეთი პროფილი არ არსებობს."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "%s ჯგუფის წევრი"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "%1$s-ს ის ჯგუფები რომლებშიც გაერთიანებულია %2$s."
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "უცნობი"
+
+#: actions/atompubmembershipfeed.php:263
+msgid "Already a member."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "ასეთი ფაილი არ არსებობს."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "ფავორიტის წაშლა ვერ მოხერხდა."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "ასეთი ჯგუფი ვერ მოიძებნა."
+
+#: actions/atompubshowmembership.php:90
+msgid "Not a member"
+msgstr ""
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "API მეთოდი ვერ მოიძებნა."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "ასეთი პროფილი არ არსებობს."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "თქვენ არ გაქვთ გამოწერილი ამ პროფილის განახლებები."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "საკუთარი გამოწერის წაშლა ვერ ხერხდება."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "%s-ს გამოწერა დასრულდა წარმატებით."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "ფაილის ტიპი უცნობია"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1417,8 +1602,8 @@ msgstr "ეს მისამართი უკვე დადასტურ
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1949,12 +2134,12 @@ msgstr "%%site.name%%–სგან ელ. ფოსტის მიღებ
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "ელ. ფოსტის მისამართი"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "მიმდინარე დადასტურებული ელ. ფოსტის მისამართი."
@@ -1963,14 +2148,14 @@ msgstr "მიმდინარე დადასტურებული ე
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "წაშლა"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1983,14 +2168,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "ელ. ფოსტის მისამართი, როგორც \"UserName@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -1998,112 +2183,119 @@ msgstr "დამატება"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "შემომავალი ელ. ფოსტა"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "მინდა დავპოსტო შეტყობინებები ელ. ფოსტით."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "გააგზავნე ელ. ფოსტა ამ მისამართზე ახალი შეტყობინებების დასაპოსტად."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "ახალი"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "ელ. ფოსტის პარამეტრები"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr ""
"გამომიგზავნე შეტყობინებები ახალი გამოწერების შესახებ ელ. ფოსტის საშუალებით."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"გამომიგზავნე ელ. წერილი როდესაც ვინმე ჩემს შეტყობინებას რჩეულებში დაიმატებს."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "გამომიგზავნე ელ. წერილი როდესაც ვინმე პირად შეტყობინებას მომწერს."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "გამომიგზავნე წერილი როდესაც ვინმე გამომიგზავნის \"@-პასუხს\"."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "მინდა დავპოსტო შეტყობინებები ელ. ფოსტით."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "გამოაქვეყნე MicroID ჩემი ელ. ფოსტის მისამართისთვის."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "ელ. ფოსტის პარამეტრები შენახულია."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr " ელ. ფოსტის მისამართი მითითებული არ არის."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "არასწორი ელ. ფოსტის მისამართი."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "ეს უკვე არის თქვენი ელ. ფოსტის მისამართი."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "ეს ელ. ფოსტის მისამართი დაკავებულია."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "დასტურის კოდის ჩასმა ვერ მოხერხდა."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2115,56 +2307,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "გასაუქმებელიარაფერია. არ არის მომლოდინე დასტური."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "ეს არასწორი ელ. ფოსტის მისამართია."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "ელ. ფოსტის დადასტურების წაშლა ვერ მოხერხდა."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "ელ. ფოსტის დადასტურება გაუქმებულია."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "ეს არ არის თქვენი ელ. ფოსტის მისამართი."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "ელ. ფოსტის მისამართი მოშორებულია."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "შემომავალი ელ. ფოსტის მისამართი არ არის."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "მომხმარებლის ჩანაწერის განახლება ვერ მოხერხდა."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "შემომავალი ელ. ფოსტის მისამართი მოშორებულია."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "დამატებულია ახალი შემომავალი ელ. ფოსტა."
@@ -5344,7 +5536,7 @@ msgstr "თქვენ არ გაქვთ გამოწერილი
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "გამოწერის დამახსოვრება ვერ მოხერხდა."
@@ -5352,10 +5544,6 @@ msgstr "გამოწერის დამახსოვრება ვე
msgid "This action only accepts POST requests."
msgstr "ეს მოქმედება მხოლოდ POST მოთხოვნებს იღებს."
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "ასეთი პროფილი არ არსებობს."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
@@ -5423,13 +5611,6 @@ msgstr ""
"%s არ ჰყავს გამომწერები. [დარეგისტრირდი](%%%%action.register%%%%) და გახდი "
"პირველი."
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "%s გამოწერები"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5479,13 +5660,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s არავის უსმენს."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "შეტყობინებების RSS მონიშნული %s-თ (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5897,13 +6083,13 @@ msgid "Author(s)"
msgstr "ავტორი(ები)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "რჩეული"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%s-მა (@%s) დაამატა თქვენი შეტყობინება თავის რჩეულებში"
@@ -5959,42 +6145,42 @@ msgid "Invalid filename."
msgstr "ფაილის არასწორი სახელი."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "ჯგუფში გაწევრიანება ვერ მოხერხდა."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "ჯგუფის წევრი არ ხართ."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "ჯგუფის დატოვება ვერ მოხერხდა."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "შეცდომა მომხმარებლის შენახვისას; არასწორი."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "გაერთიანება"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6022,12 +6208,12 @@ msgid "You are banned from sending direct messages."
msgstr "თქვენ აგეკრძალათ პირდაპირი შეტყობინებების გაგზავნის უფლება."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "შეტყობინების ჩასმა ვერ მოხერხდა."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "შეტყობინების ახალი URI-თ განახლება ვერ მოხერხდა."
@@ -6045,17 +6231,17 @@ msgid "Database error inserting hashtag: %s"
msgstr "ბაზის შეცდომა hashtag-ის ჩასმისას: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "პრობლემა შეტყობინების შენახვისას. ძალიან გრძელია."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "პრობლემა შეტყობინების შენახვისას. მომხმარებელი უცნობია."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6063,7 +6249,7 @@ msgstr ""
"კიდევ დაპოსტეთ."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6072,37 +6258,37 @@ msgstr ""
"რამდენიმე წუთში ისევ დაპოსტეთ."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "თქვენ აგეკრძალათ ამ საიტზე შეტყობინებების დაპოსტვა."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "პრობლემა შეტყობინების შენახვისას."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
#, fuzzy
msgid "Bad type provided to saveKnownGroups."
msgstr "saveKnownGroups-სათვის არასწორი ტიპია მოწოდებული"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "პრობლემა ჯგუფის ინდექსის შენახვისას."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "ჯგუფის ლოკალური ინფორმაციის დამახსოვრება ვერ მოხერხდა."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6116,7 +6302,7 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
@@ -6124,7 +6310,7 @@ msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6142,48 +6328,48 @@ msgid "Unable to save tag."
msgstr "სანიშნეს დამახსოვრება ვერ ხერხდება."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "თქვენ აგეკრძალათ გამოწერა."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "უკვე გამოწერილია!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "მომხმარებელმა დაგბლოკათ."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "არ გაქვთ გამოწერილი!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "საკუთარი გამოწერის წაშლა ვერ ხერხდება."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "გამოწერის წაშლა ვერ მოხერხდა. 0მბ-იანი ტოკენი"
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "გამოწერის წაშლა ვერ მოხერხდა."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s ამიერიდან ყურს უგდებს თქვენს შეტყობინებებს %2$s-ზე."
@@ -6553,10 +6739,15 @@ msgid "Before"
msgstr "წინა"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "ფოტო"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8076,17 +8267,17 @@ msgid "Send"
msgstr "გაგზავნა"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "მეტსახელში დასაშვებია მხოლოდ პატარა ასოები და ციფრები."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8328,7 +8519,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "ჩამოართვი \"%s\" როლი ამ მომხმარებელს"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "API მეთოდი ვერ მოიძებნა."
@@ -8580,60 +8771,60 @@ msgid "Moderator"
msgstr "მოდერატორი"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "რამდენიმე წამის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "დაახლოებით 1 წუთის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "დაახლოებით 1 საათის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "დაახლოებით 1 დღის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "დაახლოებით 1 თვის წინ"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "დაახლოებით 1 წლის წინ"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 6d3faf530..a93947898 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:12+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:02+0000\n"
"Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ko\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -87,11 +87,11 @@ msgstr "접근 설정을 저장"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -371,20 +371,38 @@ msgstr "디자인 설정을 저장할 수 없습니다."
msgid "Could not update your design."
msgstr "디자인을 업데이트 할 수 없습니다."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s 타임라인"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s 구독"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "좋아하는 글들"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "%s 그룹 회원"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -736,7 +754,7 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -773,7 +791,7 @@ msgstr "OAuth 응용 프로그램 사용자 추가 중 데이터베이스 오류
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -848,7 +866,7 @@ msgstr "비밀 번호"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -925,7 +943,8 @@ msgstr "당신은 다른 사용자의 상태를 삭제하지 않아도 된다."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "그러한 통지는 없습니다."
@@ -941,7 +960,10 @@ msgstr "자기 자신의 소식은 재전송할 수 없습니다."
msgid "Already repeated that notice."
msgstr "이미 재전송된 소식입니다."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "API 메서드 발견 안 됨."
@@ -961,16 +983,16 @@ msgstr "삭제된 소식입니다."
msgid "No status with that ID found."
msgstr "발견된 ID의 상태가 없습니다."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "이 통지를 지울 수 없습니다."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "통지 삭제"
@@ -1091,34 +1113,58 @@ msgstr "%s 태그된 통지"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$s에 있는 %1$s의 업데이트!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "통지들의 내용 찾기"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "해당 id의 프로필이 없습니다."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1133,6 +1179,147 @@ msgstr "API 메서드를 구성중 입니다."
msgid "User not found."
msgstr "API 메서드 발견 안 됨."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "해당하는 파일이 없습니다."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "예약 구독을 추가 할 수 없습니다."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "통지들의 내용 찾기"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "알려지지 않은 행동"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "좋아하는 게시글로 추가하기"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "해당하는 파일이 없습니다."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "%s 그룹 회원"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "%s 사용자가 멤버인 그룹"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "알려지지 않은 행동"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "모든 회원"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "해당하는 파일이 없습니다."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "관심소식을 삭제할 수 없습니다."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "그러한 그룹이 없습니다."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "모든 회원"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "API 메서드 발견 안 됨."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "해당하는 파일이 없습니다."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "당신은 이 프로필에 구독되지 않고있습니다."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "구독을 저장할 수 없습니다."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "%s에 의해 구독되는 사람들"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "알 수 없는 종류의 파일입니다"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1422,8 +1609,8 @@ msgstr "그 주소는 이미 승인되었습니다."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1951,12 +2138,12 @@ msgstr "%%site.name%%에서 어떻게 메일을 받을지 정하십시오."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "메일 주소"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "확인된 최신의 메일 계정"
@@ -1965,14 +2152,14 @@ msgstr "확인된 최신의 메일 계정"
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "제거"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1985,14 +2172,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "\"사용자이름@예제.org\"와 같은 메일 계정"
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2000,110 +2187,117 @@ msgstr "추가"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "받은 메일"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "메일로 통보를 포스트합니다."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "새로운 통지를 올리려면 이 주소로 메일을 보내십시오."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "포스팅을 위한 새 메일 계정의 생성; 전 메일 계정은 취소."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "새 게임"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "메일 설정"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "새로운 예약 구독의 통지를 메일로 보내주세요."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일을 보냅니다."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "누군가 내게 비밀메시지를 보냈을 때, 메일을 보냅니다."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "누군가 내게 @ 답장을 보냈을 때, 메일을 보냅니다."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "친구들이 내게 메일이나 쪽지를 보낼 수 있도록 허용합니다."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "메일로 통보를 포스트합니다."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "메일 주소를 위한 MicroID의 생성"
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "메일 설정이 저장되었습니다."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "메일 주소가 없습니다."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "메일 주소를 정규화 할 수 없습니다."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "올바른 메일 주소가 아닙니다."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "그 메일 주소는 이미 귀하의 것입니다."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "그 메일 주소는 이미 다른 사용자의 소유입니다."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "확인 코드를 추가 할 수 없습니다."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2114,57 +2308,57 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "취소 할 대기중인 인증이 없습니다."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
#, fuzzy
msgid "That is the wrong email address."
msgstr "옳지 않은 메신저 계정 입니다."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "메일 승인을 삭제 할 수 없습니다."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "취소 할 대기중인 인증이 없습니다."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "그 메일 주소는 귀하의 것이 아닙니다."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "메일 주소를 지웠습니다."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "받는 메일 주소가 없습니다."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "사용자 기록을 업데이트 할 수 없습니다."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "받는 메일 주소를 지웠습니다."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "새로운 받는 메일 주소를 추가했습니다."
@@ -5313,7 +5507,7 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "구독을 저장할 수 없습니다."
@@ -5321,10 +5515,6 @@ msgstr "구독을 저장할 수 없습니다."
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "해당하는 파일이 없습니다."
-
#: actions/subscribe.php:117
#, fuzzy
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
@@ -5387,13 +5577,6 @@ msgid ""
"%) and be the first?"
msgstr ""
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "%s 구독"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5437,13 +5620,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%1$s님이 귀하의 알림 메시지를 %2$s에서 듣고 있습니다."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "%s 그룹을 위한 공지피드 (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5852,13 +6040,13 @@ msgid "Author(s)"
msgstr "작성자"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "좋아합니다"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일을 보냅니다."
@@ -5910,43 +6098,43 @@ msgid "Invalid filename."
msgstr "옳지 않은 크기"
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "그룹에 가입하지 못했습니다."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
#, fuzzy
msgid "Not part of group."
msgstr "그룹을 업데이트 할 수 없습니다."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "그룹에 가입하지 못했습니다."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "사용자 저장 오류; 무효한 사용자"
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "가입"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -5976,12 +6164,12 @@ msgid "You are banned from sending direct messages."
msgstr "직접 메시지 보내기 오류."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "메시지를 삽입할 수 없습니다."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "새 URI와 함께 메시지를 업데이트할 수 없습니다."
@@ -5999,18 +6187,18 @@ msgid "Database error inserting hashtag: %s"
msgstr "OAuth 응용 프로그램 사용자 추가 중 데이터베이스 오류"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "통지를 저장하는데 문제가 발생했습니다."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "게시글 저장문제. 알려지지않은 회원"
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6018,7 +6206,7 @@ msgstr ""
"해보세요."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -6028,37 +6216,37 @@ msgstr ""
"해보세요."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "이 사이트에 게시글 포스팅으로부터 당신은 금지되었습니다."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "통지를 저장하는데 문제가 발생했습니다."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
#, fuzzy
msgid "Problem saving group inbox."
msgstr "통지를 저장하는데 문제가 발생했습니다."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "새 그룹을 만들 수 없습니다."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6072,14 +6260,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6095,50 +6283,50 @@ msgid "Unable to save tag."
msgstr "태그를 저장할 수 없습니다."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "귀하는 구독이 금지되었습니다."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
#, fuzzy
msgid "Already subscribed!"
msgstr "구독하고 있지 않습니다!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "사용자가 귀하를 차단했습니다."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
#, fuzzy
msgid "Not subscribed!"
msgstr "구독하고 있지 않습니다!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "구독을 저장할 수 없습니다."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "구독을 저장할 수 없습니다."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "구독을 저장할 수 없습니다."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr "팔로우"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s님이 귀하의 알림 메시지를 %2$s에서 듣고 있습니다."
@@ -6510,10 +6698,15 @@ msgid "Before"
msgstr "앞 페이지"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "사진"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -7950,19 +8143,19 @@ msgid "Send"
msgstr "보내기"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"별명은 반드시 영소문자와 숫자로만 이루어져야 하며 스페이스의 사용이 불가 합니"
"다."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8206,7 +8399,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "그룹 이용자는 차단해제"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "API 메서드 발견 안 됨."
@@ -8460,60 +8653,60 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "몇 초 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "1분 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "1시간 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "하루 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "1달 전"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "1년 전"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 56679d9c3..ab36d623b 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:13+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:04+0000\n"
"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -88,11 +88,11 @@ msgstr "Зачувај нагодувања на пристап"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -382,20 +382,38 @@ msgstr "Не можам да ги зачувам Вашите нагодувањ
msgid "Could not update your design."
msgstr "Не може да се поднови Вашиот изглед."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr "Главна"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "Историја на %s"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "Претплати на %s"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Бендисани"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "Членови на групата %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -746,7 +764,7 @@ msgstr "Жетонот за барање е веќе овластен."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -782,7 +800,7 @@ msgstr "Грешка во базата при вметнувањето на auth
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -856,7 +874,7 @@ msgstr "Лозинка"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -933,7 +951,8 @@ msgstr "Не можете да избришете статус на друг к
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Нема таква забелешка."
@@ -949,7 +968,10 @@ msgstr "Не можете да ја повторувате сопственат
msgid "Already repeated that notice."
msgstr "Забелешката е веќе повторена."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
msgstr "HTML-методот не е поддржан."
@@ -968,16 +990,16 @@ msgstr "Статусот е избришан."
msgid "No status with that ID found."
msgstr "Нема пронајдено статус со тој ID."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr "Може да се избрише само користејќи го форматот Atom."
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Не може да се избрише оваа забелешка."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, php-format
msgid "Deleted notice %d"
msgstr "Избришана забелешката %d"
@@ -1102,33 +1124,61 @@ msgstr "Забелешки означени со %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Подновувањата се означени со %1$s на %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
msgid "Only the user can add to their own timeline."
msgstr "Само корисникот може да ја надополнува својата хронологија."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+#, fuzzy
+msgid "Only accept AtomPub for Atom feeds."
msgstr "Прифаќај само AtomPub за Atom-канали."
-#: actions/apitimelineuser.php:316
+#: actions/apitimelineuser.php:310
+#, fuzzy
+msgid "Atom post must not be empty."
+msgstr "Забелешката преку Atom мора да биде Atom-ставка."
+
+#: actions/apitimelineuser.php:315
+#, fuzzy
+msgid "Atom post must be well-formed XML."
+msgstr "Забелешката преку Atom мора да биде Atom-ставка."
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr "Забелешката преку Atom мора да биде Atom-ставка."
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+#, fuzzy
+msgid "Can only handle POST activities."
msgstr "Може да работи само со објавувања."
-#: actions/apitimelineuser.php:334
-#, php-format
-msgid "Cannot handle activity object type \"%s\""
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
+#, fuzzy, php-format
+msgid "Cannot handle activity object type \"%s\"."
msgstr "Не може да работи со предмети на активност од типот „%s“"
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Пронајдете содржини на забелешките"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "Веќе постои забелешка со URI „%s“."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr "AtomPub-објава со непознат URI за внимание %s"
@@ -1143,6 +1193,150 @@ msgstr "API-методот е во изработка."
msgid "User not found."
msgstr "Корисникот не е пронајден."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Нема таков профил."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Не може да се внесе нова претплата."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+#, fuzzy
+msgid "Can only handle Favorite activities."
+msgstr "Може да работи само со објавувања."
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Може да работи само со објавувања."
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Непознато"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Додај во бендисани"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Нема таков профил."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "Членови на групата %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Групи кадешто членува %s"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+#, fuzzy
+msgid "Can only handle Join activities."
+msgstr "Може да работи само со објавувања."
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Непознато"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Сите членови"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Нема таква податотека."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Не можам да ја избришам бендисаната забелешка."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Нема таква група."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Сите членови"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "HTML-методот не е поддржан."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Нема таков профил."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Не сте претплатени на тој профил."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Не можам да ја избришам самопретплатата."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Луѓе претплатени на %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+#, fuzzy
+msgid "Can only handle Follow activities."
+msgstr "Може да работи само со објавувања."
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Непознат тип на податотека"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1431,8 +1625,8 @@ msgstr "Оваа адреса веќе е потврдена."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1955,12 +2149,12 @@ msgstr "Раководење со начинот на кој добивате е
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "Е-поштенска адреса"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Тековна потврдена е-поштенска адреса."
@@ -1969,14 +2163,14 @@ msgstr "Тековна потврдена е-поштенска адреса."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Отстрани"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1989,14 +2183,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "Е-пошта, од обликот „UserName@example.org“"
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2004,113 +2198,120 @@ msgstr "Додај"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Приемна пошта"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Сакам да објавувам забелешки по е-пошта."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Испраќајте е-пошта на оваа адреса за да објавувате нови забелешки."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Создај нова е-поштенска адреса за примање објави; ја заменува старата адреса."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Нова"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Нагодувања за е-пошта"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Испраќај ми известувања за нови претплати по е-пошта."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Испраќај ми е-пошта кога некој ќе бендиса моја забелешка."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Испраќај ми е-пошта кога некој ќе ми испрати приватна порака."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Испраќај ми е-пошта кога некој ќе ми испрати „@-одговор“"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr ""
"Дозволи им на пријателите да можат да ме подбуцнуваат и да ми испраќаат е-"
"пошта."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Сакам да објавувам забелешки по е-пошта."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Објави MicroID за мојата е-поштенска адреса."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "Нагодувањата за е-пошта се зачувани."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Нема е-поштенска адреса."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Неможам да ја нормализирам таа е-поштенска адреса"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Неправилна адреса за е-пошта."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Оваа е-поштенска адреса е веќе Ваша."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Таа е-поштенска адреса е веќе зафатена од друг корисник."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Потврдниот код не може да се внесе."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2122,56 +2323,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Нема потврди кои може да се откажат."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Ова е погрешна е-поштенска адреса."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Не можев да ја избришам потврдата по е-пошта."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Потврдата на е-пошта е откажана."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Ова не е Вашата е-поштенска адреса."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "Е-поштенската адреса е отстранета."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Нема приемна е-поштенска адреса."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Не можев да ја подновам корисничката евиденција."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Приемната е-поштенска адреса е отстранета."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Додадена е нова влезна е-поштенска адреса."
@@ -5391,7 +5592,7 @@ msgstr "Не сте претплатени на тој профил."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Не можев да ја зачувам претплатата."
@@ -5399,10 +5600,6 @@ msgstr "Не можев да ја зачувам претплатата."
msgid "This action only accepts POST requests."
msgstr "Ова дејство прифаќа само POST-барања"
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Нема таков профил."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
@@ -5469,13 +5666,6 @@ msgstr ""
"%s нема претплатници. Зошто не [регистрирате сметка](%%%%action.register%%%"
"%) и станете првиот претплатник?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "Претплати на %s"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5524,13 +5714,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s не следи никого."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Канал со забелешки за %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "СМС"
@@ -5939,13 +6134,13 @@ msgid "Author(s)"
msgstr "Автор(и)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Бендисај"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%1$s ја бендиса забелешката %2$s."
@@ -6008,42 +6203,42 @@ msgid "Invalid filename."
msgstr "Погрешно податотечно име."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Зачленувањето во групата не успеа."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "Не е дел од групата."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "Напуштањето на групата не успеа."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr "Назнаката (ID) %s на профилот е неважечка."
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, php-format
msgid "Group ID %s is invalid."
msgstr "Групната назнака %s е неважечка."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Зачлени се"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr "%1$s се зачлени во групата %2$s."
@@ -6071,12 +6266,12 @@ msgid "You are banned from sending direct messages."
msgstr "Забрането Ви е испраќање на директни пораки."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Не можев да ја испратам пораката."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Не можев да ја подновам пораката со нов URI."
@@ -6094,17 +6289,17 @@ msgid "Database error inserting hashtag: %s"
msgstr "Грешка во базата на податоци при вметнувањето на тарабната ознака: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Проблем со зачувувањето на белешката. Премногу долго."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Проблем со зачувувањето на белешката. Непознат корисник."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6112,7 +6307,7 @@ msgstr ""
"неколку минути."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6121,36 +6316,36 @@ msgstr ""
"неколку минути."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Забрането Ви е да објавувате забелешки на ова мрежно место."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Проблем во зачувувањето на белешката."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr "На saveKnownGroups му е укажан погрешен тип."
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "Проблем при зачувувањето на групното приемно сандаче."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Не можев да го зачувам одговорот за %1$d, %2$d."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6164,7 +6359,7 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
@@ -6173,7 +6368,7 @@ msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6191,48 +6386,48 @@ msgid "Unable to save tag."
msgstr "Не можам да ја зачувам ознаката."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "Блокирани сте од претплаќање."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Веќе претплатено!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "Корисникот Ве има блокирано."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Не сте ни претплатени!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Не можам да ја избришам самопретплатата."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Не можам да го избришам OMB-жетонот за претплата."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Не можам да ја избришам претплатата."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr "Следи"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s сега го/ја следи %2$s."
@@ -6605,10 +6800,15 @@ msgid "Before"
msgstr "Претходно"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr "Се очекува коренски каналски елемент, но добив цел XML документ."
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Фото"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8187,22 +8387,22 @@ msgid "Send"
msgstr "Прати"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Прекарот мора да има само мали букви и бројки и да нема празни места."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
-msgstr ""
+msgstr "Прекарот не може да стои празен."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Прекарот не смее да биде подолг од %d знак."
+msgstr[1] "Прекарот не смее да биде подолг од %d знака."
#: lib/noticeform.php:160
msgid "Send a notice"
@@ -8440,7 +8640,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Одземи му ја улогата „%s“ на корисников"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
msgid "Page not found."
msgstr "Страницата не е пронајдена."
@@ -8691,17 +8891,17 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "пред неколку секунди"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "пред една минута"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8709,12 +8909,12 @@ msgstr[0] "пред околу една минута"
msgstr[1] "пред околу %d минути"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "пред еден час"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8722,12 +8922,12 @@ msgstr[0] "пред околу еден час"
msgstr[1] "пред околу %d часа"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "пред еден ден"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8735,12 +8935,12 @@ msgstr[0] "пред околу еден ден"
msgstr[1] "пред околу %d дена"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "пред еден месец"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8748,7 +8948,7 @@ msgstr[0] "пред околу еден месец"
msgstr[1] "пред околу %d месеци"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "пред една година"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 1143a8963..8c5ac55d3 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:16+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:07+0000\n"
"Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: no\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -87,11 +87,11 @@ msgstr "Lagre tilgangsinnstillinger"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -382,20 +382,38 @@ msgstr "Kunne ikke lagre dine innstillinger for utseende."
msgid "Could not update your design."
msgstr "Klarte ikke å oppdatere bruker."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s tidslinje"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Alle abonnementer"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Favoritter"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "%s gruppemedlemmer"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -747,7 +765,7 @@ msgstr "Du er ikke autorisert."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -783,7 +801,7 @@ msgstr "Databasefeil ved innsetting av oauth_token_association."
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -857,7 +875,7 @@ msgstr "Passord"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -934,7 +952,8 @@ msgstr "Du kan ikke slette statusen til en annen bruker."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Ingen slik notis."
@@ -950,7 +969,10 @@ msgstr "Kan ikke gjenta din egen notis."
msgid "Already repeated that notice."
msgstr "Allerede gjentatt den notisen."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "API-metode ikke funnet!"
@@ -970,16 +992,16 @@ msgstr "Status slettet."
msgid "No status with that ID found."
msgstr "Ingen status med den ID-en funnet."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Kan ikke slette notisen."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "Slett notis"
@@ -1100,34 +1122,58 @@ msgstr "Notiser merket med %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Oppdateringer merket med %1$s på %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "Bare brukeren kan lese sine egne postbokser."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Finn innhold i notiser"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr ""
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1142,6 +1188,147 @@ msgstr "API-metode under utvikling."
msgid "User not found."
msgstr "Bruker ikke funnet."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Ingen slik profil."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Kunne ikke sette inn bekreftelseskode."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Finn innhold i notiser"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Ukjent"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Legg til i favoritter"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Ingen slik profil."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "%s gruppemedlemmer"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "%1$s grupper %2$s er et medlem av."
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Ukjent"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Alle medlemmer"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Ingen slik fil."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Kunne ikke slette favoritt."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Ingen slik gruppe."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Alle medlemmer"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "API-metode ikke funnet!"
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Ingen slik profil."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Ikke autorisert."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Kunne ikke slette favoritt."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Fjernabonner"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Ukjent filtype"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1427,8 +1614,8 @@ msgstr "Den adressen har allerede blitt bekreftet."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1957,12 +2144,12 @@ msgstr "Velg hvordan du mottar e-post fra %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "E-postadresse"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Nåværende bekreftede e-postadresse"
@@ -1971,14 +2158,14 @@ msgstr "Nåværende bekreftede e-postadresse"
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Fjern"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1991,14 +2178,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "E-postadresse («brukernavn@eksempel.org»)"
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2006,110 +2193,117 @@ msgstr "Legg til"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "innkommende e-post"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Jeg vil poste notiser med e-post."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Send e-post til denne adressen for å poste nye notiser."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Angi en ny e-postadresse for å poste til; fjerner den gamle."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Ny"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "E-postinnstillinger"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Send meg varsler om nye abonnementer gjennom e-post."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Send meg en e-post når noen legger min notis til som favoritt."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Send meg en e-post når noen sender meg en privat melding."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Send meg en e-post når noen sender meg et «@-svar»."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Tillat venner å knuffe meg og sende meg en e-post."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Jeg vil poste notiser med e-post."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Publiser en MicroID for min e-postadresse."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "E-postinnstillinger lagret."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Ingen e-postadresse."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Klarer ikke normalisere epostadressen"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ugyldig e-postadresse."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Det er allerede din e-postadresse."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Den e-postadressen tilhører allerede en annen bruker."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Kunne ikke sette inn bekreftelseskode."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2120,56 +2314,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Ingen ventende bekreftelse å avbryte."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Dette er feil e-postadresse."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Kunne ikke slette e-postbekreftelse."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "E-postbekreftelse avbrutt."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Det er ikke din e-postadresse."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "E-postadressen ble fjernet."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Ingen innkommende e-postadresse."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Kunne ikke oppdatere brukeroppføring."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Inkommende e-postadresse fjernet."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Ny innkommende e-postadresse lagt til."
@@ -5355,7 +5549,7 @@ msgstr "Ikke autorisert."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Kunne ikke lagre merkelapper."
@@ -5363,10 +5557,6 @@ msgstr "Kunne ikke lagre merkelapper."
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Ingen slik profil."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
@@ -5431,13 +5621,6 @@ msgstr ""
"Hvorfor ikke [registrere en konto](%%action.register%%) og vær den første "
"til å poste!"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Alle abonnementer"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5481,13 +5664,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s lytter ikke til noen."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Notismating for %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5885,14 +6073,14 @@ msgid "Author(s)"
msgstr "Forfatter(e)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
#, fuzzy
msgid "Favor"
msgstr "Favoritter"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%s /@%s) la din notis til som en favoritt"
@@ -5946,42 +6134,42 @@ msgid "Invalid filename."
msgstr "Ugyldig filnavn."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Gruppeprofil"
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "Kunne ikke oppdatere gruppe."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "Gruppeprofil"
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "Feil ved lagring av bruker; ugyldig."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Bli med"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6010,12 +6198,12 @@ msgid "You are banned from sending direct messages."
msgstr "Feil ved sending av direktemelding."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Kunne ikke sette inn melding."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Kunne ikke oppdatere melding med ny nettadresse."
@@ -6033,60 +6221,60 @@ msgid "Database error inserting hashtag: %s"
msgstr "Databasefeil ved innsetting av bruker i programmet OAuth."
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Problem ved lagring av notis. For lang."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Problem ved lagring av notis. Ukjent bruker."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
#, fuzzy
msgid "You are banned from posting notices on this site."
msgstr "Du kan ikke bringe brukere til taushet på dette nettstedet."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Problem ved lagring av notis."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "Problem ved lagring av gruppeinnboks."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Kunne ikke lagre lokal gruppeinformasjon."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6100,14 +6288,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6124,51 +6312,51 @@ msgid "Unable to save tag."
msgstr "Kunne ikke lagre nettstedsnotis."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Brukeren har blokkert deg fra å abonnere."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
#, fuzzy
msgid "Already subscribed!"
msgstr "Alle abonnementer"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "Bruker har blokkert deg."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
#, fuzzy
msgid "Not subscribed!"
msgstr "Alle abonnementer"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Kunne ikke slette favoritt."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Kunne ikke slette favoritt."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Kunne ikke slette favoritt."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s lytter nå til dine notiser på %2$s."
@@ -6539,10 +6727,15 @@ msgid "Before"
msgstr "Før"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Foto"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8096,17 +8289,17 @@ msgid "Send"
msgstr "Send"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Kallenavn kan kun ha små bokstaver og tall og ingen mellomrom."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8355,7 +8548,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Blokker denne brukeren fra denne gruppen"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "API-metode ikke funnet!"
@@ -8613,17 +8806,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "noen få sekunder siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "omtrent ett minutt siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8631,12 +8824,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "omtrent én time siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8644,12 +8837,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "omtrent én dag siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8657,12 +8850,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "omtrent én måned siden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8670,7 +8863,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
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 6c5081efe..da3e2c4b4 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:14+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:05+0000\n"
"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -88,11 +88,11 @@ msgstr "Toegangsinstellingen opslaan"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -384,20 +384,38 @@ msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan."
msgid "Could not update your design."
msgstr "Het was niet mogelijk uw ontwerp bij te werken."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr "Hoofdmenu"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s tijdlijn"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "Abonnementen van %s"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Favorieten"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "leden van de groep %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -750,7 +768,7 @@ msgstr "Het verzoektoken is al geautoriseerd."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -790,7 +808,7 @@ msgstr ""
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -864,7 +882,7 @@ msgstr "Wachtwoord"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -941,7 +959,8 @@ msgstr "U kunt de status van een andere gebruiker niet verwijderen."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "De mededeling bestaat niet."
@@ -957,7 +976,10 @@ msgstr "U kunt uw eigen mededeling niet herhalen."
msgid "Already repeated that notice."
msgstr "U hebt die mededeling al herhaald."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
msgstr "HTTP-methode wordt niet ondersteund."
@@ -976,16 +998,16 @@ msgstr "De status is verwijderd."
msgid "No status with that ID found."
msgstr "Er is geen status gevonden met dit ID."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr "Het is alleen mogelijk te verwijderen via de Atomopmaak."
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Deze mededeling kan niet verwijderd worden."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, php-format
msgid "Deleted notice %d"
msgstr "Mededeling %d is verwijderd"
@@ -1111,33 +1133,61 @@ msgstr "Mededelingen met het label %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Updates met het label %1$s op %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
msgid "Only the user can add to their own timeline."
msgstr "Gebruikers kunnen alleen zelf aan hun eigen tijdlijn toevoegen."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+#, fuzzy
+msgid "Only accept AtomPub for Atom feeds."
msgstr "Alleen AtomPub voor Atomfeeds accepteren."
-#: actions/apitimelineuser.php:316
+#: actions/apitimelineuser.php:310
+#, fuzzy
+msgid "Atom post must not be empty."
+msgstr "Het Atombericht moet een Atomopmaak hebben."
+
+#: actions/apitimelineuser.php:315
+#, fuzzy
+msgid "Atom post must be well-formed XML."
+msgstr "Het Atombericht moet een Atomopmaak hebben."
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr "Het Atombericht moet een Atomopmaak hebben."
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+#, fuzzy
+msgid "Can only handle POST activities."
msgstr "Het is alleen mogelijk om POST-activiteit af te handelen."
-#: actions/apitimelineuser.php:334
-#, php-format
-msgid "Cannot handle activity object type \"%s\""
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
+#, fuzzy, php-format
+msgid "Cannot handle activity object type \"%s\"."
msgstr "Het is niet mogelijk om het activiteitobjecttype \"%s\" te verwerken"
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Inhoud van mededelingen vinden"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "De mededeling met URI \"%s\" bestaat al."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr "Het AtomPubbericht met onbekende aandachts-URI is %s"
@@ -1152,6 +1202,151 @@ msgstr "De API-functie is in bewerking."
msgid "User not found."
msgstr "De pagina is niet aangetroffen."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Het profiel bestaat niet."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Kon nieuw abonnement niet toevoegen."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+#, fuzzy
+msgid "Can only handle Favorite activities."
+msgstr "Het is alleen mogelijk om POST-activiteit af te handelen."
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Het is alleen mogelijk om POST-activiteit af te handelen."
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Onbekend"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Aan favorieten toevoegen"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Het profiel bestaat niet."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "leden van de groep %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Groepen waar %s lid van is"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+#, fuzzy
+msgid "Can only handle Join activities."
+msgstr "Het is alleen mogelijk om POST-activiteit af te handelen."
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Onbekend"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Alle leden"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Het bestand bestaat niet."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr ""
+"Het was niet mogelijk deze mededeling van uw favorietenlijst te verwijderen."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "De opgegeven groep bestaat niet."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Alle leden"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "HTTP-methode wordt niet ondersteund."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Het profiel bestaat niet."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "U bent niet geabonneerd op dat profiel."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Kon abonnement op eigen gebruiker niet verwijderen."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Gebruikers met een abonnement op %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+#, fuzzy
+msgid "Can only handle Follow activities."
+msgstr "Het is alleen mogelijk om POST-activiteit af te handelen."
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Onbekend bestandstype"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1439,8 +1634,8 @@ msgstr "Dit adres is al bevestigd."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1965,12 +2160,12 @@ msgstr "Uw e-mailinstellingen op %%site.name%% beheren."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "E-mailadres"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Huidige bevestigde e-mailadres"
@@ -1979,14 +2174,14 @@ msgstr "Huidige bevestigde e-mailadres"
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Verwijderen"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1999,14 +2194,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "E-mailadres, zoals \"gebruikersnaam@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2014,112 +2209,119 @@ msgstr "Toevoegen"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Inkomende e-mail"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Ik wil mededelingen per e-mail plaatsen."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Stuur een email naar dit adres om een nieuw bericht te posten"
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Stelt een nieuw e-mailadres in voor het ontvangen van berichten. Het "
"bestaande e-mailadres wordt verwijderd."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Nieuw"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "E-mailvoorkeuren"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Mij e-mailen bij nieuwe abonnementen."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Mij e-mailen als iemand mijn mededeling als favoriet instelt."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Mij e-mailen als iemand mij een privébericht zendt."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Mij e-mailen als iemand mij een antwoord met \"@\" erin stuurt."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Vrienden mogen me porren en e-mailen."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Ik wil mededelingen per e-mail plaatsen."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Een MicroID voor mijn e-mailadres publiceren."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "De e-mailvoorkeuren zijn opgeslagen."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Geen e-mailadres"
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Kan het emailadres niet normaliseren"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Geen geldig e-mailadres."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "U hebt dit e-mailadres als ingesteld als uw e-mailadres."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Dit e-mailadres is al geregistreerd door een andere gebruiker."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "De bevestigingscode kon niet ingevoegd worden."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2131,56 +2333,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Er is geen openstaand bevestigingsverzoek om te annuleren."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Dat is het verkeerde e-mailadres."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "De e-mailbevestiging kon niet verwijderd worden."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "E-mailbevestiging geannuleerd."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Dit is niet uw e-mailadres."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "Het e-mailadres is verwijderd."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Geen binnenkomend e-mailadres"
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Kan de gebruikersgegevens niet vernieuwen"
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Het e-mailadres voor inkomende mail is verwijderd."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Het nieuwe binnenkomende e-mailadres is toegevoegd."
@@ -5412,7 +5614,7 @@ msgstr "U bent niet geabonneerd op dat profiel."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Het was niet mogelijk het abonnement op te slaan."
@@ -5420,10 +5622,6 @@ msgstr "Het was niet mogelijk het abonnement op te slaan."
msgid "This action only accepts POST requests."
msgstr "Deze handeling accepteert alleen POST-verzoeken."
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Het profiel bestaat niet."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
@@ -5491,13 +5689,6 @@ msgstr ""
"%s heeft geen abonnees. Als u zich [registreert](%%%%action.register%%%%) "
"kunt u de eerste zijn."
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "Abonnementen van %s"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5547,13 +5738,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s volgt niemand."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Mededelingenfeed voor %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5965,13 +6161,13 @@ msgid "Author(s)"
msgstr "Auteur(s)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Aan favorieten toevoegen"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%1$s heeft de mededeling %2$s als favoriet gemarkeerd."
@@ -6032,42 +6228,42 @@ msgid "Invalid filename."
msgstr "Ongeldige bestandsnaam."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Groepslidmaatschap toevoegen is mislukt."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "Geen lid van groep."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "Groepslidmaatschap opzeggen is mislukt."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr "Profiel-ID %s is ongeldig."
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, php-format
msgid "Group ID %s is invalid."
msgstr "Groep-ID %s is ongeldig."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Toetreden"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr "%1$s is lid geworden van de groep %2$s."
@@ -6095,12 +6291,12 @@ msgid "You are banned from sending direct messages."
msgstr "U mag geen directe berichten verzenden."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Het was niet mogelijk het bericht in te voegen."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI."
@@ -6118,21 +6314,21 @@ msgid "Database error inserting hashtag: %s"
msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr ""
"Er is een probleem opgetreden bij het opslaan van de mededeling. Deze is te "
"lang."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr ""
"Er was een probleem bij het opslaan van de mededeling. De gebruiker is "
"onbekend."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6140,7 +6336,7 @@ msgstr ""
"het over enige tijd weer."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6149,24 +6345,24 @@ msgstr ""
"plaats over een aantal minuten pas weer een bericht."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr ""
"U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr "Het gegevenstype dat is opgegeven aan saveKnownGroups is onjuist"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr ""
"Er is een probleem opgetreden bij het opslaan van het Postvak IN van de "
@@ -6174,14 +6370,14 @@ msgstr ""
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Het was niet mogelijk antwoord %1$d voor %2$d op te slaan."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6195,7 +6391,7 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
@@ -6204,7 +6400,7 @@ msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6222,49 +6418,49 @@ msgid "Unable to save tag."
msgstr "Het was niet mogelijk om het label op te slaan."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "U mag zich niet abonneren."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "U bent al gebonneerd!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "Deze gebruiker negeert u."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Niet geabonneerd!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Kon abonnement op eigen gebruiker niet verwijderen."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr ""
"Het was niet mogelijk om het OMB-token voor het abonnement te verwijderen."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Kon abonnement niet verwijderen."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr "Volgen"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s is %2$s gaan volgen."
@@ -6639,10 +6835,15 @@ msgid "Before"
msgstr "Eerder"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr "Verwachtte een root-feed element maar kreeg een heel XML-document."
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Foto"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8230,24 +8431,24 @@ msgid "Send"
msgstr "Verzenden"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"De gebruikersnaam mag alleen kleine letters en cijfers bevatten. Spaties "
"zijn niet toegestaan."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
-msgstr ""
+msgstr "Gebruikersnaam kan niet leeg zijn."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "De gebruikersnaam mag niet langer zijn dan %d teken."
+msgstr[1] "De gebruikersnaam mag niet langer zijn dan %d tekens."
#: lib/noticeform.php:160
msgid "Send a notice"
@@ -8485,7 +8686,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "De gebruikersrol \"%s\" voor deze gebruiker intrekken"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
msgid "Page not found."
msgstr "De pagina is niet aangetroffen."
@@ -8743,17 +8944,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "een paar seconden geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "ongeveer een minuut geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8761,12 +8962,12 @@ msgstr[0] "ongeveer een minuut geleden"
msgstr[1] "ongeveer %d minuten geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "ongeveer een uur geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8774,12 +8975,12 @@ msgstr[0] "ongeveer een uur geleden"
msgstr[1] "ongeveer %d uur geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "ongeveer een dag geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8787,12 +8988,12 @@ msgstr[0] "ongeveer een dag geleden"
msgstr[1] "ongeveer %d dagen geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "ongeveer een maand geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8800,7 +9001,7 @@ msgstr[0] "ongeveer een maand geleden"
msgstr[1] "ongeveer %d maanden geleden"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
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 fd99e5b67..2bfd4a044 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:15+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:06+0000\n"
"Language-Team: Norwegian Nynorsk <http://translatewiki.net/wiki/Portal:nn>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nn\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -93,11 +93,11 @@ msgstr "Avatar-innstillingar"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
#, fuzzy
@@ -382,20 +382,38 @@ msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
msgid "Could not update your design."
msgstr "Kan ikkje oppdatera brukar."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s tidsline"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s tingarar"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Favorittar"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "%s medlemmar i gruppa"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
#, fuzzy
@@ -758,7 +776,7 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -796,7 +814,7 @@ msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -865,7 +883,7 @@ msgstr "Passord"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
#, fuzzy
@@ -942,7 +960,8 @@ msgstr "Du kan ikkje sletta statusen til ein annan brukar."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Denne notisen finst ikkje."
@@ -959,7 +978,10 @@ msgstr "Kan ikkje slå på notifikasjon."
msgid "Already repeated that notice."
msgstr "Kan ikkje sletta notisen."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "Fann ikkje API-metode."
@@ -980,16 +1002,16 @@ msgstr "Lasta opp brukarbilete."
msgid "No status with that ID found."
msgstr "Fann ingen status med den ID-en."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Kan ikkje sletta notisen."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "Slett notis"
@@ -1113,34 +1135,58 @@ msgstr "Notisar merka med %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Oppdateringar frå %1$s på %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "Kun brukaren kan lese sine eigne meldingar."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Søk i innhaldet av notisar"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "Fann ingen profil med den IDen."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1155,6 +1201,148 @@ msgstr "API-metoden er ikkje ferdig enno."
msgid "User not found."
msgstr "Fann ikkje API-metode."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Denne notisen finst ikkje."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Kan ikkje leggja til ny tinging."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Søk i innhaldet av notisar"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Uventa handling."
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Legg til i favorittar"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Denne notisen finst ikkje."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "%s medlemmar i gruppa"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Grupper %s er medlem av"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Uventa handling."
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Alle medlemmar"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Denne notisen finst ikkje."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Kunne ikkje slette favoritt."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Denne gruppa finst ikkje."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Alle medlemmar"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "Fann ikkje API-metode."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Denne notisen finst ikkje."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Du tingar ikkje oppdateringar til den profilen."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Kunne ikkje lagra abonnement."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Mennesker som tingar %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Ukjend fil type"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1447,8 +1635,8 @@ msgstr "Den addressa har alt blitt bekrefta."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -2000,13 +2188,13 @@ msgstr "Styr korleis du får epost frå %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
#, fuzzy
msgid "Email address"
msgstr "Epostadresser"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Godkjent epostadresse."
@@ -2015,14 +2203,14 @@ msgstr "Godkjent epostadresse."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Gjenopprett"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2035,14 +2223,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "Epostadresse («brukarnamn@example.org»)"
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
#, fuzzy
msgctxt "BUTTON"
@@ -2051,113 +2239,120 @@ msgstr "Legg til"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Innkomande epost"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Eg vil senda notisar med epost."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Send epost til denne addressa for å legge til nye notisar."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Vel ny epostadresse til å oppdatera med; fjerner den gamle."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Ny"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Epostadresser"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Send meg ein notis ved nye tingingar på epost."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Send meg ein epost når nokon legg til ein av mine notisar som favoritt."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Send meg ein epost når nokon sender meg ei privat melding."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Send meg ein epost når nokon sender meg ei privat melding."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Tillat vennar å sende meg ein epost."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Eg vil senda notisar med epost."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Publiser ein MicroID for epost addressa mi."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "Lagra brukarval."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Ingen epostadresse."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Klarar ikkje normalisera epostadressa"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Ikkje ei gyldig epostadresse."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Det er alt din epost addresse"
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Den epost addressa er alt registrert hos ein annan brukar."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Kan ikkje leggja til godkjenningskode."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2168,57 +2363,57 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Ingen ventande stadfesting å avbryta."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
#, fuzzy
msgid "That is the wrong email address."
msgstr "Det er feil lynmeldings addresse."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Kan ikkje sletta e-postgodkjenning."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Ingen ventande stadfesting å avbryta."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Det er ikkje din epost addresse."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "Fjerna innkomande epostadresse."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Ingen innkomande epostadresse."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Kan ikkje oppdatera brukarinformajon."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Fjerna innkomande epostadresse."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "La til ny innkomande epostadresse."
@@ -5435,7 +5630,7 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Kunne ikkje lagra abonnement."
@@ -5443,11 +5638,6 @@ msgstr "Kunne ikkje lagra abonnement."
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "Denne notisen finst ikkje."
-
#: actions/subscribe.php:117
#, fuzzy
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
@@ -5510,13 +5700,6 @@ msgid ""
"%) and be the first?"
msgstr ""
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "%s tingarar"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5560,13 +5743,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%1$s høyrer no på notisane dine på %2$s."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Notisstraum for %s"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5976,13 +6164,13 @@ msgid "Author(s)"
msgstr ""
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Tjeneste"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr ""
@@ -6037,45 +6225,45 @@ msgid "Invalid filename."
msgstr "Ugyldig filnamn."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
#, fuzzy
msgid "Group join failed."
msgstr "Gruppe profil"
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
#, fuzzy
msgid "Not part of group."
msgstr "Kann ikkje oppdatera gruppa."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
#, fuzzy
msgid "Group leave failed."
msgstr "Gruppe profil"
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "Feil ved lagring av brukar; fungerer ikkje."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Bli med"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6105,12 +6293,12 @@ msgid "You are banned from sending direct messages."
msgstr "Ein feil oppstod ved sending av direkte melding."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Kunne ikkje lagre melding."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Kunne ikkje oppdatere melding med ny URI."
@@ -6128,25 +6316,25 @@ msgid "Database error inserting hashtag: %s"
msgstr "Feil med innhenting av brukarbilete."
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Eit problem oppstod ved lagring av notis."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Feil ved lagring av notis. Ukjend brukar."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
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."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -6155,37 +6343,37 @@ msgstr ""
"For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Eit problem oppstod ved lagring av notis."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Eit problem oppstod ved lagring av notis."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Kunne ikkje lagra abonnement."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6199,14 +6387,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6223,51 +6411,51 @@ msgid "Unable to save tag."
msgstr "Kunne ikkje lagra emneord."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
#, fuzzy
msgid "Already subscribed!"
msgstr "Ikkje tinga."
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "Brukar har blokkert deg."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
#, fuzzy
msgid "Not subscribed!"
msgstr "Ikkje tinga."
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Kunne ikkje lagra abonnement."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Kunne ikkje lagra abonnement."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Kunne ikkje lagra abonnement."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s høyrer no på notisane dine på %2$s."
@@ -6650,10 +6838,15 @@ msgid "Before"
msgstr "Før »"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Bilete"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8123,17 +8316,17 @@ msgid "Send"
msgstr "Send"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Kallenamn må berre ha små bokstavar og nummer, ingen mellomrom."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8385,7 +8578,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Ei liste over brukarane i denne gruppa."
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "Fann ikkje API-metode."
@@ -8647,17 +8840,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "eit par sekund sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "omtrent eitt minutt sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8665,12 +8858,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "omtrent ein time sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8678,12 +8871,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "omtrent ein dag sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8691,12 +8884,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "omtrent ein månad sidan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8704,7 +8897,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
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 1fad5ba78..1990b8092 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:17+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:09+0000\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
"MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
"(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pl\n"
"X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -90,11 +90,11 @@ msgstr "Zapisz ustawienia dostępu"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -387,20 +387,38 @@ msgstr "Nie można zapisać ustawień wyglądu."
msgid "Could not update your design."
msgstr "Nie można zaktualizować wyglądu."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
-msgstr ""
+msgstr "Główna"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "Oś czasu użytkownika %s"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "Subskrypcje użytkownika %s"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Ulubione"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "Członkowie grupy %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -529,10 +547,8 @@ msgstr "Nie można zrezygnować z obserwacji samego siebie."
#. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
#: actions/apifriendshipsexists.php:88
-#, fuzzy
msgid "Two valid IDs or nick names must be supplied."
-msgstr ""
-"Należy dostarczyć dwa prawidłowe identyfikatory lub nazwy użytkowników."
+msgstr "Należy dostarczyć dwa prawidłowe identyfikatory lub pseudonimy."
#. TRANS: Client error displayed when a source user could not be determined showing friendship.
#: actions/apifriendshipsshow.php:131
@@ -755,7 +771,7 @@ msgstr "Token żądania został już upoważniony."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -791,7 +807,7 @@ msgstr "Błąd bazy danych podczas wprowadzania oauth_token_association."
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -865,7 +881,7 @@ msgstr "Hasło"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -942,7 +958,8 @@ msgstr "Nie można usuwać stanów innych użytkowników."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Nie ma takiego wpisu."
@@ -958,15 +975,17 @@ msgstr "Nie można powtórzyć własnego wpisu."
msgid "Already repeated that notice."
msgstr "Już powtórzono ten wpis."
-#: actions/apistatusesshow.php:117
-#, fuzzy
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
-msgstr "Nie odnaleziono metody API."
+msgstr "Metoda HTTP nie jest obsługiwana."
#: actions/apistatusesshow.php:141
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported format: %s"
-msgstr "Nieobsługiwany format."
+msgstr "Nieobsługiwany format: %s"
#. TRANS: Client error displayed requesting a deleted status.
#: actions/apistatusesshow.php:152
@@ -978,19 +997,19 @@ msgstr "Usunięto stan."
msgid "No status with that ID found."
msgstr "Nie odnaleziono stanów z tym identyfikatorem."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
-msgstr ""
+msgstr "Można usunąć tylko używając formatu Atom."
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Nie można usunąć tego wpisu."
-#: actions/apistatusesshow.php:247
-#, fuzzy, php-format
+#: actions/apistatusesshow.php:243
+#, php-format
msgid "Deleted notice %d"
-msgstr "Usuń wpis"
+msgstr "Usunięto wpis %d"
#. TRANS: Client error displayed when the parameter "status" is missing.
#: actions/apistatusesupdate.php:221
@@ -1113,37 +1132,64 @@ msgstr "Wpisy ze znacznikiem %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Aktualizacje ze znacznikiem %1$s na %2$s."
-#: actions/apitimelineuser.php:300
-#, fuzzy
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
msgid "Only the user can add to their own timeline."
-msgstr "Tylko użytkownik może czytać swoje skrzynki pocztowe."
+msgstr "Tylko użytkownik może dodawać do swojej osi czasu."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
-msgstr ""
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+#, fuzzy
+msgid "Only accept AtomPub for Atom feeds."
+msgstr "Akceptowanie tylko AtomPub dla kanałów Atom."
+
+#: actions/apitimelineuser.php:310
+#, fuzzy
+msgid "Atom post must not be empty."
+msgstr "Wpis Atom musi być wpisem Atom."
+
+#: actions/apitimelineuser.php:315
+#, fuzzy
+msgid "Atom post must be well-formed XML."
+msgstr "Wpis Atom musi być wpisem Atom."
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
-msgstr ""
+msgstr "Wpis Atom musi być wpisem Atom."
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
-msgstr ""
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+#, fuzzy
+msgid "Can only handle POST activities."
+msgstr "Można obsługiwać tylko działania wpisów."
-#: actions/apitimelineuser.php:334
-#, php-format
-msgid "Cannot handle activity object type \"%s\""
-msgstr ""
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
+#, fuzzy, php-format
+msgid "Cannot handle activity object type \"%s\"."
+msgstr "Nie można obsłużyć typu obiektu działania \"%s\""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Przeszukaj zawartość wpisów"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
+#, php-format
msgid "Notice with URI \"%s\" already exists."
-msgstr "Wpis z tym identyfikatorem nie istnieje."
+msgstr "Wpis z adresem URI \"%s\" już istnieje."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
+msgstr "Wpis AtomPub z nieznanym adresem URI %s uwagi"
#. TRANS: Server error for unfinished API method showTrends.
#: actions/apitrends.php:85
@@ -1155,6 +1201,150 @@ msgstr "Metoda API jest w trakcie tworzenia."
msgid "User not found."
msgstr "Nie odnaleziono strony."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Nie ma takiego profilu."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Nie można wprowadzić nowej subskrypcji."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+#, fuzzy
+msgid "Can only handle Favorite activities."
+msgstr "Można obsługiwać tylko działania wpisów."
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Można obsługiwać tylko działania wpisów."
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Nieznane"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Dodaj do ulubionych"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Nie ma takiego profilu."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "Członkowie grupy %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Grupy %s są członkiem"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+#, fuzzy
+msgid "Can only handle Join activities."
+msgstr "Można obsługiwać tylko działania wpisów."
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Nieznane"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Wszyscy członkowie"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Nie ma takiego pliku."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Nie można usunąć ulubionego wpisu."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Nie ma takiej grupy."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Wszyscy członkowie"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "Metoda HTTP nie jest obsługiwana."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Nie ma takiego profilu."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Nie jesteś subskrybowany do tego profilu."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Nie można usunąć autosubskrypcji."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Osoby subskrybowane do %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+#, fuzzy
+msgid "Can only handle Follow activities."
+msgstr "Można obsługiwać tylko działania wpisów."
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Nieznany typ pliku"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1440,8 +1630,8 @@ msgstr "Ten adres został już potwierdzony."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1961,12 +2151,12 @@ msgstr "Zarządzanie, jak otrzymywać wiadomości e-mail od %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "Adres e-mail"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Obecnie potwierdzone adresy e-mail."
@@ -1975,14 +2165,14 @@ msgstr "Obecnie potwierdzone adresy e-mail."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Usuń"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1996,14 +2186,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "Adres e-mail, taki jak \"NazwaUżytkownika@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2011,110 +2201,117 @@ msgstr "Dodaj"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Wiadomości przychodzące"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Chcę wysyłać wpisy przez wiadomości e-mail."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Wyślij wiadomość e-mail na ten adres, aby wysyłać nowe wpisy."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Używaj nowego adresu e-mail do wysyłania; anuluj poprzedni."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Nowy"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Preferencje e-mail"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Wyślij wpisy nowych subskrypcji przez e-mail."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Wyślij wiadomość e-mail, kiedy ktoś doda mój wpis jako ulubiony."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Wyślij wiadomość e-mail, kiedy ktoś wyśle prywatną wiadomość."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Wyślij wiadomość e-mail, kiedy ktoś wyśle odpowiedź \"@\"."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Pozwól przyjaciołom na szturchanie mnie i wyślij mi wiadomość e-mail."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Chcę wysyłać wpisy przez wiadomości e-mail."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Opublikuj MicroID adresu e-mail."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "Zapisano preferencje e-mail."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Brak adresu e-mail."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Nie można znormalizować tego adresu e-mail"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "To nie jest prawidłowy adres e-mail."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Ten adres e-mail jest już twój."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Ten adres e-mail należy już do innego użytkownika."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Nie można wprowadzić kodu potwierdzającego."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2126,56 +2323,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Brak oczekujących potwierdzeń do anulowania."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "To jest błędny adres e-mail."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Nie można usunąć potwierdzenia adresu e-mail."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Anulowano potwierdzenie e-mail."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "To nie jest twój adres e-mail."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "Adres e-mail został usunięty."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Brak przychodzącego adresu e-mail."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Nie można zaktualizować wpisu użytkownika."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Usunięto przychodzący adres e-mail."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Dodano nowy przychodzący adres e-mail."
@@ -5377,7 +5574,7 @@ msgstr "Nie jesteś subskrybowany do tego profilu."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Nie można zapisać subskrypcji."
@@ -5385,10 +5582,6 @@ msgstr "Nie można zapisać subskrypcji."
msgid "This action only accepts POST requests."
msgstr "Ta czynność przyjmuje tylko żądania POST."
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Nie ma takiego profilu."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
@@ -5456,13 +5649,6 @@ msgstr ""
"Użytkownik %s nie posiada subskrybentów. Dlaczego nie [zarejestrujesz konta]"
"(%%%%action.register%%%%) i zostaniesz pierwszym?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "Subskrypcje użytkownika %s"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5512,13 +5698,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "Użytkownik %s nie obserwuje nikogo."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Kanał wpisów dla %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5926,13 +6117,13 @@ msgid "Author(s)"
msgstr "Autorzy"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Dodaj do ulubionych"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "Użytkownik %1$s oznaczył wpis %2$s jako ulubiony."
@@ -6004,42 +6195,42 @@ msgid "Invalid filename."
msgstr "Nieprawidłowa nazwa pliku."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Dołączenie do grupy nie powiodło się."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "Nie jest częścią grupy."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "Opuszczenie grupy nie powiodło się."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr "Identyfikator profilu %s jest nieprawidłowy."
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
-#, fuzzy, php-format
+#: classes/Group_member.php:98
+#, php-format
msgid "Group ID %s is invalid."
-msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy."
+msgstr "Identyfikator grupy %s jest nieprawidłowy."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Dołącz"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr "Użytkownik %1$s dołączył do grupy %2$s."
@@ -6067,12 +6258,12 @@ msgid "You are banned from sending direct messages."
msgstr "Zablokowano wysyłanie bezpośrednich wiadomości."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Nie można wprowadzić wiadomości."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL."
@@ -6090,17 +6281,17 @@ msgid "Database error inserting hashtag: %s"
msgstr "Błąd bazy danych podczas wprowadzania znacznika mieszania: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Problem podczas zapisywania wpisu. Za długi."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6108,7 +6299,7 @@ msgstr ""
"kilka minut."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6117,36 +6308,36 @@ msgstr ""
"wyślij ponownie za kilka minut."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Zabroniono ci wysyłania wpisów na tej witrynie."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Problem podczas zapisywania wpisu."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr "Podano błędne dane do saveKnownGroups."
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Nie można zapisać odpowiedzi na %1$d, %2$d."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6160,14 +6351,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr "Nie można unieważnić roli \"\"%1$s\" użytkownika #%2$d; nie istnieje."
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6184,48 +6375,48 @@ msgid "Unable to save tag."
msgstr "Nie można zapisać etykiety."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "Zablokowano subskrybowanie."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Już subskrybowane."
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "Użytkownik zablokował cię."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Niesubskrybowane."
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Nie można usunąć autosubskrypcji."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Nie można usunąć tokenu subskrypcji OMB."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Nie można usunąć subskrypcji."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr "Obserwuj"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, php-format
msgid "%1$s is now following %2$s."
msgstr "Użytkownik %1$s obserwuje teraz %2$s."
@@ -6601,10 +6792,15 @@ msgid "Before"
msgstr "Wcześniej"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr "Oczekiwano elementu kanału roota, ale otrzymano cały dokument XML."
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Zdjęcie"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -6781,10 +6977,10 @@ msgstr "Ikona tej aplikacji"
#. TRANS: Form input field instructions.
#. TRANS: %d is the number of available characters for the description.
#: lib/applicationeditform.php:201
-#, fuzzy, php-format
+#, php-format
msgid "Describe your application in %d character"
msgid_plural "Describe your application in %d characters"
-msgstr[0] "Opisz aplikację w %d znakach"
+msgstr[0] "Opisz aplikację w %d znaku"
msgstr[1] "Opisz aplikację w %d znakach"
msgstr[2] "Opisz aplikację w %d znakach"
@@ -6913,15 +7109,13 @@ msgstr "Znaczniki dla tego załącznika"
#. TRANS: Exception thrown when a password change fails.
#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
-#, fuzzy
msgid "Password changing failed."
-msgstr "Zmiana hasła nie powiodła się"
+msgstr "Zmiana hasła nie powiodła się."
#. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
#: lib/authenticationplugin.php:238
-#, fuzzy
msgid "Password changing is not allowed."
-msgstr "Zmiana hasła nie jest dozwolona"
+msgstr "Zmiana hasła nie jest dozwolona."
#. TRANS: Title for the form to block a user.
#: lib/blockform.php:68
@@ -6935,7 +7129,6 @@ msgstr "Wyniki polecenia"
#. TRANS: Title for command results.
#: lib/channel.php:194
-#, fuzzy
msgid "AJAX error"
msgstr "Błąd AJAX"
@@ -7351,7 +7544,6 @@ msgstr "Przejdź do instalatora."
#. TRANS: Menu item for Instant Messaging settings.
#: lib/connectsettingsaction.php:106
-#, fuzzy
msgctxt "MENU"
msgid "IM"
msgstr "Komunikator"
@@ -7363,7 +7555,6 @@ msgstr "Aktualizacje przez komunikator"
#. TRANS: Menu item for Short Message Service settings.
#: lib/connectsettingsaction.php:113
-#, fuzzy
msgctxt "MENU"
msgid "SMS"
msgstr "SMS"
@@ -7375,7 +7566,6 @@ msgstr "Aktualizacje przez wiadomości SMS"
#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
-#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "Połączenia"
@@ -8170,15 +8360,13 @@ msgstr "Wyślij bezpośredni wpis"
#. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
#: lib/messageform.php:137
-#, fuzzy
msgid "Select recipient:"
-msgstr "Wybierz licencję"
+msgstr "Wybierz odbiorcę:"
#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
#: lib/messageform.php:150
-#, fuzzy
msgid "No mutual subscribers."
-msgstr "Niesubskrybowane."
+msgstr "Brak wzajemnych subskrybentów."
#: lib/messageform.php:153
msgid "To"
@@ -8194,23 +8382,23 @@ msgid "Send"
msgstr "Wyślij"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Pseudonim może zawierać tylko małe litery i cyfry, bez spacji."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
-msgstr ""
+msgstr "Pseudonim nie może być pusty."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Pseudonim nie może mieć więcej niż %d znak."
+msgstr[1] "Pseudonim nie może mieć więcej niż %d znaki."
+msgstr[2] "Pseudonim nie może mieć więcej niż %d znaków."
#: lib/noticeform.php:160
msgid "Send a notice"
@@ -8448,7 +8636,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Unieważnij rolę \"%s\" tego użytkownika"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
msgid "Page not found."
msgstr "Nie odnaleziono strony."
@@ -8706,17 +8894,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "kilka sekund temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "około minutę temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8725,12 +8913,12 @@ msgstr[1] "około %d minut temu"
msgstr[2] "około %d minut temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "około godzinę temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8739,12 +8927,12 @@ msgstr[1] "około %d godzin temu"
msgstr[2] "około %d godzin temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "blisko dzień temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8753,12 +8941,12 @@ msgstr[1] "około %d dni temu"
msgstr[2] "około %d dni temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "około miesiąc temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8767,7 +8955,7 @@ msgstr[1] "około %d miesięcy temu"
msgstr[2] "około %d miesięcy temu"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "około rok temu"
@@ -8804,14 +8992,13 @@ msgstr[2] "Wiadomość jest za długa. Maksymalnie %1$d znaków, wysłano %2$d."
#. TRANS: Exception.
#: lib/xrd.php:64
-#, fuzzy
msgid "Invalid XML."
-msgstr "Nieprawidłowy rozmiar."
+msgstr "Nieprawidłowy kod XML."
#. TRANS: Exception.
#: lib/xrd.php:69
msgid "Invalid XML, missing XRD root."
-msgstr ""
+msgstr "Nieprawidłowy kod XML, brak głównego XRD."
#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
#: scripts/restoreuser.php:61
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 3491a0a35..2cad0907c 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:18+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:10+0000\n"
"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -90,11 +90,11 @@ msgstr "Gravar configurações de acesso"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -383,20 +383,38 @@ msgstr "Não foi possível gravar as configurações do estilo."
msgid "Could not update your design."
msgstr "Não foi possível actualizar o seu estilo."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "Notas de %s"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "Subscrições de %s"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Favoritas"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "Membros do grupo %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -752,7 +770,7 @@ msgstr "Não tem autorização."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -789,7 +807,7 @@ msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -864,7 +882,7 @@ msgstr "Senha"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -941,7 +959,8 @@ msgstr "Não pode apagar o estado de outro utilizador."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Nota não foi encontrada."
@@ -957,7 +976,10 @@ msgstr "Não pode repetir a sua própria nota."
msgid "Already repeated that notice."
msgstr "Já repetiu essa nota."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "Método da API não encontrado."
@@ -977,16 +999,16 @@ msgstr "Estado apagado."
msgid "No status with that ID found."
msgstr "Não foi encontrado um estado com esse ID."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Nota não pode ser apagada."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "Apagar nota"
@@ -1109,34 +1131,58 @@ msgstr "Notas categorizadas com %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Actualizações categorizadas com %1$s em %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "Só o próprio utilizador pode ler a sua caixa de correio."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Procurar no conteúdo das notas"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "Não existe nenhuma nota com essa identificação."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1152,6 +1198,147 @@ msgstr "Método da API em desenvolvimento."
msgid "User not found."
msgstr "Método da API não encontrado."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Perfil não foi encontrado."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Não foi possível inserir nova subscrição."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Procurar no conteúdo das notas"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Desconhecida"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Adicionar às favoritas"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Perfil não foi encontrado."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "Membros do grupo %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Grupos de que %s é membro"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Desconhecida"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Todos os membros"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Ficheiro não foi encontrado."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Não foi possível eliminar o favorito."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Grupo não foi encontrado."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Todos os membros"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "Método da API não encontrado."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Perfil não foi encontrado."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Não subscreveu esse perfil."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Não foi possível apagar a auto-subscrição."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Pessoas que subscrevem %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Tipo do ficheiro é desconhecido"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1441,8 +1628,8 @@ msgstr "Esse endereço já tinha sido confirmado."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1977,12 +2164,12 @@ msgstr "Defina como receberá mensagens electrónicas de %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "Endereço de correio electrónico"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Endereço de correio já confirmado."
@@ -1991,14 +2178,14 @@ msgstr "Endereço de correio já confirmado."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Remover"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2011,7 +2198,7 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr ""
"Endereço de correio electrónico, por ex. \"nomedeutilizador@exemplo.pt\""
@@ -2019,7 +2206,7 @@ msgstr ""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2027,114 +2214,121 @@ msgstr "Adicionar"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Correio recebido"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Quero publicar notas por correio electrónico."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Envie mensagens electrónicas para este endereço para publicar notas."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Crie um endereço electrónico novo para publicações; cancela o antigo."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Novo"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Preferências de correio electrónico"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Enviem-me notificação electrónica das novas subscrições."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Enviem-me notificação electrónica quando uma nota minha é adicionada às "
"favoritas."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr ""
"Enviem-me notificação electrónica quando me enviarem uma mensagem privada."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
"Enviem-me notificação electrónica quando me enviarem uma \"resposta-@\"."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Permitir que amigos me toquem e enviem mensagens electrónicas."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Quero publicar notas por correio electrónico."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Publicar um MicroID para o meu endereço electrónico."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "Preferências de correio electrónico foram gravadas."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Sem endereço de correio electrónico."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Não é possível normalizar esse endereço electrónico"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Correio electrónico é inválido."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Esse já é o seu endereço electrónico."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Esse endereço electrónico já pertence a outro utilizador."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Não foi possível inserir o código de confirmação."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2146,56 +2340,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Nenhuma confirmação pendente para cancelar."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Esse endereço de correio electrónico está errado."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Não foi possível apagar a confirmação do endereço electrónico."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Confirmação de correio electrónico cancelada."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Esse não é o seu endereço electrónico."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "O endereço de correio electrónico foi removido."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Sem endereço electrónico de entrada."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Não foi possível actualizar o registo do utilizador."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Endereço electrónico de entrada foi removido."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Adicionado endereço electrónico de entrada novo."
@@ -5424,7 +5618,7 @@ msgstr "Não subscreveu esse perfil."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Não foi possível gravar a subscrição."
@@ -5432,10 +5626,6 @@ msgstr "Não foi possível gravar a subscrição."
msgid "This action only accepts POST requests."
msgstr "Esta operação só aceita pedidos POST."
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Perfil não foi encontrado."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr "Não pode subscrever um perfil remoto OMB 0.1 com esta operação."
@@ -5502,13 +5692,6 @@ msgstr ""
"%s não tem subscritores. Quer [registar uma conta](%%action.register%%) e "
"ser o primeiro?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "Subscrições de %s"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5558,13 +5741,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s não está a ouvir ninguém."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Fonte de notas para %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5973,13 +6161,13 @@ msgid "Author(s)"
msgstr "Autores"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Eleger como favorita"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%s (@%s) adicionou a sua nota às favoritas."
@@ -6041,42 +6229,42 @@ msgid "Invalid filename."
msgstr "Nome de ficheiro inválido."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Entrada no grupo falhou."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "Não faz parte do grupo."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "Saída do grupo falhou."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "Erro ao guardar utilizador; inválido."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Juntar-me"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6104,12 +6292,12 @@ msgid "You are banned from sending direct messages."
msgstr "Está proibido de enviar mensagens directas."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Não foi possível inserir a mensagem."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Não foi possível actualizar a mensagem com a nova URI."
@@ -6127,17 +6315,17 @@ msgid "Database error inserting hashtag: %s"
msgstr "Erro na base de dados ao inserir o elemento criptográfico: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Problema na gravação da nota. Demasiado longa."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Problema na gravação da nota. Utilizador desconhecido."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6145,7 +6333,7 @@ msgstr ""
"alguns minutos."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6154,37 +6342,37 @@ msgstr ""
"publicar daqui a alguns minutos."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Está proibido de publicar notas neste site."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Problema na gravação da nota."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
#, fuzzy
msgid "Bad type provided to saveKnownGroups."
msgstr "O tipo fornecido ao método saveKnownGroups é incorrecto"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "Problema na gravação da caixa de entrada do grupo."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Não foi possível gravar a informação do grupo local."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6198,7 +6386,7 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
@@ -6206,7 +6394,7 @@ msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6224,48 +6412,48 @@ msgid "Unable to save tag."
msgstr "Não foi possível gravar a categoria."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "Foi bloqueado de fazer subscrições"
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Já subscrito!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "O utilizador bloqueou-o."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Não subscrito!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Não foi possível apagar a auto-subscrição."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Não foi possível apagar a chave OMB da subscrição."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Não foi possível apagar a subscrição."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s está agora a ouvir as suas notas em %2$s."
@@ -6640,12 +6828,17 @@ msgid "Before"
msgstr "Anteriores"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
"Era esperado um elemento raiz da fonte, mas foi recebido um documento XML "
"inteiro."
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Foto"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8226,17 +8419,17 @@ msgid "Send"
msgstr "Enviar"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Utilizador só deve conter letras minúsculas e números. Sem espaços."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8479,7 +8672,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Retirar a função \"%s\" a este utilizador"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "Método da API não encontrado."
@@ -8735,17 +8928,17 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "há alguns segundos"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "há cerca de um minuto"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8753,12 +8946,12 @@ msgstr[0] "há cerca de um minuto atrás"
msgstr[1] "há cerca de %d minutos atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "há cerca de uma hora"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8766,12 +8959,12 @@ msgstr[0] "há cerca de uma hora atrás"
msgstr[1] "há cerca de %d horas atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "há cerca de um dia"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8779,12 +8972,12 @@ msgstr[0] "há cerca de um dia atrás"
msgstr[1] "há cerca de %d dias atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "há cerca de um mês"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8792,7 +8985,7 @@ msgstr[0] "há cerca de um mês atrás"
msgstr[1] "há cerca de %d meses atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
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 f00cb28fa..37412a935 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:19+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:11+0000\n"
"Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
"br>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pt-br\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -92,11 +92,11 @@ msgstr "Salvar as configurações de acesso"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -387,20 +387,38 @@ msgstr "Não foi possível salvar suas configurações de aparência."
msgid "Could not update your design."
msgstr "Não foi possível atualizar a sua aparência."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
-msgstr ""
+msgstr "Principal"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "Mensagens de %s"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "Assinaturas de %s"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Favoritos"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "Membros do grupo %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -531,7 +549,6 @@ msgstr "Você não pode deixar de seguir você mesmo!"
#. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
#: actions/apifriendshipsexists.php:88
-#, fuzzy
msgid "Two valid IDs or nick names must be supplied."
msgstr "Devem ser fornecidos dois IDs ou nomes de usuários válidos."
@@ -754,7 +771,7 @@ msgstr "O token solicitado já foi autorizado."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -791,7 +808,7 @@ msgstr "Erro no banco de dados durante a inserção de oauth_token_association."
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -866,7 +883,7 @@ msgstr "Senha"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -943,7 +960,8 @@ msgstr "Você não pode excluir uma mensagem de outro usuário."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Essa mensagem não existe."
@@ -959,15 +977,17 @@ msgstr "Você não pode repetir a sua própria mensagem."
msgid "Already repeated that notice."
msgstr "Você já repetiu essa mensagem."
-#: actions/apistatusesshow.php:117
-#, fuzzy
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
-msgstr "O método da API não foi encontrado!"
+msgstr "O método HTTP não é suportado."
#: actions/apistatusesshow.php:141
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported format: %s"
-msgstr "Formato não suportado."
+msgstr "Formato não suportado: %s"
#. TRANS: Client error displayed requesting a deleted status.
#: actions/apistatusesshow.php:152
@@ -979,19 +999,19 @@ msgstr "A mensagem foi excluída."
msgid "No status with that ID found."
msgstr "Não foi encontrada nenhuma mensagem com esse ID."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
-msgstr ""
+msgstr "Só é possível excluir usando o formato Atom."
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Não é possível excluir esta mensagem."
-#: actions/apistatusesshow.php:247
-#, fuzzy, php-format
+#: actions/apistatusesshow.php:243
+#, php-format
msgid "Deleted notice %d"
-msgstr "Excluir a mensagem"
+msgstr "Mensagem excluída %d"
#. TRANS: Client error displayed when the parameter "status" is missing.
#: actions/apistatusesupdate.php:221
@@ -1109,37 +1129,64 @@ msgstr "Mensagens etiquetadas como %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Mensagens etiquetadas como %1$s no %2$s!"
-#: actions/apitimelineuser.php:300
-#, fuzzy
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
msgid "Only the user can add to their own timeline."
-msgstr "As caixas postais são legíveis somente pelo seu próprio usuário."
+msgstr "Somente o usuário pode adicionar à sua própria linha de tempo."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
-msgstr ""
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+#, fuzzy
+msgid "Only accept AtomPub for Atom feeds."
+msgstr "Só são aceitos AtomPub para fontes atom."
-#: actions/apitimelineuser.php:316
+#: actions/apitimelineuser.php:310
+#, fuzzy
+msgid "Atom post must not be empty."
+msgstr "A publicação Atom deve ser uma entrada Atom."
+
+#: actions/apitimelineuser.php:315
+#, fuzzy
+msgid "Atom post must be well-formed XML."
+msgstr "A publicação Atom deve ser uma entrada Atom."
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
-msgstr ""
+msgstr "A publicação Atom deve ser uma entrada Atom."
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
-msgstr ""
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+#, fuzzy
+msgid "Can only handle POST activities."
+msgstr "Só é possível manipular atividades de publicação."
-#: actions/apitimelineuser.php:334
-#, php-format
-msgid "Cannot handle activity object type \"%s\""
-msgstr ""
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
+#, fuzzy, php-format
+msgid "Cannot handle activity object type \"%s\"."
+msgstr "Não é possível manipular o tipo de objeto de atividade \"%s\""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Encontre conteúdo de mensagens"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
+#, php-format
msgid "Notice with URI \"%s\" already exists."
-msgstr "Não existe uma mensagem com essa id."
+msgstr "Já existe uma mensagem com a URI \"%s\"."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
+msgstr "Publicação AtomPub com uma URI de atenção desconhecida %s"
#. TRANS: Server error for unfinished API method showTrends.
#: actions/apitrends.php:85
@@ -1151,6 +1198,150 @@ msgstr "O método da API está em construção."
msgid "User not found."
msgstr "O método da API não foi encontrado!"
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Este perfil não existe."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Não foi possível inserir a nova assinatura."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+#, fuzzy
+msgid "Can only handle Favorite activities."
+msgstr "Só é possível manipular atividades de publicação."
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Só é possível manipular atividades de publicação."
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Desconhecido"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Adicionar às favoritas"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Este perfil não existe."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "Membros do grupo %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Grupos dos quais %s é membro"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+#, fuzzy
+msgid "Can only handle Join activities."
+msgstr "Só é possível manipular atividades de publicação."
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Desconhecido"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Todos os membros"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Esse arquivo não existe."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Não foi possível excluir a favorita."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Esse grupo não existe."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Todos os membros"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "O método HTTP não é suportado."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Este perfil não existe."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Você não está assinando esse perfil."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Não foi possível salvar a assinatura."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Assinantes de %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+#, fuzzy
+msgid "Can only handle Follow activities."
+msgstr "Só é possível manipular atividades de publicação."
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Tipo de arquivo desconhecido"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1223,21 +1414,18 @@ msgstr "Pré-visualizar"
#. TRANS: Button on avatar upload page to delete current avatar.
#: actions/avatarsettings.php:155
-#, fuzzy
msgctxt "BUTTON"
msgid "Delete"
msgstr "Excluir"
#. TRANS: Button on avatar upload page to upload an avatar.
#: actions/avatarsettings.php:173
-#, fuzzy
msgctxt "BUTTON"
msgid "Upload"
msgstr "Enviar"
#. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
#: actions/avatarsettings.php:243
-#, fuzzy
msgctxt "BUTTON"
msgid "Crop"
msgstr "Cortar"
@@ -1389,7 +1577,6 @@ msgstr "Desbloquear o usuário do grupo"
#. TRANS: Button text for unblocking a user from a group.
#: actions/blockedfromgroup.php:323
-#, fuzzy
msgctxt "BUTTON"
msgid "Unblock"
msgstr "Desbloquear"
@@ -1442,8 +1629,8 @@ msgstr "Esse endereço já foi confirmado."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1453,9 +1640,8 @@ msgstr "Não foi possível atualizar o usuário."
#. TRANS: Server error displayed when an address confirmation code deletion from the
#. TRANS: database fails in the contact address confirmation action.
#: actions/confirmaddress.php:132
-#, fuzzy
msgid "Could not delete address confirmation."
-msgstr "Não foi possível excluir a confirmação do mensageiro instantâneo."
+msgstr "Não foi possível excluir a confirmação do endereço."
#. TRANS: Title for the contact address confirmation action.
#: actions/confirmaddress.php:150
@@ -1533,9 +1719,8 @@ msgstr "Excluir esta aplicação"
#. TRANS: Client error when trying to delete group while not logged in.
#: actions/deletegroup.php:64
-#, fuzzy
msgid "You must be logged in to delete a group."
-msgstr "Você deve estar autenticado para sair de um grupo."
+msgstr "Você deve estar autenticado para excluir um grupo."
#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
#: actions/deletegroup.php:94 actions/joingroup.php:88
@@ -1545,53 +1730,49 @@ msgstr "Nenhum apelido ou identificação."
#. TRANS: Client error when trying to delete a group without having the rights to delete it.
#: actions/deletegroup.php:107
-#, fuzzy
msgid "You are not allowed to delete this group."
-msgstr "Você não é membro deste grupo."
+msgstr "Você não tem permissão para excluir este grupo."
#. TRANS: Server error displayed if a group could not be deleted.
#. TRANS: %s is the name of the group that could not be deleted.
#: actions/deletegroup.php:150
-#, fuzzy, php-format
+#, php-format
msgid "Could not delete group %s."
-msgstr "Não foi possível atualizar o grupo."
+msgstr "Não foi possível excluir o grupo %s."
#. TRANS: Message given after deleting a group.
#. TRANS: %s is the deleted group's name.
#: actions/deletegroup.php:159
-#, fuzzy, php-format
+#, php-format
msgid "Deleted group %s"
-msgstr "%1$s deixou o grupo %2$s"
+msgstr "O grupo %s foi excluído"
#. TRANS: Title of delete group page.
#. TRANS: Form legend for deleting a group.
#: actions/deletegroup.php:176 actions/deletegroup.php:202
-#, fuzzy
msgid "Delete group"
-msgstr "Excluir usuário"
+msgstr "Excluir o grupo"
#. TRANS: Warning in form for deleleting a group.
#: actions/deletegroup.php:206
-#, fuzzy
msgid ""
"Are you sure you want to delete this group? This will clear all data about "
"the group from the database, without a backup. Public posts to this group "
"will still appear in individual timelines."
msgstr ""
-"Tem certeza que deseja excluir este usuário? Isso eliminará todos os dados "
-"deste usuário do banco de dados, sem cópia de segurança."
+"Tem certeza que deseja excluir este grupo? Isso eliminará todos os dados "
+"deste grupo no banco de dados, sem cópia de segurança. Mensagens públicas "
+"para este grupo continuarão aparecendo nas linhas de tempo individuais."
#. TRANS: Submit button title for 'No' when deleting a group.
#: actions/deletegroup.php:224
-#, fuzzy
msgid "Do not delete this group"
-msgstr "Não excluir esta mensagem."
+msgstr "Não excluir este grupo"
#. TRANS: Submit button title for 'Yes' when deleting a group.
#: actions/deletegroup.php:231
-#, fuzzy
msgid "Delete this group"
-msgstr "Excluir este usuário"
+msgstr "Excluir este grupo"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
@@ -1670,16 +1851,15 @@ msgstr "Aparência"
#: actions/designadminpanel.php:74
msgid "Design settings for this StatusNet site"
-msgstr ""
+msgstr "Configurações da aparência deste site StatusNet."
#: actions/designadminpanel.php:335
msgid "Invalid logo URL."
msgstr "A URL da logo é inválida."
#: actions/designadminpanel.php:340
-#, fuzzy
msgid "Invalid SSL logo URL."
-msgstr "A URL da logo é inválida."
+msgstr "A URL da logo SSL é inválida."
#: actions/designadminpanel.php:344
#, php-format
@@ -1695,9 +1875,8 @@ msgid "Site logo"
msgstr "Logo do site"
#: actions/designadminpanel.php:457
-#, fuzzy
msgid "SSL logo"
-msgstr "Logo do site"
+msgstr "Logo do SSL"
#: actions/designadminpanel.php:469
msgid "Change theme"
@@ -1864,7 +2043,6 @@ msgstr "O nome é obrigatório."
#. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
#: actions/editapplication.php:188 actions/newapplication.php:169
-#, fuzzy
msgid "Name is too long (maximum 255 characters)."
msgstr "O nome é muito extenso (máx. 255 caracteres)."
@@ -1895,7 +2073,6 @@ msgstr "A organização é obrigatória."
#. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
#: actions/editapplication.php:223 actions/newapplication.php:199
-#, fuzzy
msgid "Organization is too long (maximum 255 characters)."
msgstr "A organização é muito extensa (máx. 255 caracteres)."
@@ -1978,12 +2155,12 @@ msgstr "Configure o recebimento de e-mails de %%site.name%%."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "Endereço de e-mail"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Endereço de e-mail já confirmado."
@@ -1992,14 +2169,14 @@ msgstr "Endereço de e-mail já confirmado."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Remover"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2012,14 +2189,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "Endereço de e-mail, ex: \"usuario@exemplo.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2027,114 +2204,121 @@ msgstr "Adicionar"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "E-mail de recebimento"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Eu quero publicar mensagens por e-mail."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Envie e-mails para esse endereço para publicar novas mensagens."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Cria um novo endereço de e-mail para publicar e cancela o antigo."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Novo"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Preferências de e-mail"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Envie-me notificações de novos assinantes por e-mail."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Envie-me um e-mail quando alguém adicionar alguma mensagem minha como "
"favorita."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Envie-me um e-mail quando alguém me mandar uma mensagem particular."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
"Envie-me um e-mail quando alguém mandar uma mensagem citando meu nome "
"(\"@nome\")."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Permita que meus amigos chamem minha atenção e enviem-me e-mails."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Eu quero publicar mensagens por e-mail."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Publique um MicroID para meu endereço de e-mail."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "As configurações de e-mail foram salvas."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Nenhum endereço de e-mail."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Não foi possível normalizar este endereço de e-mail"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Não é um endereço de e-mail válido."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Esse já é seu endereço de e-mail."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Esse endereço de e-mail já pertence à outro usuário."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Não foi possível inserir o código de confirmação."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2146,56 +2330,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Nenhuma confirmação pendente para cancelar."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Esse é o endereço de e-mail errado."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Não foi possível excluir a confirmação de e-mail."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "A confirmação por e-mail foi cancelada."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Esse não é seu endereço de email."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "O endereço de e-mail foi removido."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Nenhum endereço de e-mail para recebimentos."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Não foi possível atualizar o registro do usuário."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "O endereço de e-mail de recebimento foi removido."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr ""
"Foi adicionado um novo endereço de e-mail para recebimento de mensagens."
@@ -2501,7 +2685,7 @@ msgstr "Bloquear"
#: actions/groupmembers.php:403
msgctxt "TOOLTIP"
msgid "Block this user"
-msgstr ""
+msgstr "Bloquear este usuário"
#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
@@ -2790,15 +2974,14 @@ msgstr ""
#. TRANS: Form validation message when providing an e-mail address that does not validate.
#. TRANS: %s is an invalid e-mail address.
#: actions/invite.php:77
-#, fuzzy, php-format
+#, php-format
msgid "Invalid email address: %s."
-msgstr "Endereço de e-mail inválido: %s"
+msgstr "Endereço de e-mail inválido: %s."
#. TRANS: Page title when invitations have been sent.
#: actions/invite.php:116
-#, fuzzy
msgid "Invitations sent"
-msgstr "Convite(s) enviado(s)"
+msgstr "Os convites foram enviados"
#. TRANS: Page title when inviting potential users.
#: actions/invite.php:119
@@ -2810,16 +2993,15 @@ msgstr "Convidar novos usuários"
#. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
#. TRANS: Followed by a bullet list.
#: actions/invite.php:139
-#, fuzzy
msgid "You are already subscribed to this user:"
msgid_plural "You are already subscribed to these users:"
-msgstr[0] "Você já está assinando esses usuários:"
-msgstr[1] "Você já está assinando esses usuários:"
+msgstr[0] "Você já está assinando este usuário:"
+msgstr[1] "Você já está assinando estes usuários:"
#. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
#. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
#: actions/invite.php:145 actions/invite.php:159
-#, fuzzy, php-format
+#, php-format
msgctxt "INVITE"
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2828,22 +3010,20 @@ msgstr "%1$s (%2$s)"
#. TRANS: already uses a this StatusNet site. Plural form is based on the number of
#. TRANS: reported already present people. Followed by a bullet list.
#: actions/invite.php:153
-#, fuzzy
msgid "This person is already a user and you were automatically subscribed:"
msgid_plural ""
"These people are already users and you were automatically subscribed to them:"
-msgstr[0] "Estas pessoas já são usuárias e você as assinou automaticamente:"
+msgstr[0] "Esta pessoa já é uma usuária e você a assinou automaticamente:"
msgstr[1] "Estas pessoas já são usuárias e você as assinou automaticamente:"
#. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
#. TRANS: based on the number of invitations sent. Followed by a bullet list of
#. TRANS: e-mail addresses to which invitations were sent.
#: actions/invite.php:167
-#, fuzzy
msgid "Invitation sent to the following person:"
msgid_plural "Invitations sent to the following people:"
-msgstr[0] "Convite(s) enviado(s) para as seguintes pessoas:"
-msgstr[1] "Convite(s) enviado(s) para as seguintes pessoas:"
+msgstr[0] "Convite enviado para a seguinte pessoa:"
+msgstr[1] "Convites enviados para as seguintes pessoas:"
#. TRANS: Generic message displayed after sending out one or more invitations to
#. TRANS: people to join a StatusNet site.
@@ -2986,47 +3166,52 @@ msgstr "%1$s deixou o grupo %2$s"
#: actions/licenseadminpanel.php:56
msgctxt "TITLE"
msgid "License"
-msgstr ""
+msgstr "Licença"
#: actions/licenseadminpanel.php:67
msgid "License for this StatusNet site"
-msgstr ""
+msgstr "Licença para este site StatusNet"
#: actions/licenseadminpanel.php:139
msgid "Invalid license selection."
-msgstr ""
+msgstr "Seleção inválida de licença."
#: actions/licenseadminpanel.php:149
msgid ""
"You must specify the owner of the content when using the All Rights Reserved "
"license."
msgstr ""
+"Você deve especificar o proprietário do conteúdo quando usar a licença Todos "
+"os Direitos Reservados."
#: actions/licenseadminpanel.php:156
-#, fuzzy
msgid "Invalid license title. Maximum length is 255 characters."
msgstr ""
-"Mensagem de boas vindas inválida. O comprimento máximo é de 255 caracteres."
+"O título da licença é inválido. O comprimento máximo é de 255 caracteres."
#: actions/licenseadminpanel.php:168
msgid "Invalid license URL."
-msgstr ""
+msgstr "A URL da licença é inválida."
#: actions/licenseadminpanel.php:171
msgid "Invalid license image URL."
-msgstr ""
+msgstr "A URL da imagem da licença é inválida."
#: actions/licenseadminpanel.php:179
msgid "License URL must be blank or a valid URL."
msgstr ""
+"O campo de URL da licença deve estar em branco ou então conter uma URL "
+"válida."
#: actions/licenseadminpanel.php:187
msgid "License image must be blank or valid URL."
msgstr ""
+"O campo de iamgem da licença deve estar em branco ou então conter uma URL "
+"válida."
#: actions/licenseadminpanel.php:239
msgid "License selection"
-msgstr ""
+msgstr "Seleção da licença"
#: actions/licenseadminpanel.php:245
msgid "Private"
@@ -3035,58 +3220,60 @@ msgstr "Particular"
#: actions/licenseadminpanel.php:246
msgid "All Rights Reserved"
msgstr ""
+"\n"
+"Todos os Direitos Reservados"
#: actions/licenseadminpanel.php:247
msgid "Creative Commons"
-msgstr ""
+msgstr "Creative Commons"
#: actions/licenseadminpanel.php:252
msgid "Type"
-msgstr ""
+msgstr "Tipo"
#: actions/licenseadminpanel.php:254
msgid "Select license"
-msgstr ""
+msgstr "Selecione a licença"
#: actions/licenseadminpanel.php:268
msgid "License details"
-msgstr ""
+msgstr "Detalhes da licença"
#: actions/licenseadminpanel.php:274
msgid "Owner"
-msgstr ""
+msgstr "Proprietário"
#: actions/licenseadminpanel.php:275
msgid "Name of the owner of the site's content (if applicable)."
-msgstr ""
+msgstr "Nome do proprietário do conteúdo do site (se aplicável)."
#: actions/licenseadminpanel.php:283
msgid "License Title"
-msgstr ""
+msgstr "Título da licença"
#: actions/licenseadminpanel.php:284
msgid "The title of the license."
-msgstr ""
+msgstr "O título da licença."
#: actions/licenseadminpanel.php:292
msgid "License URL"
-msgstr ""
+msgstr "URL da licença"
#: actions/licenseadminpanel.php:293
msgid "URL for more information about the license."
-msgstr ""
+msgstr "URL para obter mais informações sobre a licença."
#: actions/licenseadminpanel.php:300
msgid "License Image URL"
-msgstr ""
+msgstr "URL da imagem da licença"
#: actions/licenseadminpanel.php:301
msgid "URL for an image to display with the license."
-msgstr ""
+msgstr "URL de uma imagem a ser exibida com a licença."
#: actions/licenseadminpanel.php:319
msgid "Save license settings"
-msgstr ""
+msgstr "Salvar as configurações da licença"
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
@@ -3298,13 +3485,12 @@ msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "Mensagens correspondentes aos termos \"%1$s\" no %2$s!"
#: actions/nudge.php:85
-#, fuzzy
msgid ""
"This user doesn't allow nudges or hasn't confirmed or set their email "
"address yet."
msgstr ""
-"Este usuário não aceita toques ou ainda não confirmou ou forneceu um correio "
-"eletrônico."
+"Esse usuário não permite receber chamados de atenção ou ainda não confirmou "
+"ou configurou seu e-mail."
#: actions/nudge.php:94
msgid "Nudge sent"
@@ -3343,7 +3529,7 @@ msgstr "Aplicações conectadas"
#. TRANS: Instructions for OAuth connection settings.
#: actions/oauthconnectionssettings.php:83
msgid "The following connections exist for your account."
-msgstr ""
+msgstr "Existem as seguintes conexões para a sua conta."
#. TRANS: Client error when trying to revoke access for an application while not being a user of it.
#: actions/oauthconnectionssettings.php:168
@@ -3353,7 +3539,7 @@ msgstr "Você não é um usuário dessa aplicação."
#. TRANS: Client error when revoking access has failed for some reason.
#. TRANS: %s is the application ID revoking access failed for.
#: actions/oauthconnectionssettings.php:183
-#, fuzzy, php-format
+#, php-format
msgid "Unable to revoke access for application: %s."
msgstr "Não foi possível revogar o acesso para a aplicação: %s."
@@ -3365,6 +3551,7 @@ msgid ""
"You have successfully revoked access for %1$s and the access token starting "
"with %2$s."
msgstr ""
+"O acesso de %1$s e do token iniciado por %2$s foi revogado com sucesso."
#. TRANS: Empty list message when no applications have been authorised yet.
#: actions/oauthconnectionssettings.php:213
@@ -3380,6 +3567,8 @@ msgid ""
"Are you a developer? [Register an OAuth client application](%s) to use with "
"this instance of StatusNet."
msgstr ""
+"Você é um desenvolvedor? [Registre uma aplicação cliente OAuth](%s) para "
+"usar com esta instância do StatusNet."
#: actions/oembed.php:80 actions/shownotice.php:100
msgid "Notice has no profile."
@@ -3454,7 +3643,6 @@ msgstr "Exibir ou esconder as aparências do perfil."
#. TRANS: Form validation error for form "Other settings" in user profile.
#: actions/othersettings.php:162
-#, fuzzy
msgid "URL shortening service is too long (maximum 50 characters)."
msgstr "O serviço de encolhimento de URL é muito extenso (máx. 50 caracteres)."
@@ -3564,7 +3752,7 @@ msgstr "Caminhos"
#. TRANS: Form instructions for Path admin panel.
#: actions/pathsadminpanel.php:69
msgid "Path and server settings for this StatusNet site"
-msgstr ""
+msgstr "Configurações do caminho e do servidor para este site StatusNet"
#. TRANS: Client error in Paths admin panel.
#. TRANS: %s is the directory that could not be read from.
@@ -3623,18 +3811,15 @@ msgid "Path"
msgstr "Caminho"
#: actions/pathsadminpanel.php:249
-#, fuzzy
msgid "Site path."
-msgstr "Caminho do site"
+msgstr "Caminho do site."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:255
-#, fuzzy
msgid "Locale directory"
-msgstr "Diretório dos temas"
+msgstr "Diretório dos locales"
#: actions/pathsadminpanel.php:256
-#, fuzzy
msgid "Directory path to locales."
msgstr "Caminho do diretório de locales"
@@ -3653,14 +3838,13 @@ msgstr "Tema"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:281
-#, fuzzy
msgid "Server for themes."
-msgstr "Tema para o site."
+msgstr "Servidor para temas."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:290
msgid "Web path to themes."
-msgstr ""
+msgstr "Caminho web para os temas."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:297 actions/pathsadminpanel.php:388
@@ -3671,32 +3855,29 @@ msgstr "Servidor SSL"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:299
msgid "SSL server for themes (default: SSL server)."
-msgstr ""
+msgstr "Servidor SSL para os temas (padrão: servidor SSL)."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:306 actions/pathsadminpanel.php:397
#: actions/pathsadminpanel.php:452
-#, fuzzy
msgid "SSL path"
-msgstr "Caminho do site"
+msgstr "Caminho SSL"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:308
msgid "SSL path to themes (default: /theme/)."
-msgstr ""
+msgstr "Caminho SSL para os temas (padrão: /theme/)."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:315 actions/pathsadminpanel.php:406
#: actions/pathsadminpanel.php:461
-#, fuzzy
msgid "Directory"
-msgstr "Diretório dos temas"
+msgstr "Diretório"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:317
-#, fuzzy
msgid "Directory where themes are located."
-msgstr "Caminho do diretório de locales"
+msgstr "Diretório onde os temas estão localizados."
#. TRANS: Fieldset legend in Paths admin panel.
#: actions/pathsadminpanel.php:326
@@ -3710,9 +3891,8 @@ msgstr "Servidor de avatares"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:335
-#, fuzzy
msgid "Server for avatars."
-msgstr "Tema para o site."
+msgstr "Servidor para os avatares."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:342
@@ -3721,9 +3901,8 @@ msgstr "Caminho dos avatares"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:344
-#, fuzzy
msgid "Web path to avatars."
-msgstr "Não foi possível atualizar o avatar."
+msgstr "Caminho web para os avatares."
#. TRANS: Field label in Paths admin panel.
#: actions/pathsadminpanel.php:351
@@ -3732,9 +3911,8 @@ msgstr "Diretório dos avatares"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:353
-#, fuzzy
msgid "Directory where avatars are located."
-msgstr "Caminho do diretório de locales"
+msgstr "Diretório onde os avatares estão localizados."
#. TRANS: Fieldset legend in Paths admin panel.
#: actions/pathsadminpanel.php:364
@@ -3743,30 +3921,28 @@ msgstr "Imagens de fundo"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:372
-#, fuzzy
msgid "Server for backgrounds."
-msgstr "Tema para o site."
+msgstr "Servidor para as imagens de fundo."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:381
msgid "Web path to backgrounds."
-msgstr ""
+msgstr "Caminho web para os planos de fundo."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:390
msgid "Server for backgrounds on SSL pages."
-msgstr ""
+msgstr "Servidor para planos de fundo nas páginas SSL."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:399
msgid "Web path to backgrounds on SSL pages."
-msgstr ""
+msgstr "Caminho web para planos de fundo nas páginas SSL."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:408
-#, fuzzy
msgid "Directory where backgrounds are located."
-msgstr "Caminho do diretório de locales"
+msgstr "Diretório onde os planos de fundo estão localizados."
#. TRANS: Fieldset legens in Paths admin panel.
#. TRANS: DT element label in attachment list.
@@ -3776,32 +3952,28 @@ msgstr "Anexos"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:427
-#, fuzzy
msgid "Server for attachments."
-msgstr "Tema para o site."
+msgstr "Servidor para anexos."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:436
-#, fuzzy
msgid "Web path to attachments."
-msgstr "Nenhum anexo."
+msgstr "Caminho web dos anexos."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:445
-#, fuzzy
msgid "Server for attachments on SSL pages."
-msgstr "Tema para o site."
+msgstr "Servidor para anexos nas páginas SSL."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:454
msgid "Web path to attachments on SSL pages."
-msgstr ""
+msgstr "Caminho web para anexos nas páginas SSL."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:463
-#, fuzzy
msgid "Directory where attachments are located."
-msgstr "Caminho do diretório de locales"
+msgstr "Diretório onde os anexos estão localizados."
#. TRANS: Fieldset legend in Paths admin panel.
#: actions/pathsadminpanel.php:472
@@ -3829,15 +4001,13 @@ msgstr "Usar SSL"
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:487
-#, fuzzy
msgid "When to use SSL."
-msgstr "Quando usar SSL"
+msgstr "Quando usar o SSL."
#. TRANS: Tooltip for field label in Paths admin panel.
#: actions/pathsadminpanel.php:497
-#, fuzzy
msgid "Server to direct SSL requests to."
-msgstr "Servidor para onde devem ser direcionadas as requisições SSL"
+msgstr "Servidor para onde devem ser direcionadas as requisições SSL."
#. TRANS: Button title text to store form data in the Paths admin panel.
#: actions/pathsadminpanel.php:514
@@ -3897,9 +4067,8 @@ msgstr "Informações do perfil"
#. TRANS: Tooltip for field label in form for profile settings.
#: actions/profilesettings.php:113
-#, fuzzy
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
-msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços"
+msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços."
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
@@ -3918,18 +4087,17 @@ msgstr "Site"
#. TRANS: Tooltip for field label in form for profile settings.
#: actions/profilesettings.php:125
-#, fuzzy
msgid "URL of your homepage, blog, or profile on another site."
-msgstr "URL do seu site, blog ou perfil em outro site"
+msgstr "URL do seu site, blog ou perfil em outro site."
#. TRANS: Tooltip for field label in form for profile settings. Plural
#. TRANS: is decided by the number of characters available for the
#. TRANS: biography (%d).
#: actions/profilesettings.php:133 actions/register.php:472
-#, fuzzy, php-format
+#, php-format
msgid "Describe yourself and your interests in %d character"
msgid_plural "Describe yourself and your interests in %d characters"
-msgstr[0] "Descreva a si mesmo e os seus interesses em %d caracteres"
+msgstr[0] "Descreva a si mesmo e os seus interesses em %d caractere"
msgstr[1] "Descreva a si mesmo e os seus interesses em %d caracteres"
#. TRANS: Tooltip for field label in form for profile settings.
@@ -4008,10 +4176,10 @@ msgstr ""
#. TRANS: Plural form is used based on the maximum number of allowed
#. TRANS: characters for the biography (%d).
#: actions/profilesettings.php:262 actions/register.php:229
-#, fuzzy, php-format
+#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
-msgstr[0] "A descrição é muito extensa (máximo %d caracteres)."
+msgstr[0] "A descrição é muito extensa (máximo %d caractere)."
msgstr[1] "A descrição é muito extensa (máximo %d caracteres)."
#. TRANS: Validation error in form for profile settings.
@@ -4021,7 +4189,6 @@ msgstr "O fuso horário não foi selecionado."
#. TRANS: Validation error in form for profile settings.
#: actions/profilesettings.php:281
-#, fuzzy
msgid "Language is too long (maximum 50 characters)."
msgstr "O nome do idioma é muito extenso (máx. 50 caracteres)."
@@ -4141,9 +4308,9 @@ msgstr "Nuvem de etiquetas públicas"
#. TRANS: Instructions (more used like an explanation/header).
#. TRANS: %s is the StatusNet sitename.
#: actions/publictagcloud.php:65
-#, fuzzy, php-format
+#, php-format
msgid "These are most popular recent tags on %s"
-msgstr "Estas são as etiquetas recentes mais populares no %s "
+msgstr "Estas são as etiquetas recentes mais populares no %s"
#. TRANS: This message contains a Markdown URL. The link description is between
#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
@@ -4290,7 +4457,6 @@ msgid "Unexpected password reset."
msgstr "Restauração inesperada da senha."
#: actions/recoverpassword.php:365
-#, fuzzy
msgid "Password must be 6 characters or more."
msgstr "A senha deve ter 6 ou mais caracteres."
@@ -4622,7 +4788,7 @@ msgstr "Sessões"
#: actions/sessionsadminpanel.php:65
msgid "Session settings for this StatusNet site"
-msgstr ""
+msgstr "Configurações de sessão para este site StatusNet"
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -4873,14 +5039,12 @@ msgstr "Todos os membros"
#. TRANS: Label for creation date in statistics on group page.
#: actions/showgroup.php:453
-#, fuzzy
msgctxt "LABEL"
msgid "Created"
msgstr "Criado"
#. TRANS: Label for member count in statistics on group page.
#: actions/showgroup.php:461
-#, fuzzy
msgctxt "LABEL"
msgid "Members"
msgstr "Membros"
@@ -4956,16 +5120,16 @@ msgstr "A mensagem excluída."
#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
#: actions/showstream.php:70
-#, fuzzy, php-format
+#, php-format
msgid "%1$s tagged %2$s"
-msgstr "%1$s, pág. %2$d"
+msgstr "Mensagens de %1$s etiquetadas como %2$s"
#. TRANS: Page title showing tagged notices in one user's stream.
#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
#: actions/showstream.php:74
-#, fuzzy, php-format
+#, php-format
msgid "%1$s tagged %2$s, page %3$d"
-msgstr "Mensagens etiquetadas com %1$s, pág. %2$d"
+msgstr "Mensagens de %1$s etiquetadas como %2$s, pág. %3$d"
#. TRANS: Extended page title showing tagged notices in one user's stream.
#. TRANS: %1$s is the username, %2$d is the page number.
@@ -5009,10 +5173,10 @@ msgstr "FOAF de %s"
#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
#: actions/showstream.php:211
-#, fuzzy, php-format
+#, php-format
msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
msgstr ""
-"Este é o fluxo público de mensagens de %1$s, mas %2$s não publicou nada "
+"Este é o fluxo público de mensagens de %1$s, mas %1$s não publicou nada "
"ainda."
#. TRANS: Second sentence of empty list message for a stream for the user themselves.
@@ -5196,9 +5360,8 @@ msgstr "Não foi possível salvar os avisos do site."
#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
#: actions/sitenoticeadminpanel.php:112
-#, fuzzy
msgid "Maximum length for the site-wide notice is 255 characters."
-msgstr "O tamanho máximo para os avisos é de 255 caracteres."
+msgstr "O tamanho máximo para os avisos do site é de 255 caracteres.."
#. TRANS: Label for site-wide notice text field in admin panel.
#: actions/sitenoticeadminpanel.php:176
@@ -5207,9 +5370,9 @@ msgstr "Texto dos avisos"
#. TRANS: Tooltip for site-wide notice text field in admin panel.
#: actions/sitenoticeadminpanel.php:179
-#, fuzzy
msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
-msgstr "Texto dos avisos do site (no máximo 255 caracteres; pode usar HTML)"
+msgstr ""
+"Texto dos aviso do site (no máximo 255 caracteres; é permitido o uso de HTML)"
#. TRANS: Title for button to save site notice in admin panel.
#: actions/sitenoticeadminpanel.php:201
@@ -5434,7 +5597,7 @@ msgstr "Você não está assinando esse perfil."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Não foi possível salvar a assinatura."
@@ -5442,10 +5605,6 @@ msgstr "Não foi possível salvar a assinatura."
msgid "This action only accepts POST requests."
msgstr "Esta ação aceita somente requisições POST."
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Este perfil não existe."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr "Não é possível assinar um perfil OMB 0.1 remoto com essa ação."
@@ -5483,13 +5642,12 @@ msgstr "Estas são as pessoas que acompanham as mensagens de %s."
#. TRANS: Subscriber list text when the logged in user has no subscribers.
#: actions/subscribers.php:116
-#, fuzzy
msgid ""
"You have no subscribers. Try subscribing to people you know and they might "
"return the favor."
msgstr ""
"Você não tem nenhum assinante. Experimente assinar pessoas que você conhece "
-"e eles podem devolver o favor"
+"e elas podem lhe devolver o favor."
#. TRANS: Subscriber list text when looking at the subscribers for a of a user other
#. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
@@ -5512,13 +5670,6 @@ msgstr ""
"%s não possui nenhum assinante. Por que você não [registra uma conta](%%%%"
"action.register%%%%) e se torna o(a) primeiro(a)?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "Assinaturas de %s"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5568,13 +5719,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s não está acompanhando ninguém."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Fonte de mensagens de %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5684,7 +5840,7 @@ msgstr "Usuário"
#. TRANS: Instruction for user admin panel.
#: actions/useradminpanel.php:69
msgid "User settings for this StatusNet site"
-msgstr ""
+msgstr "Configurações de usuário para esse site StatusNet"
#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
#: actions/useradminpanel.php:147
@@ -5693,7 +5849,6 @@ msgstr "Limite da descrição inválido. Seu valor deve ser numérico."
#. TRANS: Form validation error in user admin panel when welcome text is too long.
#: actions/useradminpanel.php:154
-#, fuzzy
msgid "Invalid welcome text. Maximum length is 255 characters."
msgstr ""
"Mensagem de boas vindas inválida. O comprimento máximo é de 255 caracteres."
@@ -5701,7 +5856,7 @@ msgstr ""
#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
#. TRANS: users in user admin panel. %1$s is the invalid nickname.
#: actions/useradminpanel.php:166
-#, fuzzy, php-format
+#, php-format
msgid "Invalid default subscripton: '%1$s' is not a user."
msgstr "Assinatura padrão inválida: '%1$s' não é um usuário."
@@ -5733,7 +5888,6 @@ msgstr "Boas vindas aos novos usuários"
#. TRANS: Tooltip in user admin panel for setting new user welcome text.
#: actions/useradminpanel.php:238
-#, fuzzy
msgid "Welcome text for new users (maximum 255 characters)."
msgstr "Texto de boas vindas para os novos usuários (máx. 255 caracteres)."
@@ -5765,7 +5919,7 @@ msgstr "Define se os usuários podem ou não convidar novos usuários."
#. TRANS: Title for button to save user settings in user admin panel.
#: actions/useradminpanel.php:302
msgid "Save user settings"
-msgstr ""
+msgstr "Salvar as configurações de usuário"
#: actions/userauthorization.php:105
msgid "Authorize subscription"
@@ -5987,16 +6141,16 @@ msgid "Author(s)"
msgstr "Autor(es)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Tornar favorita"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
-#, fuzzy, php-format
+#: classes/Fave.php:154
+#, php-format
msgid "%1$s marked notice %2$s as a favorite."
-msgstr "%s (@%s) marcou sua mensagem como favorita"
+msgstr "%1$s marcou a mensagem %2$s como favorita."
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:156
@@ -6013,7 +6167,7 @@ msgstr "o Robin acha que algo é impossível."
#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
#. TRANS: %1$s is used for plural.
#: classes/File.php:204
-#, fuzzy, php-format
+#, php-format
msgid ""
"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
"Try to upload a smaller version."
@@ -6021,19 +6175,19 @@ msgid_plural ""
"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
"Try to upload a smaller version."
msgstr[0] ""
-"Nenhum arquivo pode ter mais de %1$d bytes e o que você enviou tinha %2$d "
-"bytes. Tente enviar uma versão mais pequena."
+"Nenhum arquivo pode ter mais de %1$d byte e o que você enviou tinha %2$d "
+"bytes. Tente enviar uma versão menor."
msgstr[1] ""
"Nenhum arquivo pode ter mais de %1$d bytes e o que você enviou tinha %2$d "
-"bytes. Tente enviar uma versão mais pequena."
+"bytes. Tente enviar uma versão menor."
#. TRANS: Message given if an upload would exceed user quota.
#. TRANS: %d (number) is the user quota in bytes and is used for plural.
#: classes/File.php:217
-#, fuzzy, php-format
+#, php-format
msgid "A file this large would exceed your user quota of %d byte."
msgid_plural "A file this large would exceed your user quota of %d bytes."
-msgstr[0] "Um arquivo deste tamanho excederá a sua conta de %d bytes."
+msgstr[0] "Um arquivo deste tamanho excederá a sua conta de %d byte."
msgstr[1] "Um arquivo deste tamanho excederá a sua conta de %d bytes."
#. TRANS: Message given id an upload would exceed a user's monthly quota.
@@ -6051,42 +6205,42 @@ msgid "Invalid filename."
msgstr "Nome de arquivo inválido."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Não foi possível se unir ao grupo."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "Não é parte de um grupo."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "Não foi possível deixar o grupo."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "Erro ao salvar usuário; inválido."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Entrar"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6114,12 +6268,12 @@ msgid "You are banned from sending direct messages."
msgstr "Você está proibido de enviar mensagens diretas."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Não foi possível inserir a mensagem."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Não foi possível atualizar a mensagem com a nova URI."
@@ -6137,17 +6291,17 @@ msgid "Database error inserting hashtag: %s"
msgstr "Erro no banco de dados durante a inserção da hashtag: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Problema no salvamento da mensagem. Ela é muito extensa."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Problema no salvamento da mensagem. Usuário desconhecido."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6155,7 +6309,7 @@ msgstr ""
"novamente daqui a alguns minutos."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6164,37 +6318,37 @@ msgstr ""
"publique novamente daqui a alguns minutos."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Você está proibido de publicar mensagens neste site."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Problema no salvamento da mensagem."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
#, fuzzy
msgid "Bad type provided to saveKnownGroups."
msgstr "O tipo fornecido ao método saveKnownGroups é incorreto"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "Problema no salvamento das mensagens recebidas do grupo."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Não foi possível salvar a informação do grupo local."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6208,14 +6362,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr "Não é possível revogar a função \"%1$s\" do usuário #%2$d; não existe."
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6233,48 +6387,48 @@ msgid "Unable to save tag."
msgstr "Não foi salvar gravar a categoria."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "Você está proibido de assinar."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Já assinado!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "O usuário bloqueou você."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Não assinado!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Não foi possível salvar a assinatura."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Não foi possível salvar a assinatura."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Não foi possível salvar a assinatura."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s agora está acompanhando suas mensagens no %2$s."
@@ -6645,12 +6799,17 @@ msgid "Before"
msgstr "Anterior"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
"Era esperado um elemento raiz da fonte, mas foi obtido o documento XML "
"inteiro."
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Imagem"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8247,19 +8406,19 @@ msgid "Send"
msgstr "Enviar"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"A identificação deve conter apenas letras minúsculas e números e não pode "
"ter e espaços."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8502,7 +8661,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Revoga o papel \"%s\" deste usuário"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "O método da API não foi encontrado!"
@@ -8756,17 +8915,17 @@ msgid "Moderator"
msgstr "Moderador"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "alguns segundos atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "cerca de 1 minuto atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8774,12 +8933,12 @@ msgstr[0] "há cerca de um minuto atrás"
msgstr[1] "há cerca de %d minutos atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "cerca de 1 hora atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8787,12 +8946,12 @@ msgstr[0] "há cerca de uma hora atrás"
msgstr[1] "há cerca de %d horas atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "cerca de 1 dia atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8800,12 +8959,12 @@ msgstr[0] "há cerca de um dia atrás"
msgstr[1] "há cerca de %d dias atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "cerca de 1 mês atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8813,7 +8972,7 @@ msgstr[0] "há cerca de um mês atrás"
msgstr[1] "há cerca de %d meses atrás"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
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 1d048c36b..24f81e72a 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:20+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:12+0000\n"
"Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -93,11 +93,11 @@ msgstr "Сохранить настройки доступа"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -389,20 +389,38 @@ msgstr "Не удаётся сохранить ваши настройки оф
msgid "Could not update your design."
msgstr "Не удаётся обновить ваше оформление."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr "Главная"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "Лента %s"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "Подписки %s"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Любимое"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "Участники группы %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -756,7 +774,7 @@ msgstr "Ключ запроса уже авторизован."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -792,7 +810,7 @@ msgstr "Ошибка базы данных при вставке oauth_token_ass
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -867,7 +885,7 @@ msgstr "Пароль"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -944,7 +962,8 @@ msgstr "Вы не можете удалять статус других поль
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Нет такой записи."
@@ -960,7 +979,10 @@ msgstr "Невозможно повторить собственную запи
msgid "Already repeated that notice."
msgstr "Запись уже повторена."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
msgstr "HTTP-метод не поддерживается."
@@ -979,16 +1001,16 @@ msgstr "Статус удалён."
msgid "No status with that ID found."
msgstr "Не найдено статуса с таким ID."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr "Можно удалить только в формате Atom."
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Не удаётся удалить эту запись."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, php-format
msgid "Deleted notice %d"
msgstr "Запись %d удалена"
@@ -1111,33 +1133,61 @@ msgstr "Записи с тегом %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Обновления с тегом %1$s на %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
msgid "Only the user can add to their own timeline."
msgstr "Только пользователь может добавлять в свою ленту."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+#, fuzzy
+msgid "Only accept AtomPub for Atom feeds."
msgstr "Принимать только AtomPub для atom-каналов."
-#: actions/apitimelineuser.php:316
+#: actions/apitimelineuser.php:310
+#, fuzzy
+msgid "Atom post must not be empty."
+msgstr "POST-запрос Atom должен быть объектом Atom."
+
+#: actions/apitimelineuser.php:315
+#, fuzzy
+msgid "Atom post must be well-formed XML."
+msgstr "POST-запрос Atom должен быть объектом Atom."
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr "POST-запрос Atom должен быть объектом Atom."
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+#, fuzzy
+msgid "Can only handle POST activities."
msgstr "Возможна обработка только POST-запросов."
-#: actions/apitimelineuser.php:334
-#, php-format
-msgid "Cannot handle activity object type \"%s\""
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
+#, fuzzy, php-format
+msgid "Cannot handle activity object type \"%s\"."
msgstr "Невозможно обработать действия объекта типа «%s»"
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Найти запись по содержимому"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "Запись с URI «%s» уже существует."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr "Запись AtomPub с неизвестным целевым URI %s"
@@ -1152,6 +1202,150 @@ msgstr "Метод API реконструируется."
msgid "User not found."
msgstr "Метод API не найден."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Нет такого профиля."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Не удаётся вставить новую подписку."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+#, fuzzy
+msgid "Can only handle Favorite activities."
+msgstr "Возможна обработка только POST-запросов."
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Возможна обработка только POST-запросов."
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Неизвестно"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Добавить в любимые"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Нет такого профиля."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "Участники группы %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Группы, в которых состоит %s"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+#, fuzzy
+msgid "Can only handle Join activities."
+msgstr "Возможна обработка только POST-запросов."
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Неизвестно"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Все участники"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Нет такого файла."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Не удаётся удалить любимую запись."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Нет такой группы."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Все участники"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "HTTP-метод не поддерживается."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Нет такого профиля."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Вы не подписаны на этот профиль."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Невозможно удалить подписку на самого себя."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Люди подписанные на %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+#, fuzzy
+msgid "Can only handle Follow activities."
+msgstr "Возможна обработка только POST-запросов."
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Неподдерживаемый тип файла"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1438,8 +1632,8 @@ msgstr "Этот адрес уже подтверждён."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1962,12 +2156,12 @@ msgstr "Управление процессом получения электр
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "Адрес эл. почты"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Подтверждённый в настоящее время электронный адрес."
@@ -1976,14 +2170,14 @@ msgstr "Подтверждённый в настоящее время элект
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Удалить"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1996,14 +2190,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "Электронный адрес вида \"UserName@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2011,120 +2205,127 @@ msgstr "Добавить"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Входящий электронный адрес"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Я хочу отправлять записи по электронной почте."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
"Отправляйте электронные письма на этот адрес для отсылки новых записей."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
-"Создать новый адрес электронной почты для отсылки сообщений; отменяет старый "
+"Создаёт новый адрес электронной почты для отсылки сообщений; отменяет старый "
"адрес."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Новый"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Настройки эл. почты"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Уведомлять меня о новых подписчиках по почте."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Посылать мне сообщение по электронной почте, если кто-нибудь добавит мою "
"запись в число любимых."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr ""
"Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне "
"приватное сообщение."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
"Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне «@-"
"ответ»."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr ""
"Разрешить друзьям «подталкивать» меня и посылать мне электронные сообщения."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Я хочу отправлять записи по электронной почте."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Опубликовать MicroID для моего электронного адреса."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "Настройки эл. почты сохранены."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Нет электронного адреса."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Не удаётся стандартизировать этот электронный адрес"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Неверный электронный адрес."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Это уже Ваш электронный адрес."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Этот электронный адрес уже задействован другим пользователем."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Не удаётся вставить код подтверждения."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2136,56 +2337,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Нет подтверждения отказа."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Это неверный адрес эл. почты."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Не удаётся удалить подверждение по электронному адресу."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Подтверждение эл. почты отменено."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Это не Ваш электронный адрес."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "Адрес эл. почты удалён."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Нет входящего электронного адреса."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Не удаётся обновить пользовательскую запись."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Входящий электронный адрес удалён."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Новый входящий электронный адрес добавлен."
@@ -2534,7 +2735,7 @@ msgid ""
msgstr ""
"Группы на сайте %%%%site.name%%%% позволяют искать и общаться с людьми с "
"общими интересами. После присоединения к группе и вы сможете отправлять "
-"сообщения до всех её участников, используя команду «!имягруппы». Не видите "
+"сообщения для всех её участников, используя команду «!имягруппы». Не видите "
"группу, которая вас интересует? Попробуйте [найти её](%%%%action.groupsearch%"
"%%%) или [создайте собственную](%%%%action.newgroup%%%%)!"
@@ -4988,8 +5189,8 @@ msgid ""
"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
"%?status_textarea=%2$s)."
msgstr ""
-"Вы можете попробовать «подтолкнуть» %1$s или [написать что-нибудь для них](%%%"
-"%action.newnotice%%%%?status_textarea=%2$s)."
+"Вы можете попробовать «подтолкнуть» %1$s или [написать что-нибудь для него](%%"
+"%%action.newnotice%%%%?status_textarea=%2$s)."
#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
#. TRANS: This message contains a Markdown link. Keep "](" together.
@@ -5393,7 +5594,7 @@ msgstr "Вы не подписаны на этот профиль."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Не удаётся сохранить подписку."
@@ -5401,10 +5602,6 @@ msgstr "Не удаётся сохранить подписку."
msgid "This action only accepts POST requests."
msgstr "Это действие принимает только POST-запросы."
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Нет такого профиля."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
@@ -5472,13 +5669,6 @@ msgstr ""
"У %s нет подписчиков. Почему бы не [зарегистрироваться](%%%%action.register%%"
"%%) и стать первым?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "Подписки %s"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5528,13 +5718,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s не просматривает ничьи записи."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Лента записей для %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "СМС"
@@ -5942,13 +6137,13 @@ msgid "Author(s)"
msgstr "Автор(ы)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Пометить"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%1$s добавил запись %2$s в число любимых."
@@ -6012,42 +6207,42 @@ msgid "Invalid filename."
msgstr "Неверное имя файла."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Не удаётся присоединиться к группе."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "Не является частью группы."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "Не удаётся покинуть группу."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr "Неверный идентификатор профиля %s."
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, php-format
msgid "Group ID %s is invalid."
msgstr "Неверный идентификатор группы %s."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Присоединиться"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr "%1$s присоединился к группе %2$s."
@@ -6075,12 +6270,12 @@ msgid "You are banned from sending direct messages."
msgstr "Вы заблокированы от отправки прямых сообщений."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Не удаётся вставить сообщение."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Не удаётся обновить сообщение с новым URI."
@@ -6098,17 +6293,17 @@ msgid "Database error inserting hashtag: %s"
msgstr "Ошибка баз данных при вставке хеш-тегов: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Проблемы с сохранением записи. Слишком длинно."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Проблема при сохранении записи. Неизвестный пользователь."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6116,7 +6311,7 @@ msgstr ""
"попробуйте вновь через пару минут."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6125,36 +6320,36 @@ msgstr ""
"и попробуйте вновь через пару минут."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Вам запрещено поститься на этом сайте (бан)"
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Проблемы с сохранением записи."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr "Для saveKnownGroups указан неверный тип."
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "Проблемы с сохранением входящих сообщений группы."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Не удаётся сохранить ответ для %1$d, %2$d."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6168,7 +6363,7 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
@@ -6177,7 +6372,7 @@ msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6194,48 +6389,48 @@ msgid "Unable to save tag."
msgstr "Не удаётся сохранить тег."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "Вы заблокированы от подписки."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Уже подписаны!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "Пользователь заблокировал Вас."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Не подписаны!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Невозможно удалить подписку на самого себя."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Не удаётся удалить подписочный жетон OMB."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Не удаётся удалить подписку."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr "Следить"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s теперь следит за %2$s."
@@ -6608,10 +6803,15 @@ msgid "Before"
msgstr "Туда"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr "Ожидался корневой элемент потока, а получен XML-документ целиком."
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Фото"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8161,6 +8361,8 @@ msgid ""
"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
"format."
msgstr ""
+"Тип файла «%1$s» не поддерживается на этом сервере. Попробуйте использовать "
+"другой %2$s-формат."
#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
#. TRANS: %s is the file type that was denied.
@@ -8197,24 +8399,24 @@ msgid "Send"
msgstr "Отправить"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Имя должно состоять только из прописных букв и цифр и не иметь пробелов."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
-msgstr ""
+msgstr "Псевдоним не может быть пустым."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Псевдоним не может быть длиннее %d символа."
+msgstr[1] "Псевдоним не может быть длиннее %d символов."
+msgstr[2] "Псевдоним не может быть длиннее %d символов."
#: lib/noticeform.php:160
msgid "Send a notice"
@@ -8320,16 +8522,16 @@ msgstr "Ошибка размещения нового профиля."
#: lib/oauthstore.php:302
msgid "Error inserting avatar."
-msgstr ""
+msgstr "Ошибка размещения аватара."
#: lib/oauthstore.php:322
msgid "Error inserting remote profile."
-msgstr ""
+msgstr "Ошибка размещения удалённого профиля."
#. TRANS: Exception thrown when a notice is denied because it has been sent before.
#: lib/oauthstore.php:362
msgid "Duplicate notice."
-msgstr ""
+msgstr "Дублирующаяся запись."
#: lib/oauthstore.php:507
msgid "Couldn't insert new subscription."
@@ -8452,10 +8654,9 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Отозвать у этого пользователя роль «%s»"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
-#, fuzzy
+#: lib/router.php:957
msgid "Page not found."
-msgstr "Метод API не найден."
+msgstr "Страница не найдена."
#: lib/sandboxform.php:67
msgid "Sandbox"
@@ -8480,7 +8681,7 @@ msgstr "Ключевые слова"
#: lib/searchaction.php:130
msgctxt "BUTTON"
msgid "Search"
-msgstr ""
+msgstr "Найти"
#. TRANS: Definition list item with instructions on how to get (better) search results.
#: lib/searchaction.php:170
@@ -8559,9 +8760,8 @@ msgstr "Нет тегов"
#. TRANS: Server exception displayed if a theme name was invalid.
#: lib/theme.php:74
-#, fuzzy
msgid "Invalid theme name."
-msgstr "Неверное имя файла."
+msgstr "Неверное имя темы оформления."
#: lib/themeuploader.php:50
msgid "This server cannot handle theme uploads without ZIP support."
@@ -8582,13 +8782,13 @@ msgid "Invalid theme: bad directory structure."
msgstr "Ошибочная тема. Плохая структура директорий."
#: lib/themeuploader.php:166
-#, fuzzy, php-format
+#, php-format
msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
msgid_plural ""
"Uploaded theme is too large; must be less than %d bytes uncompressed."
msgstr[0] ""
"Размер загруженной темы слишком велик, в распакованном виде она должна "
-"занимать не более %d байт."
+"занимать не более %d байта."
msgstr[1] ""
"Размер загруженной темы слишком велик, в распакованном виде она должна "
"занимать не более %d байт."
@@ -8627,7 +8827,6 @@ msgstr "Самые активные"
#. TRANS: Title for the form to unblock a user.
#: lib/unblockform.php:67
-#, fuzzy
msgctxt "TITLE"
msgid "Unblock"
msgstr "Разблокировать"
@@ -8659,9 +8858,9 @@ msgstr "Отписаться"
#. TRANS: Exception text shown when no profile can be found for a user.
#. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
#: lib/usernoprofileexception.php:60
-#, fuzzy, php-format
+#, php-format
msgid "User %1$s (%2$d) has no profile record."
-msgstr "У пользователя нет профиля."
+msgstr "У пользователя %1$s (%2$d) нет записи профиля."
#: lib/userprofile.php:119
msgid "Edit Avatar"
@@ -8710,68 +8909,68 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "пару секунд назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "около минуты назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "около %d минуты назад"
+msgstr[1] "около %d минут назад"
+msgstr[2] "около %d минут назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "около часа назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "около %d часа назад"
+msgstr[1] "около %d часов назад"
+msgstr[2] "около %d часов назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "около дня назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "около %d дня назад"
+msgstr[1] "около %d дней назад"
+msgstr[2] "около %d дней назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "около месяца назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "около %d месяца назад"
+msgstr[1] "около %d месяцев назад"
+msgstr[2] "около %d месяцев назад"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "около года назад"
@@ -8783,7 +8982,7 @@ msgstr "%s не допустимым подходящим цветом!"
#. TRANS: Validation error for a web colour.
#. TRANS: %s is the provided (invalid) text for colour.
#: lib/webcolor.php:120
-#, fuzzy, php-format
+#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr ""
"%s не является допустимым цветом! Используйте 3 или 6 шестнадцатеричных "
@@ -8794,15 +8993,17 @@ msgstr ""
#, php-format
msgid "Unknown user. Go to %s to add your address to your account"
msgstr ""
+"Неизвестный пользователь. Перейдите на %s, чтобы добавить адрес для вашей "
+"учётной записи"
#. TRANS: Response to XMPP source when it sent too long a message.
#. TRANS: %1$d the maximum number of allowed characters (used for plural), %2$d is the sent number.
#: lib/xmppmanager.php:406
-#, fuzzy, php-format
+#, php-format
msgid "Message too long. Maximum is %1$d character, you sent %2$d."
msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
msgstr[0] ""
-"Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
+"Сообщение слишком длинное — не больше %1$d символа, вы отправили %2$d."
msgstr[1] ""
"Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
msgstr[2] ""
@@ -8810,32 +9011,30 @@ msgstr[2] ""
#. TRANS: Exception.
#: lib/xrd.php:64
-#, fuzzy
msgid "Invalid XML."
-msgstr "Неверный размер."
+msgstr "Неверный XML."
#. TRANS: Exception.
#: lib/xrd.php:69
msgid "Invalid XML, missing XRD root."
-msgstr ""
+msgstr "Неверный XML, отсутствует корень XRD."
#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
#: scripts/restoreuser.php:61
#, php-format
msgid "Getting backup from file '%s'."
-msgstr ""
+msgstr "Получение резервной копии из файла «%s»."
#. TRANS: Commandline script output.
#: scripts/restoreuser.php:91
-#, fuzzy
msgid "No user specified; using backup user."
-msgstr "Не указан идентификатор пользователя."
+msgstr "Не указан пользователь; используется пользователь из резервной копии."
#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
#: scripts/restoreuser.php:98
#, php-format
msgid "%d entry in backup."
msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d запись в резервной копии."
+msgstr[1] "%d записи в резервной копии."
+msgstr[2] "%d записей в резервной копии."
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index b38ecd9d9..5065298b0 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -81,11 +81,11 @@ msgstr ""
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -362,20 +362,38 @@ msgstr ""
msgid "Could not update your design."
msgstr ""
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr ""
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr ""
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, php-format
+msgid "%s favorites"
+msgstr ""
+
+#: actions/apiatomservice.php:123
+#, php-format
+msgid "%s memberships"
+msgstr ""
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -722,7 +740,7 @@ msgstr ""
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -758,7 +776,7 @@ msgstr ""
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -826,7 +844,7 @@ msgstr ""
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -899,7 +917,8 @@ msgstr ""
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr ""
@@ -915,7 +934,10 @@ msgstr ""
msgid "Already repeated that notice."
msgstr ""
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
msgstr ""
@@ -934,16 +956,16 @@ msgstr ""
msgid "No status with that ID found."
msgstr ""
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr ""
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, php-format
msgid "Deleted notice %d"
msgstr ""
@@ -1064,33 +1086,57 @@ msgstr ""
msgid "Updates tagged with %1$s on %2$s!"
msgstr ""
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
msgid "Only the user can add to their own timeline."
msgstr ""
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
msgstr ""
-#: actions/apitimelineuser.php:316
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
+msgstr ""
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, php-format
+msgid "No content for notice %d."
+msgstr ""
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr ""
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1105,6 +1151,134 @@ msgstr ""
msgid "User not found."
msgstr ""
+#: actions/atompubfavoritefeed.php:70
+msgid "No such profile"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+msgid "Can't add someone else's subscription"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+msgid "Can only fave notices."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:256
+msgid "Unknown note."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:263
+msgid "Already a favorite."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:144
+#, php-format
+msgid "%s group memberships"
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:147
+#, php-format
+msgid "Groups %s is a member of on %s"
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+msgid "Unknown group."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:263
+msgid "Already a member."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+msgid "No such favorite."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:151
+msgid "Can't delete someone else's favorite"
+msgstr ""
+
+#: actions/atompubshowmembership.php:81
+msgid "No such group"
+msgstr ""
+
+#: actions/atompubshowmembership.php:90
+msgid "Not a member"
+msgstr ""
+
+#: actions/atompubshowmembership.php:115
+msgid "Method not supported"
+msgstr ""
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, php-format
+msgid "No such profile id: %d"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:90
+#, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:154
+msgid "Can't delete someone else's subscription"
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:150
+#, php-format
+msgid "People %s has subscribed to on %s"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, php-format
+msgid "Unknown profile %s"
+msgstr ""
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1387,8 +1561,8 @@ msgstr ""
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1899,12 +2073,12 @@ msgstr ""
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr ""
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr ""
@@ -1913,14 +2087,14 @@ msgstr ""
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr ""
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1931,14 +2105,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr ""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -1946,110 +2120,117 @@ msgstr ""
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr ""
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr ""
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr ""
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr ""
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr ""
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr ""
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr ""
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr ""
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr ""
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr ""
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr ""
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr ""
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr ""
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2058,56 +2239,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr ""
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr ""
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr ""
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr ""
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr ""
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr ""
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr ""
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr ""
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr ""
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr ""
@@ -5111,7 +5292,7 @@ msgstr ""
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr ""
@@ -5119,10 +5300,6 @@ msgstr ""
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr ""
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
@@ -5184,13 +5361,6 @@ msgid ""
"%) and be the first?"
msgstr ""
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr ""
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5234,13 +5404,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr ""
+#: actions/subscriptions.php:178
+#, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr ""
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr ""
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr ""
@@ -5619,13 +5794,13 @@ msgid "Author(s)"
msgstr ""
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr ""
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr ""
@@ -5679,42 +5854,42 @@ msgid "Invalid filename."
msgstr ""
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr ""
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr ""
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr ""
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, php-format
msgid "Group ID %s is invalid."
msgstr ""
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr ""
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -5742,12 +5917,12 @@ msgid "You are banned from sending direct messages."
msgstr ""
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr ""
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr ""
@@ -5765,59 +5940,59 @@ msgid "Database error inserting hashtag: %s"
msgstr ""
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr ""
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr ""
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr ""
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr ""
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -5831,14 +6006,14 @@ msgstr ""
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -5854,48 +6029,48 @@ msgid "Unable to save tag."
msgstr ""
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr ""
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr ""
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr ""
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr ""
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr ""
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr ""
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr ""
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, php-format
msgid "%1$s is now following %2$s."
msgstr ""
@@ -6259,10 +6434,14 @@ msgid "Before"
msgstr ""
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+msgid "Post"
+msgstr ""
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -7668,17 +7847,17 @@ msgid "Send"
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -7919,7 +8098,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr ""
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
msgid "Page not found."
msgstr ""
@@ -8165,17 +8344,17 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8183,12 +8362,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8196,12 +8375,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8209,12 +8388,12 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8222,7 +8401,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 700570d24..d56739acd 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:21+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:14+0000\n"
"Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: sv\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -88,11 +88,11 @@ msgstr "Spara inställningar för åtkomst"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -379,20 +379,38 @@ msgstr "Kunde inte spara dina utseendeinställningar."
msgid "Could not update your design."
msgstr "Kunde inte uppdatera din profils utseende."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s tidslinje"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s prenumerationer"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Favoriter"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "%s gruppmedlemmar"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -743,7 +761,7 @@ msgstr "Begäran-token är redan auktoriserad."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -780,7 +798,7 @@ msgstr "Databasfel vid infogning av OAuth-applikationsanvändare."
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -854,7 +872,7 @@ msgstr "Lösenord"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -930,7 +948,8 @@ msgstr "Du kan inte ta bort en annan användares status."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Ingen sådan notis."
@@ -946,7 +965,10 @@ msgstr "Kan inte upprepa din egen notis."
msgid "Already repeated that notice."
msgstr "Redan upprepat denna notis."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "API-metod hittades inte."
@@ -966,16 +988,16 @@ msgstr "Status borttagen."
msgid "No status with that ID found."
msgstr "Ingen status med det ID:t hittades."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Kan inte ta bort denna notis."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "Ta bort notis"
@@ -1097,34 +1119,58 @@ msgstr "Notiser taggade med %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Uppdateringar taggade med %1$s på %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "Bara användaren kan läsa sina egna brevlådor."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Hitta innehåll i notiser"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "Notis med den ID:n finns inte."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1139,6 +1185,147 @@ msgstr "API-metoden är under uppbyggnad."
msgid "User not found."
msgstr "API-metod hittades inte."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Ingen sådan profil."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Kunde inte infoga ny prenumeration."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Hitta innehåll i notiser"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Okänd"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Lägg till i favoriter"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Ingen sådan profil."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "%s gruppmedlemmar"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Grupper %s är en medlem i"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Okänd"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Alla medlemmar"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Ingen sådan fil."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Kunde inte ta bort favoriten."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Ingen sådan grupp."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Alla medlemmar"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "API-metod hittades inte."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Ingen sådan profil."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Du är inte prenumerat hos den profilen."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Kunde inte spara prenumeration."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Personer som prenumererar på %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Okänd filtyp"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1426,8 +1613,8 @@ msgstr "Denna adress har redan blivit bekräftad."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1950,12 +2137,12 @@ msgstr "Hantera hur du får e-post från %%site.name%%"
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "E-postadress"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Aktuell, bekräftad e-postadress."
@@ -1964,14 +2151,14 @@ msgstr "Aktuell, bekräftad e-postadress."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Ta bort"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1984,14 +2171,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "E-postadress, såsom \"användarnamn@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -1999,111 +2186,118 @@ msgstr "Lägg till"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Inkommande e-post"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Jag vill posta notiser genom min e-post."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Skicka e-post till denna adress för att posta nya notiser."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Ange en ny e-postadress för att posta till; detta inaktiverar den gamla."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Ny"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "E-postinställningar"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Skicka notiser om nya prenumerationer till mig genom e-post."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Skicka mig e-post när någon lägger till min notis som en favorit."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Skicka mig e-post när någon skickar mig ett privat meddelande."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Skicka mig e-post när någon skickar ett \"@-svar\"."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Tillåt vänner att knuffa mig och skicka e-post till mig."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Jag vill posta notiser genom min e-post."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Publicera ett MicroID för min e-postadress."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "E-postinställningar sparade."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Ingen e-postadress."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Kan inte normalisera den e-postadressen"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Inte en giltig e-postadress."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Det är redan din e-postadress."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Den e-postadressen tillhör redan en annan användare."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Kunde inte infoga bekräftelsekod."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2115,56 +2309,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Ingen väntande bekräftelse att avbryta."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Detta är fel e-postadress."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Kunde inte ta bort e-postbekräftelse."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "E-postbekräftelse avbruten."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Det är inte din e-postadress."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "E-postadressen togs bort."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Ingen inkommande e-postadress."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Kunde inte uppdatera användaruppgift."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Inkommande e-postadress borttagen."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Ny inkommande e-postadress tillagd."
@@ -5374,7 +5568,7 @@ msgstr "Du är inte prenumerat hos den profilen."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Kunde inte spara prenumeration."
@@ -5382,10 +5576,6 @@ msgstr "Kunde inte spara prenumeration."
msgid "This action only accepts POST requests."
msgstr "Denna åtgärd accepterar endast POST-begäran."
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Ingen sådan profil."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr "Du kan inte prenumerera på en 0MB 0.1-fjärrprofil med denna åtgärd."
@@ -5452,13 +5642,6 @@ msgstr ""
"%s har inte några prenumeranter. Varför inte [registrera ett konto](%%%%"
"action.register%%%%) och bli först?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "%s prenumerationer"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5508,13 +5691,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s lyssnar inte på någon."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Flöde av notiser för %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5927,13 +6115,13 @@ msgid "Author(s)"
msgstr "Författare"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Markera som favorit"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%s (@%s) lade till din notis som en favorit"
@@ -5993,42 +6181,42 @@ msgid "Invalid filename."
msgstr "Ogiltigt filnamn."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Gruppanslutning misslyckades."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "Inte med i grupp."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "Grupputträde misslyckades."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "Fel vid sparande av användare; ogiltig."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Gå med"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6056,12 +6244,12 @@ msgid "You are banned from sending direct messages."
msgstr "Du är utestängd från att skicka direktmeddelanden."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Kunde inte infoga meddelande."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Kunde inte uppdatera meddelande med ny URI."
@@ -6079,17 +6267,17 @@ msgid "Database error inserting hashtag: %s"
msgstr "Databasfel vid infogning av hashtag: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Problem vid sparande av notis. För långt."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Problem vid sparande av notis. Okänd användare."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6097,7 +6285,7 @@ msgstr ""
"minuter."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6106,37 +6294,37 @@ msgstr ""
"om ett par minuter."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Du är utestängd från att posta notiser på denna webbplats."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Problem med att spara notis."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
#, fuzzy
msgid "Bad type provided to saveKnownGroups."
msgstr "Dålig typ tillhandahållen saveKnownGroups"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "Problem med att spara gruppinkorg."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Kunde inte spara lokal gruppinformation."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6150,14 +6338,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr "Kan inte återkalla roll \"%1$s\" för användare #%2$d; finns inte."
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr "Kan inte återkalla roll \"%1$s\" för användare #%2$d; databasfel."
@@ -6173,48 +6361,48 @@ msgid "Unable to save tag."
msgstr "Kunde inte spara tagg."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "Du har blivit utestängd från att prenumerera."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Redan prenumerant!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "Användaren har blockerat dig."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Inte prenumerant!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Kunde inte spara prenumeration."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Kunde inte spara prenumeration."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Kunde inte spara prenumeration."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr "Följ"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s lyssnar nu på dina notiser på %2$s."
@@ -6584,10 +6772,15 @@ msgid "Before"
msgstr "Tidigare"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr "Förväntade ett flödes rotelement, men fick ett helt XML-dokument."
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Foto"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8160,18 +8353,18 @@ msgid "Send"
msgstr "Skicka"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Smeknamnet får endast innehålla små bokstäver eller siffror, inga mellanslag."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8414,7 +8607,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Återkalla rollen \"%s\" från denna användare"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "API-metod hittades inte."
@@ -8666,17 +8859,17 @@ msgid "Moderator"
msgstr "Moderator"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "ett par sekunder sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "för nån minut sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8684,12 +8877,12 @@ msgstr[0] "för ungefär en minut sedan"
msgstr[1] "för ungefär %d minuter sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "för en timma sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8697,12 +8890,12 @@ msgstr[0] "för ungefär en timma sedan"
msgstr[1] "för ungefär %d timmar sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "för en dag sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8710,12 +8903,12 @@ msgstr[0] "för ungefär en dag sedan"
msgstr[1] "för ungefär %d dagar sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "för en månad sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8723,7 +8916,7 @@ msgstr[0] "för ungefär en månad sedan"
msgstr[1] "för ungefär %d månader sedan"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
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 8b9480390..250a87173 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:21+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:15+0000\n"
"Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: te\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -86,11 +86,11 @@ msgstr "అందుబాటు అమరికలను భద్రపరచ
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -372,20 +372,38 @@ msgstr "మీ రూపురేఖల అమరికలని భద్రప
msgid "Could not update your design."
msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
-msgstr ""
+msgstr "ప్రధాన"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s కాలరేఖ"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s చందాలు"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "ఇష్టాంశాలు"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "%s గుంపు సభ్యులు"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -739,7 +757,7 @@ msgstr "మీకు అధీకరణ లేదు."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -776,7 +794,7 @@ msgstr "అవతారాన్ని పెట్టడంలో పొరప
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -844,7 +862,7 @@ msgstr "సంకేతపదం"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -919,7 +937,8 @@ msgstr "ఇతర వాడుకరుల స్థితిని మీరు
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "అటువంటి సందేశమేమీ లేదు."
@@ -935,7 +954,10 @@ msgstr "మీ నోటీసుని మీరే పునరావృతి
msgid "Already repeated that notice."
msgstr "ఇప్పటికే ఆ నోటీసుని పునరావృతించారు."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
#, fuzzy
msgid "HTTP method not supported."
msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
@@ -955,16 +977,16 @@ msgstr "స్థితిని తొలగించాం."
msgid "No status with that ID found."
msgstr "ఆ IDతో ఏ నోటీసు కనబడలేదు."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "ఈ నోటీసుని తొలగించలేము."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, fuzzy, php-format
msgid "Deleted notice %d"
msgstr "నోటీసుని తొలగించు"
@@ -1087,34 +1109,58 @@ msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నో
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
#, fuzzy
msgid "Only the user can add to their own timeline."
msgstr "ఎవరి తపాలాపెట్టెలను ఆ వాడుకరి మాత్రమే చదవలగరు."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
msgstr ""
-#: actions/apitimelineuser.php:316
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
+msgstr ""
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, fuzzy, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1130,6 +1176,148 @@ msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
msgid "User not found."
msgstr "వాడుకరి దొరకలేదు."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "అటువంటి ఫైలు లేదు."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "కొత్త చందాని చేర్చలేకపోయాం."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "సైటు గమనికని భద్రపరచు"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "తెలియని చర్య"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "ఇష్టాంశాలకు చేర్చు"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "అటువంటి ఫైలు లేదు."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "%s గుంపు సభ్యులు"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "%s సభ్యులుగా ఉన్న గుంపులు"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "తెలియని చర్య"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "అందరు సభ్యులూ"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "అటువంటి ఫైలు లేదు."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "ఇష్టాంశాన్ని తొలగించలేకపోయాం."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "అటువంటి గుంపు లేదు."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "అందరు సభ్యులూ"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "అటువంటి ఫైలు లేదు."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "మీరు ఎవరికీ చందాచేరలేదు."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "కొత్త చందాని చేర్చలేకపోయాం."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "%sకి చందాచేరిన వ్యక్తులు"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "తెలియని ఫైలు రకం"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1416,8 +1604,8 @@ msgstr "ఆ చిరునామా ఇప్పటికే నిర్ధా
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1945,12 +2133,12 @@ msgstr "%%site.name%% నుండి మీకు ఎలా మెయిల్
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "ఈమెయిలు చిరునామా"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిలు చిరునామా."
@@ -1959,14 +2147,14 @@ msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిల
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "తొలగించు"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1979,14 +2167,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "ఈమెయిల్ చిరునామా, \"username@example.org\" వలె"
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -1994,115 +2182,122 @@ msgstr "చేర్చు"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr ""
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "నేను ఈమెయిలు ద్వారా నోటీసులు పంపాలనుకుంటున్నాను."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
#, fuzzy
msgid "Send email to this address to post new notices."
msgstr "%sకి నోటీసులు పంపించడానికి కొత్త ఈమెయిలు చిరునామా"
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
#, fuzzy
msgid "Make a new email address for posting to; cancels the old one."
msgstr "%sకి నోటీసులు పంపించడానికి కొత్త ఈమెయిలు చిరునామా"
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "కొత్తది"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "ఈమెయిలు అభిరుచులు"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
#, fuzzy
msgid "Send me email when someone adds my notice as a favorite."
msgstr "%s (@%s) మీ నోటీసుని ఇష్టపడ్డారు"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "ఎవరైనా నాకు అంతరంగిక సందేశాన్ని పంపించినప్పుడు నాకు ఈమెయిలుని పంపించు"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "నేను ఈమెయిలు ద్వారా నోటీసులు పంపాలనుకుంటున్నాను."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
#, fuzzy
msgid "Publish a MicroID for my email address."
msgstr "అది మీ ఈమెయిలు చిరునామా కాదు."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "ఈమెయిలు అభిరుచులు భద్రమయ్యాయి."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "ఈమెయిలు చిరునామా లేదు."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
#, fuzzy
msgid "Cannot normalize that email address"
msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిలు చిరునామా."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:"
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "అది ఇప్పటికే మీ ఈమెయిల్ చిరునామా."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "ఆ ఈమెయిల్ చిరునామా ఇప్పటేకే ఇతర వాడుకరికి సంబంధించినది."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "నిర్ధారణ సంకేతాన్ని చేర్చలేకపోయాం."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
#, fuzzy
msgid ""
"A confirmation code was sent to the email address you added. Check your "
@@ -2114,59 +2309,59 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "రద్దుచేయడానికి వేచివున్న నిర్ధారణలేమీ లేవు."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "ఆ ఈమెయిలు చిరునామా సరైనది కాదు."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "ఈమెయిలు నిర్ధారణ రద్దయింది."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "అది మీ ఈమెయిలు చిరునామా కాదు."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "ఆ ఈమెయిలు చిరునామాని తొలగించాం."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
#, fuzzy
msgid "No incoming email address."
msgstr "ఈమెయిలు చిరునామా లేదు."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
#, fuzzy
msgid "Couldn't update user record."
msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
#, fuzzy
msgid "Incoming email address removed."
msgstr "ఆ ఈమెయిలు చిరునామాని తొలగించాం."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
#, fuzzy
msgid "New incoming email address added."
msgstr "ఈమెయిలు చిరునామా లేదు."
@@ -5348,7 +5543,7 @@ msgstr "మీరు ఎవరికీ చందాచేరలేదు."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "కొత్త చందాని చేర్చలేకపోయాం."
@@ -5356,11 +5551,6 @@ msgstr "కొత్త చందాని చేర్చలేకపోయా
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "అటువంటి ఫైలు లేదు."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr ""
@@ -5426,13 +5616,6 @@ msgstr ""
"%sకి చందాదార్లు ఎవరూ లేరు. [ఒక ఖాతాని నమోదు చేసుకుని](%%%%action.register%%%%) మీరు "
"ఎందుకు మొదటి చందాదారు కాకూడదు?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "%s చందాలు"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5476,13 +5659,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s ప్రస్తుతం ఎవరినీ వినడంలేదు."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "%s కొరకు స్పందనల ఫీడు (ఆటమ్)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "జాబర్"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr ""
@@ -5869,13 +6057,13 @@ msgid "Author(s)"
msgstr "రచయిత(లు)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "ఇష్టపడు"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%2$s నోటీసుని %1$s ఇష్టాంశంగా గుర్తించారు."
@@ -5929,42 +6117,42 @@ msgid "Invalid filename."
msgstr "తప్పుడు దస్త్రపుపేరు.."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "గుంపులో చేరడం విఫలమైంది."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "గుంపులో భాగం కాదు."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "గుంపు నుండి వైదొలగడం విఫలమైంది."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "చేరు"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -5992,13 +6180,13 @@ msgid "You are banned from sending direct messages."
msgstr "నేరుగా సందేశాలు పంపడం నుండి మిమ్మల్ని నిషేధించారు."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
#, fuzzy
msgid "Could not insert message."
msgstr "ట్యాగులని భద్రపరచలేకపోయాం."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
#, fuzzy
msgid "Could not update message with new URI."
msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
@@ -6017,23 +6205,23 @@ msgid "Database error inserting hashtag: %s"
msgstr "అవతారాన్ని పెట్టడంలో పొరపాటు"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "నోటీసుని భద్రపరచడంలో పొరపాటు. చాలా పొడవుగా ఉంది."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "నోటీసుని భద్రపరచడంలో పొరపాటు. గుర్తుతెలియని వాడుకరి."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr "చాలా ఎక్కువ నోటీసులు అంత వేగంగా; కాస్త ఊపిరి తీసుకుని మళ్ళీ కొన్ని నిమిషాల తర్వాత వ్రాయండి."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
@@ -6041,37 +6229,37 @@ msgid ""
msgstr "చాలా ఎక్కువ నోటీసులు అంత వేగంగా; కాస్త ఊపిరి తీసుకుని మళ్ళీ కొన్ని నిమిషాల తర్వాత వ్రాయండి."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "ఈ సైటులో నోటీసులు రాయడం నుండి మిమ్మల్ని నిషేధించారు."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
#, fuzzy
msgid "Problem saving group inbox."
msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "స్థానిక గుంపుని తాజాకరించలేకున్నాం."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6085,14 +6273,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6109,49 +6297,49 @@ msgid "Unable to save tag."
msgstr "ట్యాగులని భద్రపరచలేకపోయాం."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "చందాచేరడం నుండి మిమ్మల్ని నిషేధించారు."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "ఇప్పటికే చందాచేరారు!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "వాడుకరి మిమ్మల్ని నిరోధించారు."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
#, fuzzy
msgid "Not subscribed!"
msgstr "చందాదార్లు"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "కొత్త చందాని చేర్చలేకపోయాం."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "కొత్త చందాని చేర్చలేకపోయాం."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "కొత్త చందాని చేర్చలేకపోయాం."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr "అనుసరించు"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s ఇప్పుడు %2$sలో మీ నోటీసులని వింటున్నారు."
@@ -6522,10 +6710,15 @@ msgid "Before"
msgstr "ఇంతక్రితం"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "ఫొటో"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8057,17 +8250,17 @@ msgid "Send"
msgstr "పంపించు"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "పేరులో చిన్నబడి అక్షరాలు మరియు అంకెలు మాత్రమే ఖాళీలు లేకుండా ఉండాలి."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8314,7 +8507,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "ఈ గుంపునుండి ఈ వాడుకరిని నిరోధించు"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
@@ -8565,17 +8758,17 @@ msgid "Moderator"
msgstr "సమన్వయకర్త"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "కొన్ని క్షణాల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "ఓ నిమిషం క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8583,12 +8776,12 @@ msgstr[0] "సుమారు ఒక నిమిషం క్రితం"
msgstr[1] "సుమారు %d నిమిషాల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "ఒక గంట క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8596,33 +8789,33 @@ msgstr[0] "సుమారు ఒక గంట క్రితం"
msgstr[1] "సుమారు %d గంటల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "ఓ రోజు క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
-msgstr[0] "ఒక రోజు క్రితం"
-msgstr[1] "%d రోజుల క్రితం"
+msgstr[0] "సుమారు ఒక రోజు క్రితం"
+msgstr[1] "సుమారు %d రోజుల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "ఓ నెల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
-msgstr[0] "ఒక నెల క్రితం"
-msgstr[1] "%d నెలల క్రితం"
+msgstr[0] "సుమారు ఒక నెల క్రితం"
+msgstr[1] "సుమారు %d నెలల క్రితం"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "ఒక సంవత్సరం క్రితం"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 07e98b52e..16d69a971 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:22+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:16+0000\n"
"Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: tr\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -88,11 +88,11 @@ msgstr "Erişim ayarlarını kaydet"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -378,24 +378,41 @@ msgstr "Dizayn ayarlarınız kaydedilemedi."
#. TRANS: Client error displayed when a database error occurs updating profile colours.
#: actions/apiaccountupdateprofilebackgroundimage.php:191
#: actions/apiaccountupdateprofilecolors.php:139
-#, fuzzy
msgid "Could not update your design."
-msgstr "Kullanıcı güncellenemedi."
+msgstr "Tasarımınız güncellenemedi."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
-msgstr ""
+msgstr "Ana"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s zaman çizelgesi"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Bütün abonelikler"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "%s kullanıcısının favori durum mesajları"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "%s grup üyeleri"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -521,9 +538,8 @@ msgstr "Kendinizi izlemeyi bırakamazsınız."
#. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
#: actions/apifriendshipsexists.php:88
-#, fuzzy
msgid "Two valid IDs or nick names must be supplied."
-msgstr "İki geçerli ID ya da screen_names verilmelidir."
+msgstr "İki geçerli ID veya takma ad verilmelidir."
#. TRANS: Client error displayed when a source user could not be determined showing friendship.
#: actions/apifriendshipsshow.php:131
@@ -742,7 +758,7 @@ msgstr "İstek belirteci zaten yetkili."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -778,7 +794,7 @@ msgstr "oauth_token_association eklerken veritabanı hatası."
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -854,7 +870,7 @@ msgstr "Parola"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -869,28 +885,25 @@ msgstr "İzin Ver"
#. TRANS: Form instructions.
#: actions/apioauthauthorize.php:502
-#, fuzzy
msgid "Authorize access to your account information."
-msgstr "Hesap bilgilerinize erişim için izin verin ya da erişimi reddedin."
+msgstr "Hesap bilgilerinize erişim için izin verin."
#. TRANS: Header for user notification after revoking OAuth access to an application.
#: actions/apioauthauthorize.php:594
-#, fuzzy
msgid "Authorization canceled."
-msgstr "Onay kodu yok."
+msgstr "Yetkilendirme iptal edildi."
#. TRANS: User notification after revoking OAuth access to an application.
#. TRANS: %s is an OAuth token.
#: actions/apioauthauthorize.php:598
-#, fuzzy, php-format
+#, php-format
msgid "The request token %s has been revoked."
-msgstr "İstek belirteci %s, reddedildi ve iptal edildi."
+msgstr "İstek belirteci %s, iptal edildi."
#. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
#: actions/apioauthauthorize.php:621
-#, fuzzy
msgid "You have successfully authorized the application"
-msgstr "Takip talebine izin verildi"
+msgstr "Uygulamayı başarılı bir şekilde yetkilendirdiniz"
#. TRANS: Message notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
#: actions/apioauthauthorize.php:625
@@ -898,13 +911,15 @@ msgid ""
"Please return to the application and enter the following security code to "
"complete the process."
msgstr ""
+"Lütfen uygulamaya geri dönün ve işlemi tamamlamak için aşağıdaki güvenlik "
+"kodunu girin."
#. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
#. TRANS: %s is the authorised application name.
#: actions/apioauthauthorize.php:632
-#, fuzzy, php-format
+#, php-format
msgid "You have successfully authorized %s"
-msgstr "Takip talebine izin verildi"
+msgstr "Başarıyla %s uygulamasını yetkilendirdiniz"
#. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
#. TRANS: %s is the authorised application name.
@@ -914,6 +929,8 @@ msgid ""
"Please return to %s and enter the following security code to complete the "
"process."
msgstr ""
+"Lütfen %s uygulamasına geri dönün ve işlemi tamamlamak için aşağıdaki "
+"güvenlik kodunu girin."
#. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
#. TRANS: POST and DELETE should not be translated.
@@ -930,7 +947,8 @@ msgstr "Başka bir kullanıcının durum mesajını silemezsiniz."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Böyle bir durum mesajı yok."
@@ -946,15 +964,17 @@ msgstr "Kendi durum mesajınızı tekrarlayamazsınız."
msgid "Already repeated that notice."
msgstr "Bu durum mesajı zaten tekrarlanmış."
-#: actions/apistatusesshow.php:117
-#, fuzzy
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
-msgstr "UPA yöntemi bulunamadı."
+msgstr "HTTP yöntemi desteklenmiyor."
#: actions/apistatusesshow.php:141
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported format: %s"
-msgstr "Desteklenmeyen biçim."
+msgstr "Desteklenmeyen biçim: %s"
#. TRANS: Client error displayed requesting a deleted status.
#: actions/apistatusesshow.php:152
@@ -966,19 +986,19 @@ msgstr "Durum silindi."
msgid "No status with that ID found."
msgstr "Bu ID'li bir durum mesajı bulunamadı."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
-msgstr ""
+msgstr "Yalnızca Atom biçimi kullanılarak silinebilir."
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Bu durum mesajı silinemiyor."
-#: actions/apistatusesshow.php:247
-#, fuzzy, php-format
+#: actions/apistatusesshow.php:243
+#, php-format
msgid "Deleted notice %d"
-msgstr "Durum mesajını sil"
+msgstr "%d durum mesajını sil"
#. TRANS: Client error displayed when the parameter "status" is missing.
#: actions/apistatusesupdate.php:221
@@ -989,25 +1009,24 @@ msgstr "İstemci, bir değere sahip 'status' parametresi sağlamalı."
#. TRANS: %d is the maximum number of character for a notice.
#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
#: lib/mailhandler.php:60
-#, fuzzy, php-format
+#, php-format
msgid "That's too long. Maximum notice size is %d character."
msgid_plural "That's too long. Maximum notice size is %d characters."
-msgstr[0] "Bu çok uzun. Maksimum durum mesajı boyutu %d karakterdir."
+msgstr[0] "Bu çok uzun. En büyük durum mesajı boyutu %d karakterdir."
#. TRANS: Client error displayed when replying to a non-existing notice.
#: actions/apistatusesupdate.php:284
-#, fuzzy
msgid "Parent notice not found."
-msgstr "Onay kodu bulunamadı."
+msgstr "Üst durum mesajı bulunamadı."
#. TRANS: Client error displayed exceeding the maximum notice length.
#. TRANS: %d is the maximum lenth for a notice.
#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
-#, fuzzy, php-format
+#, php-format
msgid "Maximum notice size is %d character, including attachment URL."
msgid_plural "Maximum notice size is %d characters, including attachment URL."
msgstr[0] ""
-"Maksimum durum mesajı boyutu, eklenti bağlantıları dahil %d karakterdir."
+"En büyük durum mesajı boyutu, eklenti bağlantıları dahil %d karakterdir."
#. TRANS: Client error displayed when requesting profiles of followers in an unsupported format.
#. TRANS: Client error displayed when requesting IDs of followers in an unsupported format.
@@ -1018,24 +1037,24 @@ msgstr "Desteklenmeyen biçim."
#. TRANS: Title for timeline of most recent favourite notices by a user.
#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
#: actions/apitimelinefavorites.php:108
-#, fuzzy, php-format
+#, php-format
msgid "%1$s / Favorites from %2$s"
-msgstr "%1$s'in %2$s'deki durum mesajları "
+msgstr "%1$s / %2$s kullanıcısının favorileri"
#. TRANS: Subtitle for timeline of most recent favourite notices by a user.
#. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
#. TRANS: %3$s is a user nickname.
#: actions/apitimelinefavorites.php:120
-#, fuzzy, php-format
+#, php-format
msgid "%1$s updates favorited by %2$s / %3$s."
-msgstr "%s adli kullanicinin durum mesajlari"
+msgstr "%2$s / %3$s tarafından favorilere eklenen %1$s güncellemeleri."
#. TRANS: Server error displayed when generating an Atom feed fails.
#. TRANS: %s is the error.
#: actions/apitimelinegroup.php:138
-#, fuzzy, php-format
+#, php-format
msgid "Could not generate feed for group - %s"
-msgstr "Grup güncellenemedi."
+msgstr "Grup - %s için besleme oluşturulamadı."
#. TRANS: Title for timeline of most recent mentions of a user.
#. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
@@ -1097,33 +1116,57 @@ msgstr "%s ile etiketli durum mesajları"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%s adli kullanicinin durum mesajlari"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
msgid "Only the user can add to their own timeline."
msgstr ""
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
msgstr ""
-#: actions/apitimelineuser.php:316
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
+msgstr ""
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr ""
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1139,6 +1182,148 @@ msgstr "UPA metodu yapım aşamasında."
msgid "User not found."
msgstr "Onay kodu bulunamadı."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Yeni abonelik eklenemedi."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Durum mesajını kaydederken hata oluştu."
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Favorilere ekle"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "%s grup üyeleri"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "%2$s kullanıcısının üye olduğu %1$s grupları."
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Yeni grup"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Tüm üyeler"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Böyle bir dosya yok."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Favori silinemedi."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Böyle bir kullanıcı yok."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Tüm üyeler"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "HTTP yöntemi desteklenmiyor."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Böyle bir durum mesajı yok."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Bize o profili yollamadınız"
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Yeni abonelik eklenemedi."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Uzaktan abonelik"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Kullanıcının profili yok."
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1429,8 +1614,8 @@ msgstr "O adres daha önce onaylanmış."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1963,12 +2148,12 @@ msgstr "%%site.name%%'dan nasıl e-posta alacağınızı yönetin."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "E-posta adresi"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Mevcut doğrulanmış e-posta adresi."
@@ -1977,14 +2162,14 @@ msgstr "Mevcut doğrulanmış e-posta adresi."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Geri al"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1997,14 +2182,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "\"kullanıcıadı@örnek.org\" benzeri bir e-posta adresi."
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2012,104 +2197,111 @@ msgstr "Ekle"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Gelen e-posta"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr ""
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Yeni durum mesajları göndermek için bu adrese e-posta atın."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr ""
"Gönderim yapmak için yeni bir e-posta adresi oluşturun; eskisi iptal "
"olacaktır."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Yeni"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "E-posta tercihleri"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
#, fuzzy
msgid "Send me notices of new subscriptions through email."
msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Biri benim durum mesajımı favori olarak eklediğinde bana e-posta gönder."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Birisi bana özel mesaj attığında bana e-posta gönder."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr ""
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
#, fuzzy
msgid "Publish a MicroID for my email address."
msgstr "Bir takma ad veya eposta adresi girin."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "E-posta tercihleri kaydedildi."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
#, fuzzy
msgid "No email address."
msgstr "Geçersiz bir eposta adresi."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
#, fuzzy
msgid "Cannot normalize that email address"
msgstr "Jabber işlemlerinde bir hata oluştu."
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Geçersiz bir eposta adresi."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Bu zaten sizin e-posta adresiniz."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
#, fuzzy
msgid "That email address already belongs to another user."
msgstr "Jabber ID başka bir kullanıcıya ait."
@@ -2117,13 +2309,13 @@ msgstr "Jabber ID başka bir kullanıcıya ait."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Onay kodu eklenemedi."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
#, fuzzy
msgid ""
"A confirmation code was sent to the email address you added. Check your "
@@ -2135,57 +2327,57 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "İptal etmek için beklenen onay yok."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Bu yanlış e-posta adresi."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Eposta onayı silinemedi."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "İptal etmek için beklenen onay yok."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Bu sizin e-posta adresiniz değil."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "Eposta adresi zaten var."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
#, fuzzy
msgid "No incoming email address."
msgstr "Geçersiz bir eposta adresi."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Kullanıcı kayıtları güncellenemedi."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Gelen e-posta adresi silindi."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Yeni gelen e-posta adresi eklendi."
@@ -5335,7 +5527,7 @@ msgstr "Bize o profili yollamadınız"
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Yeni abonelik eklenemedi."
@@ -5343,11 +5535,6 @@ msgstr "Yeni abonelik eklenemedi."
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "Böyle bir durum mesajı yok."
-
#: actions/subscribe.php:117
#, fuzzy
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
@@ -5411,13 +5598,6 @@ msgid ""
"%) and be the first?"
msgstr ""
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Bütün abonelikler"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5461,13 +5641,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%1$s %2$s'da durumunuzu takip ediyor"
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "%s için durum RSS beslemesi"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr ""
@@ -5863,13 +6048,13 @@ msgid "Author(s)"
msgstr ""
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr ""
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, fuzzy, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%1$s %2$s'da durumunuzu takip ediyor"
@@ -5920,46 +6105,46 @@ msgid "Invalid filename."
msgstr "Geçersiz dosya ismi."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
#, fuzzy
msgid "Group join failed."
msgstr "Böyle bir durum mesajı yok."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
#, fuzzy
msgid "Not part of group."
msgstr "Kullanıcı güncellenemedi."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
#, fuzzy
msgid "Group leave failed."
msgstr "Böyle bir durum mesajı yok."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, fuzzy, php-format
msgid "Group ID %s is invalid."
msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
#, fuzzy
msgid "Join"
msgstr "Giriş"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -5988,13 +6173,13 @@ msgid "You are banned from sending direct messages."
msgstr ""
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
#, fuzzy
msgid "Could not insert message."
msgstr "Yeni abonelik eklenemedi."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
#, fuzzy
msgid "Could not update message with new URI."
msgstr "Kullanıcı güncellenemedi."
@@ -6013,60 +6198,60 @@ msgid "Database error inserting hashtag: %s"
msgstr "Avatar eklemede hata oluştu"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Durum mesajını kaydederken hata oluştu. Çok uzun."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Durum mesajını kaydederken hata oluştu. Bilinmeyen kullanıcı."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr ""
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Durum mesajını kaydederken hata oluştu."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Durum mesajını kaydederken hata oluştu."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, fuzzy, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Profil kaydedilemedi."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
@@ -6080,14 +6265,14 @@ msgstr "%1$s'in %2$s'deki durum mesajları "
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6103,50 +6288,50 @@ msgid "Unable to save tag."
msgstr "Etiket kaydedilemedi."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr ""
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Zaten abone olunmuş!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
#, fuzzy
msgid "User has blocked you."
msgstr "Kullanıcının profili yok."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
#, fuzzy
msgid "Not subscribed!"
msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Yeni abonelik eklenemedi."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Yeni abonelik eklenemedi."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Yeni abonelik eklenemedi."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, fuzzy, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s %2$s'da durumunuzu takip ediyor"
@@ -6521,10 +6706,15 @@ msgid "Before"
msgstr "Önce"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Fotoğraf"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -7849,28 +8039,25 @@ msgid "from"
msgstr ""
#: lib/mailhandler.php:37
-#, fuzzy
msgid "Could not parse message."
-msgstr "Kullanıcı güncellenemedi."
+msgstr "Mesaj ayrıştırılamadı."
#: lib/mailhandler.php:42
-#, fuzzy
msgid "Not a registered user."
-msgstr "Bir geri alma kodu değil."
+msgstr "Kayıtlı bir kullanıcı değil."
#: lib/mailhandler.php:46
-#, fuzzy
msgid "Sorry, that is not your incoming email address."
-msgstr "Yanlış IM adresi."
+msgstr "Üzgünüz, bu sizin gelen e-posta adresiniz değil."
#: lib/mailhandler.php:50
msgid "Sorry, no incoming email allowed."
msgstr ""
#: lib/mailhandler.php:229
-#, fuzzy, php-format
+#, php-format
msgid "Unsupported message type: %s"
-msgstr "Desteklenmeyen görüntü dosyası biçemi."
+msgstr "Desteklenmeyen mesaj türü: %s"
#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
#: lib/mediafile.php:102 lib/mediafile.php:174
@@ -7923,9 +8110,8 @@ msgstr ""
#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
#. TRANS: type of the uploaded file could not be determined.
#: lib/mediafile.php:265 lib/mediafile.php:306
-#, fuzzy
msgid "Could not determine file's MIME type."
-msgstr "Kullanıcı güncellenemedi."
+msgstr "Dosyanın MIME türü belirlenemedi."
#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
@@ -7950,9 +8136,8 @@ msgstr ""
#. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
#: lib/messageform.php:137
-#, fuzzy
msgid "Select recipient:"
-msgstr "Lisans seç"
+msgstr "Alıcıyı seçin:"
#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
#: lib/messageform.php:150
@@ -7976,19 +8161,19 @@ msgid "Send"
msgstr "Gönder"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Takma ad sadece küçük harflerden ve rakamlardan oluşabilir, boşluk "
"kullanılamaz. "
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8239,7 +8424,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Böyle bir kullanıcı yok."
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
#, fuzzy
msgid "Page not found."
msgstr "Onay kodu bulunamadı."
@@ -8501,60 +8686,60 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "birkaç saniye önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "yaklaşık bir dakika önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "yaklaşık bir saat önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "yaklaşık bir gün önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "yaklaşık bir ay önce"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
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 650ccffd7..36adfb46e 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -12,18 +12,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:23+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:17+0000\n"
"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: uk\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -91,11 +91,11 @@ msgstr "Зберегти параметри доступу"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -386,20 +386,38 @@ msgstr "Не маю можливості зберегти налаштуванн
msgid "Could not update your design."
msgstr "Не вдалося оновити ваш дизайн."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
-msgstr ""
+msgstr "Головна"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s стрічка"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "Підписки %s"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Обрані"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "Учасники спільноти %s"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -754,7 +772,7 @@ msgstr "Токен запиту вже авторизовано."
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -791,7 +809,7 @@ msgstr "Помилка бази даних при додаванні парам
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -866,7 +884,7 @@ msgstr "Пароль"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -943,7 +961,8 @@ msgstr "Ви не можете видалити статус іншого кор
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Такого допису немає."
@@ -959,7 +978,10 @@ msgstr "Не можна повторювати власні дописи."
msgid "Already repeated that notice."
msgstr "Цей допис вже повторено."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
msgstr "HTTP спосіб не підтримується."
@@ -978,16 +1000,16 @@ msgstr "Статус видалено."
msgid "No status with that ID found."
msgstr "Не знайдено жодних статусів з таким ID."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
-msgstr ""
+msgstr "Можна видалити тільки у форматі Atom."
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Не можна видалити цей допис."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, php-format
msgid "Deleted notice %d"
msgstr "Вилучене повідомлення %d"
@@ -1116,36 +1138,64 @@ msgstr "Дописи позначені з %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Оновлення позначені з %1$s на %2$s!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
msgid "Only the user can add to their own timeline."
msgstr "Користувач може робити доповнення тільки до своєї власної хронології."
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
-msgstr ""
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+#, fuzzy
+msgid "Only accept AtomPub for Atom feeds."
+msgstr "Приймати лише AtomPub для веб-стрічок формату Atom."
-#: actions/apitimelineuser.php:316
+#: actions/apitimelineuser.php:310
+#, fuzzy
+msgid "Atom post must not be empty."
+msgstr "POST-запит Atom має бути записом формату Atom."
+
+#: actions/apitimelineuser.php:315
+#, fuzzy
+msgid "Atom post must be well-formed XML."
+msgstr "POST-запит Atom має бути записом формату Atom."
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
-msgstr ""
+msgstr "POST-запит Atom має бути записом формату Atom."
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
-msgstr ""
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+#, fuzzy
+msgid "Can only handle POST activities."
+msgstr "Можливою є обробка лише для POST-запитів."
-#: actions/apitimelineuser.php:334
-#, php-format
-msgid "Cannot handle activity object type \"%s\""
-msgstr ""
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
+#, fuzzy, php-format
+msgid "Cannot handle activity object type \"%s\"."
+msgstr "Неможливо опрацювати дії об’єкта типу «%s»"
+
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Пошук дописів за змістом"
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr "Повідомлення з URI \"%s\" вже існує."
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
+msgstr "Запис AtomPub з невідомим цільовим URI %s"
#. TRANS: Server error for unfinished API method showTrends.
#: actions/apitrends.php:85
@@ -1157,6 +1207,150 @@ msgstr "API метод наразі знаходиться у розробці."
msgid "User not found."
msgstr "Сторінку не знайдено."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Немає такого профілю."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Не вдалося додати нову підписку."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+#, fuzzy
+msgid "Can only handle Favorite activities."
+msgstr "Можливою є обробка лише для POST-запитів."
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Можливою є обробка лише для POST-запитів."
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Невідомо"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Додати до обраних"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Немає такого профілю."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "Учасники спільноти %s"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Спільноти, до яких залучений %s"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+#, fuzzy
+msgid "Can only handle Join activities."
+msgstr "Можливою є обробка лише для POST-запитів."
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Невідомо"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Всі учасники"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Такого файлу немає."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Не можна видалити зі списку обраних."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Такої спільноти не існує."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Всі учасники"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "HTTP спосіб не підтримується."
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Немає такого профілю."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Ви не підписані до цього профілю."
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Не можу видалити самопідписку."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Люди підписані до %s"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+#, fuzzy
+msgid "Can only handle Follow activities."
+msgstr "Можливою є обробка лише для POST-запитів."
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Тип файлу не підтримується"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1442,8 +1636,8 @@ msgstr "Цю адресу вже підтверджено."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1966,12 +2160,12 @@ msgstr "Зазначте, як саме ви бажаєте отримувати
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "Електронна адреса"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Поточна підтверджена поштова адреса."
@@ -1980,14 +2174,14 @@ msgstr "Поточна підтверджена поштова адреса."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Видалити"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2000,14 +2194,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "Електронна адреса, на зразок «UserName@example.org»"
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -2015,110 +2209,117 @@ msgstr "Додати"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "Вхідна пошта"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Я хочу надсилати дописи поштою."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Надсилайте дописи на цю адресу і їх буде опубліковано на сайті."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Створити нову адресу для надсилання повідомлень; видалити стару."
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "Нове"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Преференції ел. пошти"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Поівдомляти мене поштою про нові підписки."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "Надсилати мені листа, коли хтось додає мій допис до списку обраних."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Надсилати мені листа, коли хтось має приватне повідомлення для мене."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Надсилати мені листа, коли на мій допис з’являється «@-відповідь»."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "Дозволити друзям «розштовхати» мене, надіславши мені листа."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Я хочу надсилати дописи поштою."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Позначати міткою MicroID мою електронну адресу."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "Преференції пошти збережно."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Немає електронної адреси."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Не можна полагодити цю поштову адресу"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Це недійсна електронна адреса."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Це і є вашою адресою."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Ця електронна адреса належить іншому користувачу."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Не вдалося додати код підтвердження."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2130,56 +2331,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Не очікується підтвердження для скасування."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "Це помилкова адреса електронної пошти."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Не вдалося видалити підтвердження поштової адреси."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Підтвердження електронної пошти скасовано."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "Це не є вашою адресою."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "Адреса була видалена."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Немає адреси для вхідної пошти."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "Не вдалося оновити запис користувача."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Адресу вхідної пошти видалено."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Нову адресу для вхідних повідомлень додано."
@@ -5390,7 +5591,7 @@ msgstr "Ви не підписані до цього профілю."
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Не вдалося зберегти підписку."
@@ -5398,10 +5599,6 @@ msgstr "Не вдалося зберегти підписку."
msgid "This action only accepts POST requests."
msgstr "Ця дія приймає лише запити POST."
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Немає такого профілю."
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr "Цією дією ви не зможете підписатися до віддаленого профілю OMB 0.1."
@@ -5467,13 +5664,6 @@ msgstr ""
"%s ще не має пчитачів. Чому б не [зареєструватись](%%%%action.register%%%%) "
"і не стати першим?"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "Підписки %s"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5523,13 +5713,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s не відслідковує нічого"
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Стрічка дописів для %s (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "СМС"
@@ -5938,13 +6133,13 @@ msgid "Author(s)"
msgstr "Автор(и)"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "Обрати"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr "%1$s додав(ла) ваш допис %2$s до обраних."
@@ -6007,42 +6202,42 @@ msgid "Invalid filename."
msgstr "Невірне ім’я файлу."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Не вдалося приєднатися до спільноти."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "Не є частиною спільноти."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "Не вдалося залишити спільноту."
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr "Ід. номер профілю %s не є дійсним."
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
-#, fuzzy, php-format
+#: classes/Group_member.php:98
+#, php-format
msgid "Group ID %s is invalid."
-msgstr "Помилка при збереженні користувача; недійсний."
+msgstr "Ідентифікатор спільноти %s є недійсним."
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "Приєднатись"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr "%1$s долучився до спільноти %2$s."
@@ -6070,12 +6265,12 @@ msgid "You are banned from sending direct messages."
msgstr "Вам заборонено надсилати прямі повідомлення."
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "Не можна долучити повідомлення."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Не можна оновити повідомлення з новим URI."
@@ -6093,17 +6288,17 @@ msgid "Database error inserting hashtag: %s"
msgstr "Помилка бази даних при додаванні хеш-теґу: %s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "Проблема при збереженні допису. Надто довге."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "Проблема при збереженні допису. Невідомий користувач."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
@@ -6111,7 +6306,7 @@ msgstr ""
"повертайтесь за кілька хвилин."
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
@@ -6120,36 +6315,36 @@ msgstr ""
"повертайтесь за кілька хвилин."
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "Вам заборонено надсилати дописи до цього сайту."
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Проблема при збереженні допису."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr "Вказано невірний тип для saveKnownGroups."
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "Проблема при збереженні вхідних дописів спільноти."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "Не вдалося зберегти відповідь для %1$d, %2$d."
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6163,14 +6358,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr "Не вдалося скасувати роль «%s» для користувача #%2$s; не існує."
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6187,48 +6382,48 @@ msgid "Unable to save tag."
msgstr "Не вдається зберегти теґ."
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "Вас позбавлено можливості підписатись."
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "Вже підписаний!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "Користувач заблокував вас."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "Не підписано!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Не можу видалити самопідписку."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Не вдається видалити токен підписки OMB."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Не вдалося видалити підписку."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr "Слідкувати"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s тепер слідкує за %2$s."
@@ -6598,11 +6793,16 @@ msgid "Before"
msgstr "Назад"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
"В очікуванні кореневого елементу веб-стрічки, отримали цілий документ XML."
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "Фото"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -6779,12 +6979,12 @@ msgstr "Іконка для цього додатку"
#. TRANS: Form input field instructions.
#. TRANS: %d is the number of available characters for the description.
#: lib/applicationeditform.php:201
-#, fuzzy, php-format
+#, php-format
msgid "Describe your application in %d character"
msgid_plural "Describe your application in %d characters"
-msgstr[0] "Опишіть додаток, вкладаючись у %d знаків"
-msgstr[1] "Опишіть додаток, вкладаючись у %d знаків"
-msgstr[2] "Опишіть додаток, вкладаючись у %d знаків"
+msgstr[0] "Опишіть ваш додаток, вкладаючись у %d знак"
+msgstr[1] "Опишіть ваш додаток, вкладаючись у %d знаків"
+msgstr[2] "Опишіть ваш додаток, вкладаючись у %d знаків"
#. TRANS: Form input field instructions.
#: lib/applicationeditform.php:205
@@ -6911,15 +7111,13 @@ msgstr "Теґи для цього вкладення"
#. TRANS: Exception thrown when a password change fails.
#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
-#, fuzzy
msgid "Password changing failed."
-msgstr "Не вдалося змінити пароль"
+msgstr "Не вдалося змінити пароль."
#. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
#: lib/authenticationplugin.php:238
-#, fuzzy
msgid "Password changing is not allowed."
-msgstr "Змінювати пароль не дозволено"
+msgstr "Змінювати пароль не дозволено."
#. TRANS: Title for the form to block a user.
#: lib/blockform.php:68
@@ -6933,9 +7131,8 @@ msgstr "Результати команди"
#. TRANS: Title for command results.
#: lib/channel.php:194
-#, fuzzy
msgid "AJAX error"
-msgstr "Помилка в Ajax"
+msgstr "Помилка AJAX"
#. TRANS: E-mail subject when a command has completed.
#: lib/channel.php:233 lib/mailhandler.php:143
@@ -7353,7 +7550,6 @@ msgstr "Іти до файлу інсталяції."
#. TRANS: Menu item for Instant Messaging settings.
#: lib/connectsettingsaction.php:106
-#, fuzzy
msgctxt "MENU"
msgid "IM"
msgstr "ІМ"
@@ -7365,7 +7561,6 @@ msgstr "Оновлення за допомогою служби миттєвих
#. TRANS: Menu item for Short Message Service settings.
#: lib/connectsettingsaction.php:113
-#, fuzzy
msgctxt "MENU"
msgid "SMS"
msgstr "СМС"
@@ -7377,7 +7572,6 @@ msgstr "Оновлення через СМС"
#. TRANS: Menu item for OuAth connection settings.
#: lib/connectsettingsaction.php:120
-#, fuzzy
msgctxt "MENU"
msgid "Connections"
msgstr "З’єднання"
@@ -8198,25 +8392,25 @@ msgid "Send"
msgstr "Так"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr ""
"Ім’я користувача повинно складатись з літер нижнього регістру і цифр, ніяких "
"інтервалів."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
-msgstr ""
+msgstr "Псевдонім не може бути порожнім."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Псевдонім не може бути довшим за %d символ."
+msgstr[1] "Псевдонім не може бути довшим за %d символів."
+msgstr[2] "Псевдонім не може бути довшим за %d символів."
#: lib/noticeform.php:160
msgid "Send a notice"
@@ -8454,7 +8648,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Відкликати роль «%s» для цього користувача"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
msgid "Page not found."
msgstr "Сторінку не знайдено."
@@ -8711,17 +8905,17 @@ msgid "Moderator"
msgstr "Модератор"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "мить тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "хвилину тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
@@ -8730,12 +8924,12 @@ msgstr[1] "близько %d хвилин тому"
msgstr[2] "близько %d хвилин тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "годину тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
@@ -8744,12 +8938,12 @@ msgstr[1] "близько %d годин тому"
msgstr[2] "близько %d годин тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "день тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
@@ -8758,12 +8952,12 @@ msgstr[1] "близько %d днів тому"
msgstr[2] "близько %d днів тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "місяць тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
@@ -8772,7 +8966,7 @@ msgstr[1] "близько %d місяців тому"
msgstr[2] "близько %d місяців тому"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "близько року тому"
@@ -8819,7 +9013,7 @@ msgstr "Непрацездатний XML."
#. TRANS: Exception.
#: lib/xrd.php:69
msgid "Invalid XML, missing XRD root."
-msgstr ""
+msgstr "Неправильний XML, корінь XRD відсутній."
#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
#: scripts/restoreuser.php:61
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index 5b007d105..2a5059841 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:24+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:20+0000\n"
"Language-Team: Vietnamese <http://translatewiki.net/wiki/Portal:vi>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: vi\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -88,11 +88,11 @@ msgstr "Thay đổi hình đại diện"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -374,20 +374,38 @@ msgstr "Không thể lưu thông tin Twitter của bạn!"
msgid "Could not update your design."
msgstr "Không thể cập nhật thành viên."
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
msgstr ""
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "Dòng tin công cộng"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Tất cả đăng nhận"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "Ưa thích"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "Thành viên"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
#, fuzzy
@@ -742,7 +760,7 @@ msgstr ""
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -779,7 +797,7 @@ msgstr ""
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -847,7 +865,7 @@ msgstr "Mật khẩu"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
#, fuzzy
@@ -921,7 +939,8 @@ msgstr "Bạn đã không xóa trạng thái của những người khác."
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "Không có tin nhắn nào."
@@ -937,7 +956,10 @@ msgstr "Không thể xóa tin nhắn này."
msgid "Already repeated that notice."
msgstr "Không thể xóa tin nhắn này."
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
msgstr ""
@@ -957,16 +979,16 @@ msgstr "Hình đại diện đã được cập nhật."
msgid "No status with that ID found."
msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr ""
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "Không thể xóa tin nhắn này."
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, php-format
msgid "Deleted notice %d"
msgstr ""
@@ -1086,33 +1108,57 @@ msgstr "Thông báo được gắn thẻ %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "Dòng tin nhắn cho %s"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
msgid "Only the user can add to their own timeline."
msgstr ""
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
msgstr ""
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
+#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "Tìm theo nội dung của tin nhắn"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
#, php-format
msgid "Notice with URI \"%s\" already exists."
msgstr ""
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1127,6 +1173,148 @@ msgstr "Phương thức API dưới cấu trúc có sẵn."
msgid "User not found."
msgstr "Không tìm thấy user."
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "Không có tin nhắn nào."
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "Không thể chèn thêm vào đăng nhận."
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "Tìm theo nội dung của tin nhắn"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "Không tìm thấy action"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Ưa thích"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Không có tin nhắn nào."
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "Thành viên"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "Không tìm thấy action"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "Thành viên"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "Không có tin nhắn nào."
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "Không thể tạo favorite."
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "Không có user nào."
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "Thành viên"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "Kết nối"
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "Không có tin nhắn nào."
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "Bạn đã theo những người này:"
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "Không thể chèn thêm vào đăng nhận."
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "Đăng nhận từ xa"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "Không hỗ trợ kiểu file ảnh này."
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1418,8 +1606,8 @@ msgstr "Địa chỉ đó đã được xác nhận rồi."
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1971,13 +2159,13 @@ msgstr "Bạn nhận email từ %%site.name%% như thế nào."
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
#, fuzzy
msgid "Email address"
msgstr "Địa chỉ email"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "Đã xác nhận địa chỉ này."
@@ -1986,14 +2174,14 @@ msgstr "Đã xác nhận địa chỉ này."
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "Khôi phục"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -2006,7 +2194,7 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
#, fuzzy
msgid "Email address, like \"UserName@example.org\""
msgstr "Địa chỉ email GTalk, Ví dụ: \"UserName@example.org\""
@@ -2014,7 +2202,7 @@ msgstr "Địa chỉ email GTalk, Ví dụ: \"UserName@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
#, fuzzy
msgctxt "BUTTON"
@@ -2023,115 +2211,122 @@ msgstr "Thêm"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr ""
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Tôi muốn đưa tin nhắn lên bằng email."
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "Gửi email đến địa chỉ này để đưa tin nhắn mới lên."
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "Tạo một địa chỉ email mới để đưa tin nhắn lên; và xóa "
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
#, fuzzy
msgctxt "BUTTON"
msgid "New"
msgstr "Mới"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Địa chỉ email"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "Hãy gửi email cho tôi thông báo về các đăng nhận mới."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr ""
"Gửi email thông báo tôi khi có ai đó lưu tin nhắn của tôi vào danh sách ưa "
"thích của họ."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi."
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr ""
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "Tôi muốn đưa tin nhắn lên bằng email."
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "Xuất bản một MicroID đến địa chỉ email của tôi."
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
#, fuzzy
msgid "Email preferences saved."
msgstr "Các tính năng đã được lưu."
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "Không có địa chỉ email."
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "Không thể bình thường hóa Jabber ID"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "Địa chỉ email không hợp lệ."
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "Tài khoản đó đã là tên tài khoản Jabber của bạn rồi."
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "Jabber ID này đã thuộc về người khác rồi."
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "Không thể chèn mã xác nhận."
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2142,59 +2337,59 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "Sự xác nhận chưa được hủy bỏ."
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
#, fuzzy
msgid "That is the wrong email address."
msgstr "Sai IM."
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "Không thể xóa email xác nhận."
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Sự xác nhận chưa được hủy bỏ."
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
#, fuzzy
msgid "That is not your email address."
msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập vào."
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "Không có địa chỉ email."
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "Không có địa chỉ email."
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
#, fuzzy
msgid "Couldn't update user record."
msgstr "Không thể cập nhật thành viên."
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "Không có địa chỉ email."
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "Không có địa chỉ email."
@@ -5407,7 +5602,7 @@ msgstr "Bạn đã theo những người này:"
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "Không thể chèn thêm vào đăng nhận."
@@ -5415,11 +5610,6 @@ msgstr "Không thể chèn thêm vào đăng nhận."
msgid "This action only accepts POST requests."
msgstr ""
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "Không có tin nhắn nào."
-
#: actions/subscribe.php:117
#, fuzzy
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
@@ -5483,13 +5673,6 @@ msgid ""
"%) and be the first?"
msgstr ""
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Tất cả đăng nhận"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5533,14 +5716,19 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%1$s đang theo dõi lưu ý của bạn trên %2$s."
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "Chọn những người bạn của %s"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
#, fuzzy
msgid "Jabber"
msgstr "Không có Jabber ID."
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5945,14 +6133,14 @@ msgid "Author(s)"
msgstr ""
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
#, fuzzy
msgid "Favor"
msgstr "Ưa thích"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, php-format
msgid "%1$s marked notice %2$s as a favorite."
msgstr ""
@@ -6004,45 +6192,45 @@ msgid "Invalid filename."
msgstr "Kích thước không hợp lệ."
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "Không tìm thấy nhóm."
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
#, fuzzy
msgid "Not part of group."
msgstr "Không thể cập nhật thành viên."
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
#, fuzzy
msgid "Group leave failed."
msgstr "Thông tin nhóm"
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr ""
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, php-format
msgid "Group ID %s is invalid."
msgstr ""
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
#, fuzzy
msgid "Join"
msgstr "Đăng nhập"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr ""
@@ -6071,13 +6259,13 @@ msgid "You are banned from sending direct messages."
msgstr "Thư đến của bạn"
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
#, fuzzy
msgid "Could not insert message."
msgstr "Không thể chèn thêm vào đăng nhận."
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "Không thể cập nhật thành viên."
@@ -6095,62 +6283,62 @@ msgid "Database error inserting hashtag: %s"
msgstr "Lỗi xảy ra khi thêm mới hình đại diện"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr ""
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr ""
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr ""
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
#, fuzzy
msgid "Problem saving group inbox."
msgstr "Có lỗi xảy ra khi lưu tin nhắn."
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr ""
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -6164,14 +6352,14 @@ msgstr ""
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr ""
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr ""
@@ -6189,51 +6377,51 @@ msgid "Unable to save tag."
msgstr "Không thể lưu thông tin Twitter của bạn!"
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr ""
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
#, fuzzy
msgid "Already subscribed!"
msgstr "Chưa đăng nhận!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
#, fuzzy
msgid "User has blocked you."
msgstr "Người dùng không có thông tin."
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
#, fuzzy
msgid "Not subscribed!"
msgstr "Chưa đăng nhận!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "Không thể chèn thêm vào đăng nhận."
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "Không thể chèn thêm vào đăng nhận."
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "Không thể chèn thêm vào đăng nhận."
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr ""
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, php-format
msgid "%1$s is now following %2$s."
msgstr ""
@@ -6624,10 +6812,14 @@ msgid "Before"
msgstr "Trước"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr ""
+#: lib/activity.php:360
+msgid "Post"
+msgstr ""
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -8096,17 +8288,17 @@ msgid "Send"
msgstr "Gửi"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "Biệt hiệu phải là chữ viết thường hoặc số và không có khoảng trắng."
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
msgstr ""
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
@@ -8361,7 +8553,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "Ban user"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
msgid "Page not found."
msgstr ""
@@ -8625,60 +8817,60 @@ msgid "Moderator"
msgstr ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "vài giây trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "1 phút trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "1 giờ trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "1 ngày trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "1 tháng trước"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] ""
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
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 69bcc306b..30b5f63bd 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -14,18 +14,18 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:25+0000\n"
+"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"PO-Revision-Date: 2010-12-16 15:11:21+0000\n"
"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
"hans>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
@@ -67,7 +67,7 @@ msgstr "邀请制"
#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
#: actions/accessadminpanel.php:173
msgid "Disable new registrations."
-msgstr "禁止新用户注册"
+msgstr "禁止新用户注册。"
#. TRANS: Checkbox label for disabling new user registrations.
#: actions/accessadminpanel.php:175
@@ -91,11 +91,11 @@ msgstr "保存访问设置"
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
#: actions/imsettings.php:187 actions/othersettings.php:134
#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
#: lib/applicationeditform.php:355 lib/designsettings.php:270
#: lib/groupeditform.php:207
msgctxt "BUTTON"
@@ -376,20 +376,38 @@ msgstr "无法保存你的外观设置。"
msgid "Could not update your design."
msgstr "无法更新你的外观。"
-#: actions/apiatomservice.php:85
+#: actions/apiatomservice.php:86
msgid "Main"
-msgstr ""
+msgstr "首页"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:139
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
#: lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s的时间线"
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s 关注的用户"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, fuzzy, php-format
+msgid "%s favorites"
+msgstr "收藏夹"
+
+#: actions/apiatomservice.php:123
+#, fuzzy, php-format
+msgid "%s memberships"
+msgstr "%s 的小组成员"
+
#. TRANS: Client error displayed when users try to block themselves.
#: actions/apiblockcreate.php:104
msgid "You cannot block yourself!"
@@ -471,7 +489,7 @@ msgstr "没有找到此 ID 的消息。"
#. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
-msgstr "已收藏此状态。"
+msgstr "已收藏过此消息。"
#. TRANS: Client error displayed when marking a notice as favourite fails.
#. TRANS: Error message text shown when a favorite could not be set.
@@ -482,7 +500,7 @@ msgstr "无法创建收藏。"
#. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
#: actions/apifavoritedestroy.php:122
msgid "That status is not a favorite."
-msgstr "此状态未被收藏。"
+msgstr "此消息未被收藏。"
#. TRANS: Client error displayed when removing a favourite has failed.
#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
@@ -733,7 +751,7 @@ msgstr "请求 token 已被授权了。"
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
#: actions/groupunblock.php:65 actions/imsettings.php:230
#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -769,7 +787,7 @@ msgstr "插入 oauth_token_association 时数据库出错。"
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
#: actions/imsettings.php:245 actions/newapplication.php:125
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:321
@@ -841,7 +859,7 @@ msgstr "密码"
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
#: actions/imsettings.php:131 actions/smssettings.php:137
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
@@ -914,7 +932,8 @@ msgstr "你不能删除其他用户的消息。"
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "没有这条消息。"
@@ -930,7 +949,10 @@ msgstr "不能转发你自己的消息。"
msgid "Already repeated that notice."
msgstr "已转发了该消息。"
-#: actions/apistatusesshow.php:117
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
msgstr "HTTP 方法不支持。"
@@ -949,16 +971,16 @@ msgstr "消息已删除。"
msgid "No status with that ID found."
msgstr "没有找到此 ID 的消息。"
-#: actions/apistatusesshow.php:227
+#: actions/apistatusesshow.php:223
msgid "Can only delete using the Atom format."
msgstr "只能使用 Atom 格式删除。"
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
msgid "Can't delete this notice."
msgstr "无法删除这条消息。"
-#: actions/apistatusesshow.php:247
+#: actions/apistatusesshow.php:243
#, php-format
msgid "Deleted notice %d"
msgstr "删除消息 %d"
@@ -1077,33 +1099,58 @@ msgstr "带 %s 标签的消息"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$s 上有 %1$s 标签的消息!"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
msgid "Only the user can add to their own timeline."
msgstr "只有该用户才能添加到他们的时间线。"
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+#, fuzzy
+msgid "Only accept AtomPub for Atom feeds."
msgstr "Atom feeds 只接受 AtomPub。"
-#: actions/apitimelineuser.php:316
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
+msgstr ""
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
msgid "Atom post must be an Atom entry."
msgstr ""
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:332
+msgid "Can only handle POST activities."
msgstr ""
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:343
#, php-format
-msgid "Cannot handle activity object type \"%s\""
+msgid "Cannot handle activity object type \"%s\"."
msgstr ""
-#: actions/apitimelineuser.php:392
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:376
#, fuzzy, php-format
+msgid "No content for notice %d."
+msgstr "搜索消息内容"
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:404
+#, php-format
msgid "Notice with URI \"%s\" already exists."
-msgstr "没有此 id 的消息。"
+msgstr "已存在使用 URI \"%s\" 的消息了。"
-#: actions/apitimelineuser.php:423
+#: actions/apitimelineuser.php:435
#, php-format
msgid "AtomPub post with unknown attention URI %s"
msgstr ""
@@ -1118,6 +1165,147 @@ msgstr "API 方法尚未实现。"
msgid "User not found."
msgstr "API方法没有找到。"
+#: actions/atompubfavoritefeed.php:70
+#, fuzzy
+msgid "No such profile"
+msgstr "没有这个文件。"
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#, fuzzy
+msgid "Can't add someone else's subscription"
+msgstr "无法添加新的关注。"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#, fuzzy
+msgid "Can only fave notices."
+msgstr "搜索消息内容"
+
+#: actions/atompubfavoritefeed.php:256
+#, fuzzy
+msgid "Unknown note."
+msgstr "未知的"
+
+#: actions/atompubfavoritefeed.php:263
+#, fuzzy
+msgid "Already a favorite."
+msgstr "加入收藏"
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "没有这个文件。"
+
+#: actions/atompubmembershipfeed.php:144
+#, fuzzy, php-format
+msgid "%s group memberships"
+msgstr "%s 的小组成员"
+
+#: actions/atompubmembershipfeed.php:147
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s"
+msgstr "%s 组是成员组成了"
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+#, fuzzy
+msgid "Unknown group."
+msgstr "未知的"
+
+#: actions/atompubmembershipfeed.php:263
+#, fuzzy
+msgid "Already a member."
+msgstr "所有成员"
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+#, fuzzy
+msgid "No such favorite."
+msgstr "没有这个文件。"
+
+#: actions/atompubshowfavorite.php:151
+#, fuzzy
+msgid "Can't delete someone else's favorite"
+msgstr "无法删除收藏。"
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "没有这个组。"
+
+#: actions/atompubshowmembership.php:90
+#, fuzzy
+msgid "Not a member"
+msgstr "所有成员"
+
+#: actions/atompubshowmembership.php:115
+#, fuzzy
+msgid "Method not supported"
+msgstr "HTTP 方法不支持。"
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, fuzzy, php-format
+msgid "No such profile id: %d"
+msgstr "没有这个文件。"
+
+#: actions/atompubshowsubscription.php:90
+#, fuzzy, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr "你没有关注这个用户"
+
+#: actions/atompubshowsubscription.php:154
+#, fuzzy
+msgid "Can't delete someone else's subscription"
+msgstr "无法删除自我关注。"
+
+#: actions/atompubsubscriptionfeed.php:150
+#, fuzzy, php-format
+msgid "People %s has subscribed to on %s"
+msgstr "关注了%s的用户"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, fuzzy, php-format
+msgid "Unknown profile %s"
+msgstr "未知文件类型"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
@@ -1402,8 +1590,8 @@ msgstr "此地址已被确认过了。"
#. TRANS: Server error thrown when user profile settings could not be updated.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
#: actions/imsettings.php:442 actions/othersettings.php:184
#: actions/profilesettings.php:326 actions/smssettings.php:308
#: actions/smssettings.php:464
@@ -1919,12 +2107,12 @@ msgstr "设置你如何接受来自 %%site.name%% 的邮件。"
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:107 actions/emailsettings.php:133
msgid "Email address"
msgstr "电邮地址"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
msgid "Current confirmed email address."
msgstr "当前确认的电子邮件。"
@@ -1933,14 +2121,14 @@ msgstr "当前确认的电子邮件。"
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
msgid "Remove"
msgstr "移除"
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1953,14 +2141,14 @@ msgstr ""
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:140
msgid "Email address, like \"UserName@example.org\""
msgstr "电子邮件,类似 \"UserName@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
+#: actions/emailsettings.php:144 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -1968,110 +2156,117 @@ msgstr "添加"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
msgid "Incoming email"
msgstr "接收用 email"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "我希望通过邮件发布信息。"
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "通过发送电子邮件到这个地址来发布新的消息。"
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "生成新的电子邮件地址用于发布消息;取消旧的。"
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:193
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "新增"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
msgid "Email preferences"
msgstr "Email 偏好"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:216
msgid "Send me notices of new subscriptions through email."
msgstr "将新的关注通过电子邮件发送给我。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:222
msgid "Send me email when someone adds my notice as a favorite."
msgstr "有人收藏我的消息时,发邮件通知我。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:229
msgid "Send me email when someone sends me a private message."
msgstr "有人给我发送私信时,发邮件通知我。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:235
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "有人给我发送 @ 消息时,发邮件通知我。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:241
msgid "Allow friends to nudge me and send me an email."
msgstr "允许朋友们呼叫我并给我发送邮件。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "我希望通过邮件发布信息。"
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:247
msgid "Publish a MicroID for my email address."
msgstr "公开电子邮件的 MicroID。"
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:368
msgid "Email preferences saved."
msgstr "Email 偏好已保存。"
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:388
msgid "No email address."
msgstr "没有电子邮件地址。"
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:396
msgid "Cannot normalize that email address"
msgstr "无法识别此电子邮件"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:401 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "不是有效的电子邮件。"
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:405
msgid "That is already your email address."
msgstr "你已登记此电子邮件。"
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:409
msgid "That email address already belongs to another user."
msgstr "此电子邮件属于其他用户。"
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "无法插入确认码。"
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:433
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
@@ -2082,56 +2277,56 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "没有可以取消的确认。"
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:459
msgid "That is the wrong email address."
msgstr "这是错误的电子邮件地址。"
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
+#: actions/emailsettings.php:468 actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "无法删除电子邮件确认。"
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:473
msgid "Email confirmation cancelled."
msgstr "Email 确认已取消。"
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:493
msgid "That is not your email address."
msgstr "这个不是你的电子邮件地址。"
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:514
msgid "The email address was removed."
msgstr "电子邮件地址已被删除。"
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "没有发布用的电子邮件地址。"
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "无法更新用户记录。"
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "发布用的电子邮件被删除。"
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "已添加新的发布用的电子邮件地址。"
@@ -5229,7 +5424,7 @@ msgstr "你没有关注这个用户"
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "无法保存关注。"
@@ -5237,10 +5432,6 @@ msgstr "无法保存关注。"
msgid "This action only accepts POST requests."
msgstr "这个动作只接受 POST 请求"
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "没有这个文件。"
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr "你不能用这个操作关注一个 OMB 0.1 远程用户。"
@@ -5304,13 +5495,6 @@ msgstr ""
"还没有人关注%s。现在就[注册一个帐号](%%%%action.register%%%%)并成为第一个关注"
"者!"
-#. TRANS: Header for subscriptions overview for a user (first page).
-#. TRANS: %s is a user nickname.
-#: actions/subscriptions.php:51
-#, php-format
-msgid "%s subscriptions"
-msgstr "%s 关注的用户"
-
#. TRANS: Header for subscriptions overview for a user (not first page).
#. TRANS: %1$s is a user nickname, %2$d is the page number.
#: actions/subscriptions.php:55
@@ -5358,13 +5542,18 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%s没有关注任何人。"
+#: actions/subscriptions.php:178
+#, fuzzy, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "%s的消息聚合 (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:242
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:257
msgid "SMS"
msgstr "SMS"
@@ -5753,16 +5942,16 @@ msgid "Author(s)"
msgstr "作者"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:151 lib/favorform.php:143
msgid "Favor"
msgstr "收藏"
#. TRANS: Ntofication given when a user marks a notice as favorite.
#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
-#: classes/Fave.php:151
+#: classes/Fave.php:154
#, php-format
msgid "%1$s marked notice %2$s as a favorite."
-msgstr "%1$s 将消息 %2$s 标记了收藏。"
+msgstr "%1$s 收藏了消息 %2$s 。"
#. TRANS: Server exception thrown when a URL cannot be processed.
#: classes/File.php:156
@@ -5810,42 +5999,42 @@ msgid "Invalid filename."
msgstr "无效的文件名。"
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "加入小组失败。"
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "不是小组成员。"
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
msgid "Group leave failed."
msgstr "离开小组失败。"
#. TRANS: Exception thrown providing an invalid profile ID.
#. TRANS: %s is the invalid profile ID.
-#: classes/Group_member.php:76
+#: classes/Group_member.php:85
#, php-format
msgid "Profile ID %s is invalid."
msgstr "无效的用户 ID %s。"
#. TRANS: Exception thrown providing an invalid group ID.
#. TRANS: %s is the invalid group ID.
-#: classes/Group_member.php:89
+#: classes/Group_member.php:98
#, php-format
msgid "Group ID %s is invalid."
msgstr "小组 ID %s 无效。"
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 lib/joinform.php:114
msgid "Join"
msgstr "加入"
#. TRANS: Success message for subscribe to group attempt through OStatus.
#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
-#: classes/Group_member.php:117
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr "%1$s加入了%2$s小组。"
@@ -5873,12 +6062,12 @@ msgid "You are banned from sending direct messages."
msgstr "你被禁止发送私信。"
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "无法添加信息。"
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "无法通过新的 URI 更新消息。"
@@ -5896,59 +6085,59 @@ msgid "Database error inserting hashtag: %s"
msgstr "插入标签时数据库出错:%s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
msgid "Problem saving notice. Too long."
msgstr "保存消息时出错。太长。"
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:275
msgid "Problem saving notice. Unknown user."
msgstr "保存消息时出错。未知用户。"
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:281
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr "你在短时间里发布了过多的消息,请深呼吸,过几分钟再发消息。"
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:288
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr "你在短时间里发布了过多的重复消息,请深呼吸,过几分钟再发消息。"
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:296
msgid "You are banned from posting notices on this site."
msgstr "在这个网站你被禁止发布消息。"
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:363 classes/Notice.php:390
msgid "Problem saving notice."
msgstr "保存消息时出错。"
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:913
msgid "Bad type provided to saveKnownGroups."
msgstr "对 saveKnownGroups 提供的类型无效。"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1012
msgid "Problem saving group inbox."
msgstr "保存小组收件箱时出错。"
#. TRANS: Server exception thrown when a reply cannot be saved.
#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1122
+#: classes/Notice.php:1126
#, php-format
msgid "Could not save reply for %1$d, %2$d."
msgstr "无法保存回复,%1$d 对 %2$d。"
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1645
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
@@ -5962,14 +6151,14 @@ msgstr "%1$s (%2$s)"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:845
+#: classes/Profile.php:798
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限,不存在。"
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:854
+#: classes/Profile.php:807
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限,数据库错误。"
@@ -5985,48 +6174,48 @@ msgid "Unable to save tag."
msgstr "无法保存标签。"
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "你被禁止添加关注。"
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "已经关注了!"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "用户将你屏蔽了。"
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "未关注!"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "无法删除自我关注。"
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "无法删除关注 OMB token。"
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "无法取消关注。"
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
msgid "Follow"
msgstr "关注"
#. TRANS: Notification given when one person starts following another.
#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
-#: classes/Subscription.php:258
+#: classes/Subscription.php:268
#, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s 现在开始关注了 %2$s。"
@@ -6394,10 +6583,15 @@ msgid "Before"
msgstr "之前"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr "只期待一个 root feed 元素但收到了整个的 XML 文档。"
+#: lib/activity.php:360
+#, fuzzy
+msgid "Post"
+msgstr "相片"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
@@ -6794,7 +6988,7 @@ msgstr ""
#. TRANS: Text shown when a notice has been marked as favourite successfully.
#: lib/command.php:312
msgid "Notice marked as fave."
-msgstr "消息被标记为收藏。"
+msgstr "收藏了消息。"
#. TRANS: Message given having added a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
@@ -7911,15 +8105,13 @@ msgstr "发送一条私信"
#. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
#: lib/messageform.php:137
-#, fuzzy
msgid "Select recipient:"
-msgstr "选择许可协议"
+msgstr "选择收件人:"
#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
#: lib/messageform.php:150
-#, fuzzy
msgid "No mutual subscribers."
-msgstr "未关注!"
+msgstr "没有共同的关注者。"
#: lib/messageform.php:153
msgid "To"
@@ -7935,21 +8127,21 @@ msgid "Send"
msgstr "发布"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:163
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "昵称只能使用小写字母和数字且不能使用空格。"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:176
msgid "Nickname cannot be empty."
-msgstr ""
+msgstr "昵称不能为空。"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:189
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
-msgstr[0] ""
+msgstr[0] "昵称长度不能超过%d字符。"
#: lib/noticeform.php:160
msgid "Send a notice"
@@ -8185,7 +8377,7 @@ msgid "Revoke the \"%s\" role from this user"
msgstr "取消这个用户的\"%s\"权限"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:957
msgid "Page not found."
msgstr "没有找到页面。"
@@ -8431,60 +8623,60 @@ msgid "Moderator"
msgstr "审核员"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "几秒前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "约1分钟前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] "约%d分钟前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "约1小时前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] "约%d小时前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "约1天前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] "约%d天前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "约1个月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] "约%d个月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "约1年前"
@@ -8516,9 +8708,8 @@ msgstr[0] "消息太长了,不能超过%1$d个字符,你发送的是%2$d。"
#. TRANS: Exception.
#: lib/xrd.php:64
-#, fuzzy
msgid "Invalid XML."
-msgstr "大小不正确。"
+msgstr "无效的 XML。"
#. TRANS: Exception.
#: lib/xrd.php:69