X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=locale%2Fstatusnet.pot;h=0ae9fed90b08dbcfb06a5b6a960179e5f587d781;hb=31d056029461c5f61e0667ab6f80c21a505e36cc;hp=10e2cd72fbddedcd04577d358e906f6e8c92d966;hpb=01996b1a460693227ef263d44477bc12d297a70a;p=quix0rs-gnu-social.git diff --git a/locale/statusnet.pot b/locale/statusnet.pot index 10e2cd72fb..0ae9fed90b 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: 2011-06-19 11:06+0000\n" +"POT-Creation-Date: 2011-09-11 13:47+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,32 +28,25 @@ msgid "" msgstr "" #. TRANS: Error message. -#: index.php:121 -msgid "" -"An important error occured, probably related to email setup. Check logfiles " -"for more info." -msgstr "" - -#. TRANS: Error message. -#: index.php:131 +#: index.php:129 msgid "An error occurred." msgstr "" #. TRANS: Error message displayed when there is no StatusNet configuration file. -#: index.php:264 +#: index.php:262 #, php-format msgid "" "No configuration file found. Try running the installation program first." msgstr "" #. TRANS: Error message displayed when trying to access a non-existing page. -#: index.php:295 +#: index.php:293 msgid "Unknown page" msgstr "" #. TRANS: Error message displayed when trying to perform an undefined action. #. TRANS: Title for password recovery page when an unknown action has been specified. -#: index.php:350 actions/recoverpassword.php:232 +#: index.php:348 actions/recoverpassword.php:232 msgid "Unknown action" msgstr "" @@ -106,12 +99,12 @@ msgstr "" msgid "Closed" msgstr "" -#. TRANS: Title for button to save access settings in site admin panel. +#. TRANS: Button title to save access settings in site admin panel. #: actions/accessadminpanel.php:191 -msgid "Save access settings" +msgid "Save access settings." msgstr "" -#. TRANS: Tooltip for button to save access settings in site admin panel. +#. TRANS: Button text to save access settings in site admin panel. #. TRANS: Button label to save e-mail preferences. #. TRANS: Button label to save IM preferences. #. TRANS: Button text in the license admin panel. @@ -131,7 +124,7 @@ msgstr "" #. TRANS: Button text to save tags for a profile. #: actions/accessadminpanel.php:193 actions/emailsettings.php:251 #: actions/imsettings.php:201 actions/licenseadminpanel.php:335 -#: actions/pathsadminpanel.php:463 actions/profilesettings.php:215 +#: actions/pathsadminpanel.php:454 actions/profilesettings.php:215 #: actions/sessionsadminpanel.php:202 actions/siteadminpanel.php:373 #: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:204 #: actions/snapshotadminpanel.php:252 actions/subscriptions.php:251 @@ -164,12 +157,11 @@ msgstr "" #: actions/passwordsettings.php:147 actions/peopletagautocomplete.php:67 #: actions/pluginenable.php:88 actions/profilecompletion.php:81 #: actions/profilesettings.php:235 actions/recoverpassword.php:303 -#: actions/register.php:164 actions/remotesubscribe.php:78 -#: actions/removepeopletag.php:79 actions/repeat.php:80 -#: actions/smssettings.php:250 actions/subedit.php:41 actions/subscribe.php:87 -#: actions/subscribepeopletag.php:76 actions/tagprofile.php:186 -#: actions/unsubscribe.php:70 actions/unsubscribepeopletag.php:77 -#: actions/urlsettings.php:171 actions/userauthorization.php:54 +#: actions/register.php:164 actions/removepeopletag.php:79 +#: actions/repeat.php:80 actions/smssettings.php:250 actions/subedit.php:41 +#: actions/subscribe.php:87 actions/subscribepeopletag.php:76 +#: actions/tagprofile.php:186 actions/unsubscribe.php:70 +#: actions/unsubscribepeopletag.php:77 actions/urlsettings.php:171 msgid "There was a problem with your session token. Try again, please." msgstr "" @@ -212,21 +204,16 @@ msgstr "" msgid "No such list." msgstr "" -#. TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list. -#: actions/addpeopletag.php:121 -msgid "You cannot list an OMB 0.1 remote profile with this action." -msgstr "" - #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list. #. TRANS: %s is a username. -#: actions/addpeopletag.php:150 +#: actions/addpeopletag.php:138 #, php-format msgid "There was an unexpected error while listing %s." msgstr "" #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list. #. TRANS: %s is a profile URL. -#: actions/addpeopletag.php:155 +#: actions/addpeopletag.php:143 #, php-format msgid "" "There was a problem listing %s. The remote server is probably not responding " @@ -234,7 +221,7 @@ msgid "" msgstr "" #. TRANS: Title after adding a user to a list. -#: actions/addpeopletag.php:165 +#: actions/addpeopletag.php:153 msgctxt "TITLE" msgid "Listed" msgstr "" @@ -283,8 +270,6 @@ msgstr "" #. TRANS: Client error displayed trying to use "one time password login" without using an existing user. #. TRANS: Client error displayed when referring to non-existing user. #. TRANS: Client error displayed trying to perform an action related to a non-existing user. -#. TRANS: Form validation error on page for remote subscribe when no user was provided. -#. TRANS: Form validation error on page for remote subscribe when no user profile was found. #. TRANS: Client error displayed when trying to reply to a non-exsting user. #. TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action. #. TRANS: Client error. @@ -293,7 +278,6 @@ msgstr "" #. TRANS: Client error displayed trying to find a user by ID for a non-existing ID. #. TRANS: Client error displayed requesting groups for a non-existing user. #. TRANS: Client error displayed when user not found for an action. -#. TRANS: Client error displayed providing a non-existing nickname. #. TRANS: Error text shown when trying to send a direct message to a user that does not exist. #. TRANS: Client error displayed when trying to perform a gallery action with an unknown user. #. TRANS: Client error displayed when trying to access a mailbox without providing a user. @@ -318,13 +302,12 @@ msgstr "" #: actions/microsummary.php:63 actions/newmessage.php:119 actions/otp.php:78 #: actions/peopletagged.php:87 actions/peopletagsbyuser.php:97 #: actions/peopletagsforuser.php:79 actions/peopletagsubscribers.php:87 -#: actions/peopletagsubscriptions.php:81 actions/remotesubscribe.php:156 -#: actions/remotesubscribe.php:166 actions/replies.php:72 +#: actions/peopletagsubscriptions.php:81 actions/replies.php:72 #: actions/repliesrss.php:38 actions/rsd.php:114 actions/showfavorites.php:106 #: actions/showprofiletag.php:73 actions/showprofiletag.php:112 #: actions/userbyid.php:75 actions/usergroups.php:95 actions/userrss.php:41 -#: actions/userxrd.php:60 actions/xrds.php:71 lib/command.php:624 -#: lib/galleryaction.php:61 lib/mailbox.php:79 lib/profileaction.php:77 +#: actions/userxrd.php:61 lib/command.php:624 lib/galleryaction.php:61 +#: lib/mailbox.php:79 lib/profileaction.php:77 msgid "No such user." msgstr "" @@ -341,7 +324,15 @@ msgid "%s's home timeline" msgstr "" #. TRANS: %s is user nickname. -#: actions/all.php:109 +#. TRANS: Feed title. +#. TRANS: %s is tagger's nickname. +#: actions/all.php:110 actions/showprofiletag.php:182 +#, php-format +msgid "Feed for friends of %s (Activity Streams JSON)" +msgstr "" + +#. TRANS: %s is user nickname. +#: actions/all.php:118 #, php-format msgid "Feed for friends of %s (RSS 1.0)" msgstr "" @@ -349,19 +340,19 @@ msgstr "" #. TRANS: %s is user nickname. #. TRANS: Feed title. #. TRANS: %s is tagger's nickname. -#: actions/all.php:118 actions/showprofiletag.php:182 +#: actions/all.php:127 actions/showprofiletag.php:193 #, php-format msgid "Feed for friends of %s (RSS 2.0)" msgstr "" #. TRANS: %s is user nickname. -#: actions/all.php:127 +#: actions/all.php:136 #, php-format msgid "Feed for friends of %s (Atom)" msgstr "" #. TRANS: Empty list message. %s is a user nickname. -#: actions/all.php:134 +#: actions/all.php:143 #, php-format msgid "" "This is the timeline for %s and friends but no one has posted anything yet." @@ -369,7 +360,7 @@ msgstr "" #. TRANS: Encouragement displayed on logged in user's empty timeline. #. TRANS: This message contains Markdown links. Keep "](" together. -#: actions/all.php:141 +#: actions/all.php:150 #, php-format msgid "" "Try subscribing to more people, [join a group](%%action.groups%%) or post " @@ -378,7 +369,7 @@ msgstr "" #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@". #. TRANS: This message contains Markdown links. Keep "](" together. -#: actions/all.php:145 +#: actions/all.php:154 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) from their profile or [post something " @@ -391,13 +382,20 @@ msgstr "" #. TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link). #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname. #. TRANS: This message contains a Markdown link. Keep "](" together. -#: actions/all.php:150 actions/replies.php:217 actions/showstream.php:216 +#: actions/all.php:159 actions/replies.php:226 actions/showstream.php:225 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " "post a notice to them." msgstr "" +#. TRANS: Button text for inviting more users to the StatusNet instance. +#. TRANS: Less business/enterprise-oriented language for public sites. +#: actions/all.php:206 actions/public.php:238 +msgctxt "BUTTON" +msgid "Send invite" +msgstr "" + #. TRANS: Message is used as link title. %s is a user nickname. #. TRANS: Title of API timeline for a user and friends. #. TRANS: %s is a username. @@ -429,28 +427,29 @@ msgstr "" #: actions/apiaccountratelimitstatus.php:70 #: actions/apiaccountupdatedeliverydevice.php:92 #: actions/apiaccountupdateprofile.php:94 -#: actions/apiaccountverifycredentials.php:68 actions/apidirectmessage.php:157 -#: actions/apifavoritecreate.php:98 actions/apifavoritedestroy.php:98 -#: actions/apifriendshipscreate.php:99 actions/apifriendshipsdestroy.php:99 -#: actions/apifriendshipsshow.php:124 actions/apigroupcreate.php:138 -#: actions/apigroupismember.php:115 actions/apigroupjoin.php:148 -#: actions/apigroupleave.php:138 actions/apigrouplist.php:135 -#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105 -#: actions/apigroupprofileupdate.php:98 actions/apigroupprofileupdate.php:216 -#: actions/apigroupshow.php:114 actions/apihelptest.php:84 -#: actions/apilist.php:117 actions/apilist.php:177 actions/apilist.php:214 -#: actions/apilistmember.php:117 actions/apilistmembers.php:87 -#: actions/apilistmembers.php:160 actions/apilistmemberships.php:103 -#: actions/apilists.php:120 actions/apilists.php:172 -#: actions/apilistsubscriber.php:88 actions/apilistsubscribers.php:66 -#: actions/apilistsubscribers.php:113 actions/apilistsubscriptions.php:91 -#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110 -#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139 -#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109 -#: actions/apitimelinefavorites.php:182 actions/apitimelinefriends.php:278 -#: actions/apitimelinegroup.php:148 actions/apitimelinehome.php:181 -#: actions/apitimelinelist.php:182 actions/apitimelinementions.php:182 -#: actions/apitimelinepublic.php:247 actions/apitimelineretweetedtome.php:150 +#: actions/apiaccountverifycredentials.php:68 actions/apiconversation.php:156 +#: actions/apidirectmessage.php:157 actions/apifavoritecreate.php:98 +#: actions/apifavoritedestroy.php:98 actions/apifriendshipscreate.php:99 +#: actions/apifriendshipsdestroy.php:99 actions/apifriendshipsshow.php:124 +#: actions/apigroupcreate.php:138 actions/apigroupismember.php:115 +#: actions/apigroupjoin.php:148 actions/apigroupleave.php:138 +#: actions/apigrouplist.php:135 actions/apigrouplistall.php:120 +#: actions/apigroupmembership.php:105 actions/apigroupprofileupdate.php:98 +#: actions/apigroupprofileupdate.php:216 actions/apigroupshow.php:114 +#: actions/apihelptest.php:84 actions/apilist.php:117 actions/apilist.php:177 +#: actions/apilist.php:214 actions/apilistmember.php:117 +#: actions/apilistmembers.php:87 actions/apilistmembers.php:160 +#: actions/apilistmemberships.php:103 actions/apilists.php:120 +#: actions/apilists.php:172 actions/apilistsubscriber.php:88 +#: actions/apilistsubscribers.php:66 actions/apilistsubscribers.php:113 +#: actions/apilistsubscriptions.php:91 actions/apistatusesdestroy.php:101 +#: actions/apistatusesretweets.php:110 actions/apistatusesshow.php:105 +#: actions/apistatusnetconfig.php:139 actions/apistatusnetversion.php:91 +#: actions/apisubscriptions.php:109 actions/apitimelinefavorites.php:182 +#: actions/apitimelinefriends.php:277 actions/apitimelinegroup.php:148 +#: actions/apitimelinehome.php:181 actions/apitimelinelist.php:182 +#: actions/apitimelinementions.php:182 actions/apitimelinepublic.php:247 +#: actions/apitimelineretweetedtome.php:150 #: actions/apitimelineretweetsofme.php:149 actions/apitimelinetag.php:165 #: actions/apitimelineuser.php:217 actions/apiusershow.php:100 #: lib/apilistusers.php:149 @@ -505,8 +504,7 @@ msgstr "" #: actions/avatarsettings.php:194 actions/foaf.php:69 #: actions/grouplogo.php:184 actions/hcard.php:75 #: actions/peopletagsbyuser.php:105 actions/peopletagsforuser.php:87 -#: actions/peopletagsubscriptions.php:89 actions/remotesubscribe.php:209 -#: actions/replies.php:80 actions/userauthorization.php:75 +#: actions/peopletagsubscriptions.php:89 actions/replies.php:80 #: actions/usergroups.php:103 actions/userrss.php:110 lib/galleryaction.php:69 #: lib/profileaction.php:85 msgid "User has no profile." @@ -591,6 +589,23 @@ msgstr "" msgid "Unblock user failed." msgstr "" +#. TRANS: Client exception thrown when no conversation ID is given. +#: actions/apiconversation.php:69 +msgid "No conversation ID." +msgstr "" + +#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d). +#: actions/apiconversation.php:76 +#, php-format +msgid "No conversation with ID %d." +msgstr "" + +#. TRANS: Title for conversion timeline. +#: actions/apiconversation.php:105 +msgctxt "TITLE" +msgid "Conversation" +msgstr "" + #. TRANS: Title. %s is a user nickname. #: actions/apidirectmessage.php:88 #, php-format @@ -725,7 +740,7 @@ msgstr "" #. TRANS: Validation error in form for profile settings. #. TRANS: Form validation error displayed when trying to register with an existing nickname. #: actions/apigroupcreate.php:156 actions/apigroupprofileupdate.php:257 -#: actions/editgroup.php:200 actions/newgroup.php:138 +#: actions/editgroup.php:194 actions/newgroup.php:138 #: actions/profilesettings.php:293 actions/register.php:210 msgid "Nickname already in use. Try another one." msgstr "" @@ -737,7 +752,7 @@ msgstr "" #. TRANS: Validation error in form for profile settings. #. TRANS: Form validation error displayed when trying to register with an invalid nickname. #: actions/apigroupcreate.php:164 actions/apigroupprofileupdate.php:262 -#: actions/editgroup.php:204 actions/newgroup.php:142 +#: actions/editgroup.php:198 actions/newgroup.php:142 #: actions/profilesettings.php:263 actions/register.php:213 msgid "Not a valid nickname." msgstr "" @@ -751,7 +766,7 @@ msgstr "" #. TRANS: Validation error in form for profile settings. #. TRANS: Form validation error displayed when trying to register with an invalid homepage URL. #: actions/apigroupcreate.php:181 actions/apigroupprofileupdate.php:281 -#: actions/editapplication.php:236 actions/editgroup.php:211 +#: actions/editapplication.php:236 actions/editgroup.php:205 #: actions/newapplication.php:222 actions/newgroup.php:149 #: actions/profilesettings.php:268 actions/register.php:222 msgid "Homepage is not a valid URL." @@ -764,7 +779,7 @@ msgstr "" #. TRANS: Validation error in form for profile settings. #. TRANS: Form validation error displayed when trying to register with a too long full name. #: actions/apigroupcreate.php:191 actions/apigroupprofileupdate.php:291 -#: actions/editgroup.php:215 actions/newgroup.php:153 +#: actions/editgroup.php:209 actions/newgroup.php:153 #: actions/profilesettings.php:272 actions/register.php:226 msgid "Full name is too long (maximum 255 characters)." msgstr "" @@ -783,7 +798,7 @@ msgstr "" #. TRANS: Group create form validation error. #. TRANS: %d is the maximum number of allowed characters. #: actions/apigroupcreate.php:201 actions/apigroupprofileupdate.php:301 -#: actions/editapplication.php:203 actions/editgroup.php:220 +#: actions/editapplication.php:203 actions/editgroup.php:214 #: actions/editpeopletag.php:265 actions/newapplication.php:183 #: actions/newgroup.php:158 #, php-format @@ -799,7 +814,7 @@ msgstr[1] "" #. TRANS: Validation error in form for profile settings. #. TRANS: Form validation error displayed when trying to register with a too long location. #: actions/apigroupcreate.php:215 actions/apigroupprofileupdate.php:313 -#: actions/editgroup.php:227 actions/newgroup.php:165 +#: actions/editgroup.php:221 actions/newgroup.php:165 #: actions/profilesettings.php:285 actions/register.php:238 msgid "Location is too long (maximum 255 characters)." msgstr "" @@ -813,7 +828,7 @@ msgstr "" #. TRANS: Group create form validation error. #. TRANS: %d is the maximum number of allowed aliases. #: actions/apigroupcreate.php:236 actions/apigroupprofileupdate.php:332 -#: actions/editgroup.php:240 actions/newgroup.php:178 +#: actions/editgroup.php:234 actions/newgroup.php:178 #, php-format msgid "Too many aliases! Maximum %d allowed." msgid_plural "Too many aliases! Maximum %d allowed." @@ -836,14 +851,14 @@ msgstr "" #. TRANS: Group edit form validation error. #. TRANS: Group create form validation error. %s is the already used alias. #: actions/apigroupcreate.php:264 actions/apigroupprofileupdate.php:361 -#: actions/editgroup.php:255 actions/newgroup.php:194 +#: actions/editgroup.php:249 actions/newgroup.php:194 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "" #. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname. #. TRANS: Group edit form validation error. -#: actions/apigroupcreate.php:278 actions/editgroup.php:262 +#: actions/apigroupcreate.php:278 actions/editgroup.php:256 msgid "Alias can't be the same as nickname." msgstr "" @@ -879,7 +894,7 @@ msgstr "" #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed. #. TRANS: Message given having failed to add a user to a group. #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group. -#: actions/apigroupjoin.php:133 actions/joingroup.php:136 lib/command.php:359 +#: actions/apigroupjoin.php:133 actions/joingroup.php:140 lib/command.php:359 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "" @@ -929,21 +944,21 @@ msgstr "" #. TRANS: Client error displayed trying to edit a group while not being a group admin. #. TRANS: Client error displayed when trying to change group logo settings while not being a group admin. #: actions/apigroupprofileupdate.php:119 actions/editgroup.php:110 -#: actions/editgroup.php:176 actions/grouplogo.php:111 +#: actions/editgroup.php:170 actions/grouplogo.php:111 msgid "You must be an admin to edit the group." msgstr "" #. TRANS: Server error displayed when group update fails. #. TRANS: Server error displayed when editing a group fails. -#: actions/apigroupprofileupdate.php:173 actions/editgroup.php:285 +#: actions/apigroupprofileupdate.php:173 actions/editgroup.php:279 msgid "Could not update group." msgstr "" #. TRANS: Server error displayed when adding group aliases fails. #. TRANS: Server error displayed when group aliases could not be added. #. TRANS: Server exception thrown when creating group aliases failed. -#: actions/apigroupprofileupdate.php:196 actions/editgroup.php:292 -#: classes/User_group.php:552 +#: actions/apigroupprofileupdate.php:196 actions/editgroup.php:286 +#: classes/User_group.php:624 msgid "Could not create aliases." msgstr "" @@ -1121,12 +1136,11 @@ msgstr "" #. TRANS: Field label on OAuth API authorisation form. #. TRANS: Field label in form for profile settings. #. TRANS: Field label on account registration page. -#. TRANS: Label for nickname on user authorisation page. #. TRANS: Field label on group edit form. #. TRANS: Dropdown option for searching in profiles. #: actions/apioauthauthorize.php:429 actions/profilesettings.php:104 -#: actions/register.php:438 actions/userauthorization.php:146 -#: lib/groupeditform.php:147 lib/togglepeopletag.php:107 +#: actions/register.php:438 lib/groupeditform.php:147 +#: lib/togglepeopletag.php:107 msgid "Nickname" msgstr "" @@ -1499,8 +1513,6 @@ msgstr "" #. TRANS: Client error displayed when trying to update logo settings for a non-existing group. #. TRANS: Client error displayed when trying to view group members for a non-existing group. #. TRANS: Client error displayed when trying to view group members for an object that is not a group. -#. TRANS: Client error displayed when trying to view group members for a non-existing group. -#. TRANS: Client error displayed when trying to view group members for an object that is not a group. #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist. #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group. #. TRANS: Client error displayed when trying to unblock a user from a non-existing group. @@ -1509,10 +1521,10 @@ msgstr "" #. TRANS: Client error displayed when trying to leave a non-local group. #. TRANS: Client error displayed when trying to leave a non-existing group. #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page. -#. TRANS: Client error displayed if no remote group with a given name was found requesting group page. -#. TRANS: Client error displayed if no local group with a given name was found requesting group page. #. TRANS: Command exception text shown when a group is requested that does not exist. #. TRANS: Error text shown when trying to leave a group that does not exist. +#. TRANS: Client error displayed if no remote group with a given name was found requesting group page. +#. TRANS: Client error displayed if no local group with a given name was found requesting group page. #: actions/approvegroup.php:82 actions/approvegroup.php:95 #: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81 #: actions/blockedfromgroup.php:89 actions/cancelgroup.php:81 @@ -1520,14 +1532,12 @@ msgstr "" #: actions/deletegroup.php:100 actions/editgroup.php:102 #: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73 #: actions/groupblock.php:90 actions/groupbyid.php:83 -#: actions/grouplogo.php:103 actions/groupmembers.php:84 -#: actions/groupmembers.php:92 actions/groupqueue.php:85 +#: actions/grouplogo.php:103 actions/groupqueue.php:85 #: actions/groupqueue.php:93 actions/grouprss.php:97 actions/grouprss.php:105 #: actions/groupunblock.php:90 actions/joingroup.php:82 #: actions/joingroup.php:95 actions/leavegroup.php:82 -#: actions/leavegroup.php:95 actions/makeadmin.php:92 -#: actions/showgroup.php:136 actions/showgroup.php:145 lib/command.php:168 -#: lib/command.php:389 +#: actions/leavegroup.php:95 actions/makeadmin.php:92 lib/command.php:168 +#: lib/command.php:389 lib/groupaction.php:87 lib/groupaction.php:96 msgid "No such group." msgstr "" @@ -1797,9 +1807,8 @@ msgstr "" #. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname. #. TRANS: Client error displayed if no nickname argument was given requesting a group page. #: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73 -#: actions/editgroup.php:85 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/groupqueue.php:77 -#: actions/grouprss.php:89 actions/showgroup.php:118 +#: actions/editgroup.php:85 actions/grouplogo.php:86 actions/groupqueue.php:77 +#: actions/grouprss.php:89 lib/groupaction.php:69 msgid "No nickname." msgstr "" @@ -2028,19 +2037,19 @@ msgid "A list of the users blocked from joining this group." msgstr "" #. TRANS: Form legend for unblocking a user from a group. -#: actions/blockedfromgroup.php:291 +#: actions/blockedfromgroup.php:285 msgid "Unblock user from group" msgstr "" #. TRANS: Button text for unblocking a user from a group. -#: actions/blockedfromgroup.php:323 +#: actions/blockedfromgroup.php:317 msgctxt "BUTTON" msgid "Unblock" msgstr "" #. TRANS: Tooltip for button for unblocking a user from a group. #. TRANS: Description of the form to unblock a user. -#: actions/blockedfromgroup.php:327 lib/unblockform.php:78 +#: actions/blockedfromgroup.php:321 lib/unblockform.php:78 msgid "Unblock this user" msgstr "" @@ -2148,6 +2157,18 @@ msgstr "" msgid "Conversation" msgstr "" +#. TRANS: Title for link to notice feed. +#. TRANS: %s is a user nickname. +#: actions/conversation.php:146 actions/conversation.php:162 +msgid "Conversation feed (Activity Streams JSON)" +msgstr "" + +#. TRANS: Title for link to notice feed. +#. TRANS: %s is a user nickname. +#: actions/conversation.php:154 +msgid "Conversation feed (RSS 2.0)" +msgstr "" + #. TRANS: Title for conversation page. #. TRANS: Title for page that shows a notice. #: actions/conversationreplies.php:81 actions/shownotice.php:258 @@ -2219,7 +2240,7 @@ msgstr "" #. TRANS: Button title for user account deletion. #: actions/deleteaccount.php:323 -msgid "Permanently delete your account" +msgid "Permanently delete your account." msgstr "" #. TRANS: Client error displayed trying to delete an application while not logged in. @@ -2244,7 +2265,7 @@ msgstr "" #. TRANS: Client error text when there is a problem with the session token. #: actions/deleteapplication.php:103 actions/editapplication.php:132 #: actions/newapplication.php:113 actions/showapplication.php:117 -#: lib/action.php:1450 +#: lib/action.php:1469 msgid "There was a problem with your session token." msgstr "" @@ -2508,21 +2529,21 @@ msgid "You must be logged in to create a group." msgstr "" #. TRANS: Form instructions for group edit form. -#: actions/editgroup.php:161 +#: actions/editgroup.php:155 msgid "Use this form to edit the group." msgstr "" #. TRANS: Group edit form validation error. #. TRANS: Group create form validation error. #. TRANS: %s is the invalid alias. -#: actions/editgroup.php:250 actions/newgroup.php:189 +#: actions/editgroup.php:244 actions/newgroup.php:189 #, php-format msgid "Invalid alias: \"%s\"" msgstr "" #. TRANS: Group edit form success message. #. TRANS: Edit list form success message. -#: actions/editgroup.php:312 actions/editpeopletag.php:322 +#: actions/editgroup.php:306 actions/editpeopletag.php:322 msgid "Options saved." msgstr "" @@ -2951,48 +2972,6 @@ msgstr "" msgid "No uploaded attachments." msgstr "" -#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received. -#: actions/finishremotesubscribe.php:69 -msgid "Not expecting this response!" -msgstr "" - -#. TRANS: Client error displayed when subscribing to a remote profile that does not exist. -#: actions/finishremotesubscribe.php:81 -msgid "User being listened to does not exist." -msgstr "" - -#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile. -#. TRANS: Client error displayed when using remote subscribe for a local entity. -#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:59 -msgid "You can use the local subscription!" -msgstr "" - -#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to. -#: actions/finishremotesubscribe.php:102 -msgid "That user has blocked you from subscribing." -msgstr "" - -#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token. -#: actions/finishremotesubscribe.php:114 -msgid "You are not authorized." -msgstr "" - -#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails. -#: actions/finishremotesubscribe.php:118 -msgid "Could not convert request token to access token." -msgstr "" - -#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol. -#: actions/finishremotesubscribe.php:124 -msgid "Remote service uses unknown version of OMB protocol." -msgstr "" - -#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated. -#. TRANS: Exception thrown when updating a remote profile fails in OAuth store. -#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:316 -msgid "Error updating remote profile." -msgstr "" - #. TRANS: Client error displayed when requesting a non-existent file. #: actions/getfile.php:77 msgid "No such file." @@ -3139,20 +3118,20 @@ msgstr "" #. TRANS: Title of the page showing group members. #. TRANS: %s is the name of the group. -#: actions/groupmembers.php:104 +#: actions/groupmembers.php:69 #, php-format msgid "%s group members" msgstr "" #. TRANS: Title of the page showing group members. #. TRANS: %1$s is the name of the group, %2$d is the page number of the members list. -#: actions/groupmembers.php:109 +#: actions/groupmembers.php:74 #, php-format msgid "%1$s group members, page %2$d" msgstr "" #. TRANS: Page notice for group members page. -#: actions/groupmembers.php:125 +#: actions/groupmembers.php:90 msgid "A list of the users in this group." msgstr "" @@ -3287,8 +3266,8 @@ msgstr "" #: actions/imsettings.php:69 #, php-format msgid "" -"You can send and receive notices through instant messaging [instant messages]" -"(%%doc.im%%). Configure your addresses and settings below." +"You can send and receive notices through [instant messaging](%%doc.im%%). " +"Configure your addresses and settings below." msgstr "" #. TRANS: Message given in the IM settings if IM is not enabled on the site. @@ -3527,14 +3506,14 @@ msgid "You must be logged in to join a group." msgstr "" #. TRANS: Title for join group page after joining. -#: actions/joingroup.php:145 +#: actions/joingroup.php:149 #, php-format msgctxt "TITLE" msgid "%1$s joined group %2$s" msgstr "" #. TRANS: Exception thrown when there is an unknown error joining a group. -#: actions/joingroup.php:158 +#: actions/joingroup.php:162 msgid "Unknown error joining group." msgstr "" @@ -3818,7 +3797,7 @@ msgid "New group" msgstr "" #. TRANS: Client exception thrown when a user tries to create a group while banned. -#: actions/newgroup.php:73 classes/User_group.php:485 +#: actions/newgroup.php:73 classes/User_group.php:545 msgid "You are not allowed to create groups on this site." msgstr "" @@ -4077,8 +4056,8 @@ msgstr "" #. TRANS: Server error displayed in oEmbed action when request specifies an unsupported data format. #. TRANS: Client error on an API request with an unsupported data format. -#: actions/oembed.php:204 actions/oembed.php:224 lib/apiaction.php:1292 -#: lib/apiaction.php:1319 lib/apiaction.php:1454 +#: actions/oembed.php:204 actions/oembed.php:224 lib/apiaction.php:1293 +#: lib/apiaction.php:1320 lib/apiaction.php:1455 msgid "Not a supported data format." msgstr "" @@ -4235,237 +4214,230 @@ msgstr "" #. TRANS: Client error in Paths admin panel. #. TRANS: %s is the directory that could not be read from. -#: actions/pathsadminpanel.php:155 +#: actions/pathsadminpanel.php:154 #, php-format msgid "Theme directory not readable: %s." msgstr "" #. TRANS: Client error in Paths admin panel. #. TRANS: %s is the avatar directory that could not be written to. -#: actions/pathsadminpanel.php:163 +#: actions/pathsadminpanel.php:162 #, php-format msgid "Avatar directory not writable: %s." msgstr "" -#. TRANS: Client error in Paths admin panel. -#. TRANS: %s is the background directory that could not be written to. -#: actions/pathsadminpanel.php:171 -#, php-format -msgid "Background directory not writable: %s." -msgstr "" - #. TRANS: Client error in Paths admin panel. #. TRANS: %s is the locales directory that could not be read from. -#: actions/pathsadminpanel.php:181 +#: actions/pathsadminpanel.php:172 #, php-format msgid "Locales directory not readable: %s." msgstr "" #. TRANS: Client error in Paths admin panel. #. TRANS: %s is the SSL server URL that is too long. -#: actions/pathsadminpanel.php:189 +#: actions/pathsadminpanel.php:180 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #. TRANS: Fieldset legend in Paths admin panel. -#: actions/pathsadminpanel.php:235 +#: actions/pathsadminpanel.php:226 msgid "Site" msgstr "" #. TRANS: Field label in Paths admin panel. -#: actions/pathsadminpanel.php:241 actions/pathsadminpanel.php:284 -#: actions/pathsadminpanel.php:376 +#: actions/pathsadminpanel.php:232 actions/pathsadminpanel.php:275 +#: actions/pathsadminpanel.php:367 msgid "Server" msgstr "" #. TRANS: Field title in Paths admin panel. -#: actions/pathsadminpanel.php:243 +#: actions/pathsadminpanel.php:234 msgid "Site's server hostname." msgstr "" #. TRANS: Field label in Paths admin panel. -#: actions/pathsadminpanel.php:249 actions/pathsadminpanel.php:293 -#: actions/pathsadminpanel.php:385 +#: actions/pathsadminpanel.php:240 actions/pathsadminpanel.php:284 +#: actions/pathsadminpanel.php:376 msgid "Path" msgstr "" #. TRANS: Field title in Paths admin panel. -#: actions/pathsadminpanel.php:251 +#: actions/pathsadminpanel.php:242 msgid "Site path." msgstr "" #. TRANS: Field label in Paths admin panel. -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:248 msgid "Locale directory" msgstr "" #. TRANS: Field title in Paths admin panel. -#: actions/pathsadminpanel.php:259 +#: actions/pathsadminpanel.php:250 msgid "Directory path to locales." msgstr "" #. TRANS: Checkbox label in Paths admin panel. -#: actions/pathsadminpanel.php:266 +#: actions/pathsadminpanel.php:257 msgid "Fancy URLs" msgstr "" #. TRANS: Field title in Paths admin panel. -#: actions/pathsadminpanel.php:269 +#: actions/pathsadminpanel.php:260 msgid "Use fancy URLs (more readable and memorable)?" msgstr "" #. TRANS: Fieldset legend in Paths admin panel. -#: actions/pathsadminpanel.php:277 +#: actions/pathsadminpanel.php:268 msgctxt "LEGEND" msgid "Theme" msgstr "" #. TRANS: Tooltip for field label in Paths admin panel. -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:277 msgid "Server for themes." msgstr "" #. TRANS: Tooltip for field label in Paths admin panel. -#: actions/pathsadminpanel.php:295 +#: actions/pathsadminpanel.php:286 msgid "Web path to themes." msgstr "" #. TRANS: Field label in Paths admin panel. -#: actions/pathsadminpanel.php:302 actions/pathsadminpanel.php:394 -#: actions/pathsadminpanel.php:446 +#: actions/pathsadminpanel.php:293 actions/pathsadminpanel.php:385 +#: actions/pathsadminpanel.php:437 msgid "SSL server" msgstr "" #. TRANS: Tooltip for field label in Paths admin panel. -#: actions/pathsadminpanel.php:304 +#: actions/pathsadminpanel.php:295 msgid "SSL server for themes (default: SSL server)." msgstr "" #. TRANS: Field label in Paths admin panel. -#: actions/pathsadminpanel.php:311 actions/pathsadminpanel.php:403 +#: actions/pathsadminpanel.php:302 actions/pathsadminpanel.php:394 msgid "SSL path" msgstr "" #. TRANS: Tooltip for field label in Paths admin panel. -#: actions/pathsadminpanel.php:313 +#: actions/pathsadminpanel.php:304 msgid "SSL path to themes (default: /theme/)." msgstr "" #. TRANS: Field label in Paths admin panel. -#: actions/pathsadminpanel.php:320 actions/pathsadminpanel.php:412 +#: actions/pathsadminpanel.php:311 actions/pathsadminpanel.php:403 msgid "Directory" msgstr "" #. TRANS: Tooltip for field label in Paths admin panel. -#: actions/pathsadminpanel.php:322 +#: actions/pathsadminpanel.php:313 msgid "Directory where themes are located." msgstr "" #. TRANS: Fieldset legend in Paths admin panel. -#: actions/pathsadminpanel.php:331 +#: actions/pathsadminpanel.php:322 msgid "Avatars" msgstr "" #. TRANS: Field label in Paths admin panel. -#: actions/pathsadminpanel.php:338 +#: actions/pathsadminpanel.php:329 msgid "Avatar server" msgstr "" #. TRANS: Tooltip for field label in Paths admin panel. -#: actions/pathsadminpanel.php:340 +#: actions/pathsadminpanel.php:331 msgid "Server for avatars." msgstr "" #. TRANS: Field label in Paths admin panel. -#: actions/pathsadminpanel.php:347 +#: actions/pathsadminpanel.php:338 msgid "Avatar path" msgstr "" #. TRANS: Tooltip for field label in Paths admin panel. -#: actions/pathsadminpanel.php:349 +#: actions/pathsadminpanel.php:340 msgid "Web path to avatars." msgstr "" #. TRANS: Field label in Paths admin panel. -#: actions/pathsadminpanel.php:356 +#: actions/pathsadminpanel.php:347 msgid "Avatar directory" msgstr "" #. TRANS: Tooltip for field label in Paths admin panel. -#: actions/pathsadminpanel.php:358 +#: actions/pathsadminpanel.php:349 msgid "Directory where avatars are located." msgstr "" #. TRANS: Fieldset legens in Paths admin panel. -#: actions/pathsadminpanel.php:370 +#: actions/pathsadminpanel.php:361 msgid "Attachments" msgstr "" #. TRANS: Tooltip for field label in Paths admin panel. -#: actions/pathsadminpanel.php:378 +#: actions/pathsadminpanel.php:369 msgid "Server for attachments." msgstr "" #. TRANS: Tooltip for field label in Paths admin panel. -#: actions/pathsadminpanel.php:387 +#: actions/pathsadminpanel.php:378 msgid "Web path to attachments." msgstr "" #. TRANS: Tooltip for field label in Paths admin panel. -#: actions/pathsadminpanel.php:396 +#: actions/pathsadminpanel.php:387 msgid "Server for attachments on SSL pages." msgstr "" #. TRANS: Tooltip for field label in Paths admin panel. -#: actions/pathsadminpanel.php:405 +#: actions/pathsadminpanel.php:396 msgid "Web path to attachments on SSL pages." msgstr "" #. TRANS: Tooltip for field label in Paths admin panel. -#: actions/pathsadminpanel.php:414 +#: actions/pathsadminpanel.php:405 msgid "Directory where attachments are located." msgstr "" #. TRANS: Fieldset legend in Paths admin panel. -#: actions/pathsadminpanel.php:423 +#: actions/pathsadminpanel.php:414 msgctxt "LEGEND" msgid "SSL" msgstr "" #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL"). #. TRANS: Option in dropdown for snapshot method in admin panel for snapshots. -#: actions/pathsadminpanel.php:428 actions/snapshotadminpanel.php:203 +#: actions/pathsadminpanel.php:419 actions/snapshotadminpanel.php:203 msgid "Never" msgstr "" #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL"). -#: actions/pathsadminpanel.php:430 +#: actions/pathsadminpanel.php:421 msgid "Sometimes" msgstr "" #. TRANS: Drop down option in Paths admin panel (option for "When to use SSL"). -#: actions/pathsadminpanel.php:432 +#: actions/pathsadminpanel.php:423 msgid "Always" msgstr "" #. TRANS: Drop down label in Paths admin panel. -#: actions/pathsadminpanel.php:436 +#: actions/pathsadminpanel.php:427 msgid "Use SSL" msgstr "" #. TRANS: Tooltip for field label in Paths admin panel. -#: actions/pathsadminpanel.php:438 +#: actions/pathsadminpanel.php:429 msgid "When to use SSL." msgstr "" #. TRANS: Tooltip for field label in Paths admin panel. -#: actions/pathsadminpanel.php:448 +#: actions/pathsadminpanel.php:439 msgid "Server to direct SSL requests to." msgstr "" #. TRANS: Button title text to store form data in the Paths admin panel. -#: actions/pathsadminpanel.php:465 -msgid "Save paths" +#: actions/pathsadminpanel.php:456 +msgid "Save path settings." msgstr "" #. TRANS: Instructions for the "People search" page. @@ -4617,7 +4589,7 @@ msgid "" "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool. You can easily keep track of what they are doing by subscribing to the " -"tag's timeline." +"list's timeline." msgstr "" #. TRANS: Message displayed on page that displays lists by a user when there are none. @@ -4650,7 +4622,7 @@ msgid "" "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" "blogging) service based on the Free Software [StatusNet](http://status.net/) " "tool. You can easily keep track of what they are doing by subscribing to the " -"tag's timeline." +"list's timeline." msgstr "" #. TRANS: Message displayed on page that displays lists a user was added to when there are none. @@ -4759,18 +4731,6 @@ msgid "" "All default plugins have been disabled from the site's configuration file." msgstr "" -#. TRANS: Client error displayed if the notice posted has too many characters. -#: actions/postnotice.php:96 -msgid "Invalid notice content." -msgstr "" - -#. TRANS: Exception thrown if a notice's license is not compatible with the StatusNet site license. -#. TRANS: %1$s is the notice license, %2$s is the StatusNet site's license. -#: actions/postnotice.php:104 -#, php-format -msgid "Notice license \"%1$s\" is not compatible with site license \"%2$s\"." -msgstr "" - #. TRANS: Client error displayed when trying to add an unindentified field to profile. #. TRANS: %s is a field name. #: actions/profilecompletion.php:109 @@ -4883,7 +4843,10 @@ msgid "Share my current location when posting notices" msgstr "" #. TRANS: Field label in form for profile settings. +#. TRANS: Title for group tag cloud section. +#. TRANS: %s is a group name. #: actions/profilesettings.php:159 lib/galleryaction.php:118 +#: lib/grouptagcloudsection.php:57 msgid "Tags" msgstr "" @@ -5017,7 +4980,7 @@ msgstr "" #. TRANS: Server error displayed when a public timeline cannot be retrieved. #: actions/public.php:98 -msgid "Could not retrieve public stream." +msgid "Could not retrieve public timeline." msgstr "" #. TRANS: Title for all public timeline pages but the first. @@ -5034,22 +4997,27 @@ msgid "Public timeline" msgstr "" #. TRANS: Link description for public timeline feed. -#: actions/public.php:167 -msgid "Public Stream Feed (RSS 1.0)" +#: actions/public.php:169 +msgid "Public Timeline Feed (Activity Streams JSON)" msgstr "" #. TRANS: Link description for public timeline feed. #: actions/public.php:172 -msgid "Public Stream Feed (RSS 2.0)" +msgid "Public Timeline Feed (RSS 1.0)" msgstr "" #. TRANS: Link description for public timeline feed. #: actions/public.php:177 -msgid "Public Stream Feed (Atom)" +msgid "Public Timeline Feed (RSS 2.0)" +msgstr "" + +#. TRANS: Link description for public timeline feed. +#: actions/public.php:182 +msgid "Public Timeline Feed (Atom)" msgstr "" #. TRANS: Text displayed for public feed when there are no public notices. -#: actions/public.php:183 +#: actions/public.php:188 #, php-format msgid "" "This is the public timeline for %%site.name%% but no one has posted anything " @@ -5057,12 +5025,12 @@ msgid "" msgstr "" #. TRANS: Additional text displayed for public feed when there are no public notices for a logged in user. -#: actions/public.php:187 +#: actions/public.php:192 msgid "Be the first to post!" msgstr "" #. TRANS: Additional text displayed for public feed when there are no public notices for a not logged in user. -#: actions/public.php:192 +#: actions/public.php:197 #, php-format msgid "" "Why not [register an account](%%action.register%%) and be the first to post!" @@ -5070,7 +5038,7 @@ msgstr "" #. TRANS: Message for not logged in users at an invite-only site trying to view the public feed of notices. #. TRANS: This message contains Markdown links. Please mind the formatting. -#: actions/public.php:240 +#: actions/public.php:259 #, php-format msgid "" "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" @@ -5081,7 +5049,7 @@ msgstr "" #. TRANS: Message for not logged in users at a closed site trying to view the public feed of notices. #. TRANS: This message contains Markdown links. Please mind the formatting. -#: actions/public.php:247 +#: actions/public.php:266 #, php-format msgid "" "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" @@ -5264,7 +5232,7 @@ msgstr "" #. TRANS: Title for password recovery page in email sent mode. #. TRANS: Subject for password recovery e-mail. -#: actions/recoverpassword.php:227 classes/User.php:1094 +#: actions/recoverpassword.php:227 classes/User.php:1146 msgid "Password recovery requested" msgstr "" @@ -5473,92 +5441,16 @@ msgid "" "to confirm your email address.)" msgstr "" -#. TRANS: Page notice for remote subscribe. This message contains Markdown links. -#. TRANS: Ensure to keep the correct markup of [link description](link). -#: actions/remotesubscribe.php:101 -#, php-format -msgid "" -"To subscribe, you can [login](%%action.login%%), or [register](%%action." -"register%%) a new account. If you already have an account on a [compatible " -"microblogging site](%%doc.openmublog%%), enter your profile URL below." -msgstr "" - -#. TRANS: Page title for Remote subscribe. -#: actions/remotesubscribe.php:116 -msgid "Remote subscribe" -msgstr "" - -#. TRANS: Field legend on page for remote subscribe. -#: actions/remotesubscribe.php:129 -msgid "Subscribe to a remote user" -msgstr "" - -#. TRANS: Field label on page for remote subscribe. -#: actions/remotesubscribe.php:135 -msgid "User nickname" -msgstr "" - -#. TRANS: Field title on page for remote subscribe. -#: actions/remotesubscribe.php:137 -msgid "Nickname of the user you want to follow." -msgstr "" - -#. TRANS: Field label on page for remote subscribe. -#: actions/remotesubscribe.php:141 -msgid "Profile URL" -msgstr "" - -#. TRANS: Field title on page for remote subscribe. -#: actions/remotesubscribe.php:143 -msgid "URL of your profile on another compatible microblogging service." -msgstr "" - -#. TRANS: Button text on page for remote subscribe. -#. TRANS: Link text for link that will subscribe to a remote profile. -#. TRANS: Button text to subscribe to a user. -#. TRANS: Button text for subscribing to a list. -#: actions/remotesubscribe.php:147 lib/accountprofileblock.php:308 -#: lib/subscribeform.php:130 lib/subscribepeopletagform.php:106 -msgctxt "BUTTON" -msgid "Subscribe" -msgstr "" - -#. TRANS: Form validation error on page for remote subscribe when an invalid profile URL was provided. -#: actions/remotesubscribe.php:172 -msgid "Invalid profile URL (bad format)." -msgstr "" - -#. TRANS: Form validation error on page for remote subscribe when no the provided profile URL -#. TRANS: does not contain expected data. -#: actions/remotesubscribe.php:183 -msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)." -msgstr "" - -#. TRANS: Form validation error on page for remote subscribe. -#: actions/remotesubscribe.php:192 -msgid "That is a local profile! Login to subscribe." -msgstr "" - -#. TRANS: Form validation error on page for remote subscribe when the remote service is not providing a request token. -#: actions/remotesubscribe.php:200 -msgid "Could not get a request token." -msgstr "" - -#. TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile. -#: actions/removepeopletag.php:122 -msgid "You cannot (un)list an OMB 0.1 remote profile with this action." -msgstr "" - #. TRANS: Client error displayed when an unknown error occurs while delisting a user. #. TRANS: %s is a username. -#: actions/removepeopletag.php:152 +#: actions/removepeopletag.php:140 #, php-format msgid "There was an unexpected error while delisting %s." msgstr "" #. TRANS: Client error displayed when an unknown error occurs while listing a user. #. TRANS: %s is a profile URL. -#: actions/removepeopletag.php:157 +#: actions/removepeopletag.php:145 #, php-format msgid "" "There was a problem listing %s. The remote server is probably not responding " @@ -5566,7 +5458,7 @@ msgid "" msgstr "" #. TRANS: Title after removing a user from a list. -#: actions/removepeopletag.php:167 +#: actions/removepeopletag.php:155 msgid "Unlisted" msgstr "" @@ -5583,7 +5475,7 @@ msgstr "" #. TRANS: Title after repeating a notice. #. TRANS: Repeat form status in notice list when a notice has been repeated. -#: actions/repeat.php:102 lib/noticelistitem.php:682 +#: actions/repeat.php:102 lib/noticelistitem.php:685 msgid "Repeated" msgstr "" @@ -5612,28 +5504,35 @@ msgstr "" #. TRANS: Link for feed with replies for a user. #. TRANS: %s is a user nickname. -#: actions/replies.php:151 +#: actions/replies.php:153 #, php-format -msgid "Replies feed for %s (RSS 1.0)" +msgid "Replies feed for %s (Activity Streams JSON)" msgstr "" #. TRANS: Link for feed with replies for a user. #. TRANS: %s is a user nickname. #: actions/replies.php:160 #, php-format -msgid "Replies feed for %s (RSS 2.0)" +msgid "Replies feed for %s (RSS 1.0)" msgstr "" #. TRANS: Link for feed with replies for a user. #. TRANS: %s is a user nickname. #: actions/replies.php:169 #, php-format +msgid "Replies feed for %s (RSS 2.0)" +msgstr "" + +#. TRANS: Link for feed with replies for a user. +#. TRANS: %s is a user nickname. +#: actions/replies.php:178 +#, php-format msgid "Replies feed for %s (Atom)" msgstr "" #. TRANS: Empty list message for page with replies for a user. #. TRANS: %1$s and %s$s are the user nickname. -#: actions/replies.php:198 +#: actions/replies.php:207 #, php-format msgid "" "This is the timeline showing replies to %1$s but %2$s hasn't received a " @@ -5642,7 +5541,7 @@ msgstr "" #. TRANS: Empty list message for page with replies for a user for the logged in user. #. TRANS: This message contains a Markdown link in the form [link text](link). -#: actions/replies.php:207 +#: actions/replies.php:216 #, php-format msgid "" "You can engage other users in a conversation, subscribe to more people or " @@ -5651,7 +5550,7 @@ msgstr "" #. TRANS: Empty list message for page with replies for a user for all logged in users but the user themselves. #. TRANS: %1$s, %2$s and %3$s are a user nickname. This message contains a Markdown link in the form [link text](link). -#: actions/replies.php:211 +#: actions/replies.php:220 #, php-format msgid "" "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action." @@ -5741,7 +5640,7 @@ msgstr "" #. TRANS: Form instructions for feed restore. #: actions/restoreaccount.php:342 msgid "" -"You can upload a backed-up stream in Activity Streams format." msgstr "" @@ -5878,15 +5777,40 @@ msgstr "" msgid "Application info" msgstr "" +#. TRANS: Field label on application page. +#: actions/showapplication.php:257 +msgid "Consumer key" +msgstr "" + +#. TRANS: Field label on application page. +#: actions/showapplication.php:260 +msgid "Consumer secret" +msgstr "" + +#. TRANS: Field label on application page. +#: actions/showapplication.php:263 +msgid "Request token URL" +msgstr "" + +#. TRANS: Field label on application page. +#: actions/showapplication.php:266 +msgid "Access token URL" +msgstr "" + +#. TRANS: Field label on application page. +#: actions/showapplication.php:269 +msgid "Authorize URL" +msgstr "" + #. TRANS: Note on the OAuth application page about signature support. -#: actions/showapplication.php:272 +#: actions/showapplication.php:275 msgid "" "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is " "not supported." msgstr "" #. TRANS: Text in confirmation dialog to reset consumer key and secret for an OAuth application. -#: actions/showapplication.php:293 +#: actions/showapplication.php:296 msgid "Are you sure you want to reset your consumer key and secret?" msgstr "" @@ -5903,25 +5827,31 @@ msgid "Could not retrieve favorite notices." msgstr "" #. TRANS: Feed link text. %s is a username. -#: actions/showfavorites.php:172 +#: actions/showfavorites.php:174 #, php-format -msgid "Feed for favorites of %s (RSS 1.0)" +msgid "Feed for favorites of %s (Activity Streams JSON)" msgstr "" #. TRANS: Feed link text. %s is a username. #: actions/showfavorites.php:180 #, php-format -msgid "Feed for favorites of %s (RSS 2.0)" +msgid "Feed for favorites of %s (RSS 1.0)" msgstr "" #. TRANS: Feed link text. %s is a username. #: actions/showfavorites.php:188 #, php-format +msgid "Feed for favorites of %s (RSS 2.0)" +msgstr "" + +#. TRANS: Feed link text. %s is a username. +#: actions/showfavorites.php:196 +#, php-format msgid "Feed for favorites of %s (Atom)" msgstr "" #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites. -#: actions/showfavorites.php:198 +#: actions/showfavorites.php:206 msgid "" "You haven't chosen any favorite notices yet. Click the fave button on " "notices you like to bookmark them for later or shed a spotlight on them." @@ -5929,7 +5859,7 @@ msgstr "" #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in. #. TRANS: %s is a username. -#: actions/showfavorites.php:202 +#: actions/showfavorites.php:210 #, php-format msgid "" "%s hasn't added any favorite notices yet. Post something interesting they " @@ -5939,7 +5869,7 @@ msgstr "" #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in. #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page. #. TRANS: (link text)[link] is a Mark Down link. -#: actions/showfavorites.php:209 +#: actions/showfavorites.php:217 #, php-format msgid "" "%s hasn't added any favorite notices yet. Why not [register an account](%%%%" @@ -5948,95 +5878,58 @@ msgid "" msgstr "" #. TRANS: Page notice for show favourites page. -#: actions/showfavorites.php:240 +#: actions/showfavorites.php:248 msgid "This is a way to share what you like." msgstr "" #. TRANS: Page title for first group page. %s is a group name. -#: actions/showgroup.php:77 +#: actions/showgroup.php:75 #, php-format msgid "%s group" msgstr "" #. TRANS: Page title for any but first group page. #. TRANS: %1$s is a group name, $2$s is a page number. -#: actions/showgroup.php:81 +#: actions/showgroup.php:79 #, php-format msgid "%1$s group, page %2$d" msgstr "" #. TRANS: Tooltip for feed link. %s is a group nickname. -#: actions/showgroup.php:227 +#: actions/showgroup.php:169 +#, php-format +msgid "Notice feed for %s group (Activity Streams JSON)" +msgstr "" + +#. TRANS: Tooltip for feed link. %s is a group nickname. +#: actions/showgroup.php:175 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" #. TRANS: Tooltip for feed link. %s is a group nickname. -#: actions/showgroup.php:234 +#: actions/showgroup.php:182 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" #. TRANS: Tooltip for feed link. %s is a group nickname. -#: actions/showgroup.php:241 +#: actions/showgroup.php:189 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" #. TRANS: Tooltip for feed link. %s is a group nickname. -#: actions/showgroup.php:247 +#: actions/showgroup.php:195 #, php-format msgid "FOAF for %s group" msgstr "" -#. TRANS: Header for mini list of group members on a group page (h2). -#: actions/showgroup.php:284 -msgid "Members" -msgstr "" - -#. TRANS: Description for mini list of group members on a group page when the group has no members. -#. TRANS: Content of "Listed" page if there are no listed users. -#. TRANS: Content of "People following tag x" if there are no subscribed users. -#. TRANS: Empty list message for tags. -#. TRANS: Text for user subscription statistics if the user has no subscriptions. -#. TRANS: Text for user subscriber statistics if user has no subscribers. -#. TRANS: Text for user user group membership statistics if user is not a member of any group. -#. TRANS: Default content for section/sidebar widget. -#: actions/showgroup.php:290 actions/showprofiletag.php:300 -#: actions/showprofiletag.php:338 lib/peopletags.php:166 -#: lib/profileaction.php:140 lib/profileaction.php:172 -#: lib/profileaction.php:270 lib/section.php:117 -msgid "(None)" -msgstr "" - -#. TRANS: Link to all group members from mini list of group members if group has more than n members. -#: actions/showgroup.php:299 -msgid "All members" -msgstr "" - -#. TRANS: Header for group statistics on a group page (h2). -#. TRANS: H2 text for user statistics. -#: actions/showgroup.php:330 lib/profileaction.php:196 -msgid "Statistics" -msgstr "" - -#. TRANS: Label for group creation date. -#: actions/showgroup.php:335 -msgctxt "LABEL" -msgid "Created" -msgstr "" - -#. TRANS: Label for member count in statistics on group page. -#: actions/showgroup.php:340 -msgctxt "LABEL" -msgid "Members" -msgstr "" - #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations. #. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name, #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help. #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link). -#: actions/showgroup.php:355 +#: actions/showgroup.php:207 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -6049,7 +5942,7 @@ msgstr "" #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations. #. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name, #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link). -#: actions/showgroup.php:365 +#: actions/showgroup.php:217 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -6058,12 +5951,6 @@ msgid "" "their life and interests. " msgstr "" -#. TRANS: Title for list of group administrators on a group page. -#: actions/showgroup.php:406 -msgctxt "TITLE" -msgid "Admins" -msgstr "" - #. TRANS: Client error displayed requesting a single message that does not exist. #: actions/showmessage.php:76 msgid "No such message." @@ -6142,14 +6029,14 @@ msgstr "" #. TRANS: Feed title. #. TRANS: %1$s is a list, %2$s is tagger's nickname. -#: actions/showprofiletag.php:193 +#: actions/showprofiletag.php:204 #, php-format msgid "Feed for %1$s list by %2$s (Atom)" msgstr "" #. TRANS: Empty list message for list timeline. #. TRANS: %1$s is a list, %2$s is a tagger's nickname. -#: actions/showprofiletag.php:210 +#: actions/showprofiletag.php:221 #, php-format msgid "" "This is the timeline for %1$s list by %2$s but no one has posted anything " @@ -6157,13 +6044,13 @@ msgid "" msgstr "" #. TRANS: Additional empty list message for list timeline for currently logged in user tagged tags. -#: actions/showprofiletag.php:218 +#: actions/showprofiletag.php:229 msgid "Try tagging more people." msgstr "" #. TRANS: Additional empty list message for list timeline. #. TRANS: This message contains Markdown links in the form [description](link). -#: actions/showprofiletag.php:223 +#: actions/showprofiletag.php:234 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and start following " @@ -6171,43 +6058,59 @@ msgid "" msgstr "" #. TRANS: Header on show list page. -#: actions/showprofiletag.php:291 +#. TRANS: Link description for link to list of users tagged with a tag (so part of a list). +#: actions/showprofiletag.php:302 lib/peopletaglist.php:173 msgid "Listed" msgstr "" +#. TRANS: Content of "Listed" page if there are no listed users. +#. TRANS: Content of "People following tag x" if there are no subscribed users. +#. TRANS: Description for mini list of group members on a group page when the group has no members. +#. TRANS: Empty list message for tags. +#. TRANS: Text for user subscription statistics if the user has no subscriptions. +#. TRANS: Text for user subscriber statistics if user has no subscribers. +#. TRANS: Text for user user group membership statistics if user is not a member of any group. +#. TRANS: Default content for section/sidebar widget. +#: actions/showprofiletag.php:311 actions/showprofiletag.php:349 +#: lib/groupaction.php:159 lib/groupaction.php:252 lib/peopletags.php:166 +#: lib/profileaction.php:140 lib/profileaction.php:172 +#: lib/profileaction.php:270 lib/section.php:117 +msgid "(None)" +msgstr "" + #. TRANS: Link for more "People in list x by a user" #. TRANS: if there are more than the mini list's maximum. -#: actions/showprofiletag.php:312 +#: actions/showprofiletag.php:323 msgid "Show all" msgstr "" #. TRANS: Header for tag subscribers. #. TRANS: Link description for link to list of users subscribed to a tag. -#: actions/showprofiletag.php:329 lib/peopletaglist.php:183 +#: actions/showprofiletag.php:340 lib/peopletaglist.php:183 msgid "Subscribers" msgstr "" #. TRANS: Link for more "People following tag x" #. TRANS: if there are more than the mini list's maximum. -#: actions/showprofiletag.php:350 +#: actions/showprofiletag.php:361 msgid "All subscribers" msgstr "" -#. TRANS: Page title showing tagged notices in one user's stream. +#. TRANS: Page title showing tagged notices in one user's timeline. #. TRANS: %1$s is the username, %2$s is the hash tag. #: actions/showstream.php:70 #, php-format msgid "Notices by %1$s tagged %2$s" msgstr "" -#. TRANS: Page title showing tagged notices in one user's stream. +#. TRANS: Page title showing tagged notices in one user's timeline. #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number. #: actions/showstream.php:74 #, php-format msgid "Notices by %1$s tagged %2$s, page %3$d" msgstr "" -#. TRANS: Extended page title showing tagged notices in one user's stream. +#. TRANS: Extended page title showing tagged notices in one user's timeline. #. TRANS: %1$s is the username, %2$d is the page number. #: actions/showstream.php:82 #, php-format @@ -6223,57 +6126,64 @@ msgstr "" #. TRANS: Title for link to notice feed. #. TRANS: %s is a user nickname. -#: actions/showstream.php:135 +#: actions/showstream.php:137 #, php-format -msgid "Notice feed for %s (RSS 1.0)" +msgid "Notice feed for %s (Activity Streams JSON)" msgstr "" #. TRANS: Title for link to notice feed. #. TRANS: %s is a user nickname. #: actions/showstream.php:144 #, php-format -msgid "Notice feed for %s (RSS 2.0)" +msgid "Notice feed for %s (RSS 1.0)" msgstr "" #. TRANS: Title for link to notice feed. #. TRANS: %s is a user nickname. #: actions/showstream.php:153 #, php-format +msgid "Notice feed for %s (RSS 2.0)" +msgstr "" + +#. TRANS: Title for link to notice feed. +#. TRANS: %s is a user nickname. +#: actions/showstream.php:162 +#, php-format msgid "Notice feed for %s (Atom)" msgstr "" #. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend. #. TRANS: More information at http://www.foaf-project.org. %s is a user nickname. -#: actions/showstream.php:160 +#: actions/showstream.php:169 #, php-format msgid "FOAF for %s" msgstr "" -#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname. -#: actions/showstream.php:200 +#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname. +#: actions/showstream.php:209 #, php-format msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet." msgstr "" #. TRANS: Second sentence of empty list message for a stream for the user themselves. -#: actions/showstream.php:206 +#: actions/showstream.php:215 msgid "" "Seen anything interesting recently? You haven't posted any notices yet, now " "would be a good time to start :)" msgstr "" -#. TRANS: Second sentence of empty list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL. +#. TRANS: Second sentence of empty list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL. #. TRANS: This message contains a Markdown link. Keep "](" together. -#: actions/showstream.php:210 +#: actions/showstream.php:219 #, php-format msgid "" "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%" "%?status_textarea=%2$s)." msgstr "" -#. TRANS: Announcement for anonymous users showing a stream if site registrations are open. +#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open. #. TRANS: This message contains a Markdown link. Keep "](" together. -#: actions/showstream.php:253 +#: actions/showstream.php:262 #, php-format msgid "" "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -6282,9 +6192,9 @@ msgid "" "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only. +#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only. #. TRANS: This message contains a Markdown link. Keep "](" together. -#: actions/showstream.php:260 +#: actions/showstream.php:269 #, php-format msgid "" "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -6293,7 +6203,7 @@ msgid "" msgstr "" #. TRANS: Link to the author of a repeated notice. %s is a linked nickname. -#: actions/showstream.php:336 +#: actions/showstream.php:345 #, php-format msgid "Repeat of %s" msgstr "" @@ -6507,7 +6417,7 @@ msgstr "" msgid "Site-wide notice text (255 characters maximum; HTML allowed)" msgstr "" -#. TRANS: Title for button to save site notice in admin panel. +#. TRANS: Button title to save site notice in admin panel. #: actions/sitenoticeadminpanel.php:201 msgid "Save site notice." msgstr "" @@ -6736,7 +6646,7 @@ msgstr "" msgid "Snapshots will be sent to this URL." msgstr "" -#. TRANS: Title for button to save snapshot settings. +#. TRANS: Button title to save snapshot settings. #: actions/snapshotadminpanel.php:256 msgid "Save snapshot settings." msgstr "" @@ -6748,7 +6658,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:90 classes/Subscription.php:147 +#: actions/subedit.php:90 classes/Subscription.php:177 msgid "Could not save subscription." msgstr "" @@ -6776,13 +6686,8 @@ msgstr "" msgid "A list of users awaiting approval to subscribe to you." msgstr "" -#. TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile. -#: actions/subscribe.php:121 -msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." -msgstr "" - #. TRANS: Page title when subscription succeeded. -#: actions/subscribe.php:149 +#: actions/subscribe.php:137 msgid "Subscribed" msgstr "" @@ -6932,29 +6837,36 @@ msgstr "" #. TRANS: Link label for feed on "notices with tag" page. #. TRANS: %s is the tag the feed is for. -#: actions/tag.php:87 +#: actions/tag.php:88 #, php-format -msgid "Notice feed for tag %s (RSS 1.0)" +msgid "Notice feed for tag %s (Activity Streams JSON)" msgstr "" #. TRANS: Link label for feed on "notices with tag" page. #. TRANS: %s is the tag the feed is for. #: actions/tag.php:95 #, php-format -msgid "Notice feed for tag %s (RSS 2.0)" +msgid "Notice feed for tag %s (RSS 1.0)" msgstr "" #. TRANS: Link label for feed on "notices with tag" page. #. TRANS: %s is the tag the feed is for. #: actions/tag.php:103 #, php-format +msgid "Notice feed for tag %s (RSS 2.0)" +msgstr "" + +#. TRANS: Link label for feed on "notices with tag" page. +#. TRANS: %s is the tag the feed is for. +#: actions/tag.php:111 +#, php-format msgid "Notice feed for tag %s (Atom)" msgstr "" #. TRANS: Client error displayed when trying to tag a user that cannot be tagged. #. TRANS: Client exception thrown trying to set a tag for a user that cannot be tagged. #. TRANS: Error displayed when trying to tag a user that cannot be tagged. -#: actions/tagprofile.php:56 classes/Profile_tag.php:147 lib/command.php:440 +#: actions/tagprofile.php:56 classes/Profile_tag.php:171 lib/command.php:440 #: lib/command.php:499 msgid "You cannot tag this user." msgstr "" @@ -7049,17 +6961,6 @@ msgstr "" msgid "%1$s unsubscribed from list %2$s by %3$s" msgstr "" -#. TRANS: Client error displayed when trying to update profile with an incompatible license. -#. TRANS: %1$s is the license incompatible with site license %2$s. -#. TRANS: Exception thrown when licenses are not compatible for an authorisation request. -#. TRANS: %1$s is the license for the listenee, %2$s is the license for "this" StatusNet site. -#: actions/updateprofile.php:65 actions/userauthorization.php:342 -#, php-format -msgid "" -"Listenee stream license \"%1$s\" is not compatible with site license \"%2$s" -"\"." -msgstr "" - #. TRANS: Title of URL settings tab in profile settings. #: actions/urlsettings.php:57 msgid "URL settings" @@ -7222,133 +7123,11 @@ msgstr "" msgid "Whether to allow users to invite new users." msgstr "" -#. TRANS: Title for button to save user settings in user admin panel. +#. TRANS: Button title to save user settings in user admin panel. #: actions/useradminpanel.php:304 msgid "Save user settings." msgstr "" -#. TRANS: Page title. -#: actions/userauthorization.php:109 -msgid "Authorize subscription" -msgstr "" - -#. TRANS: Page notice on "Authorize subscription" page. -#: actions/userauthorization.php:115 -msgid "" -"Please check these details to make sure that you want to subscribe to this " -"user’s notices. If you didn’t just ask to subscribe to someone’s notices, " -"click \"Reject\"." -msgstr "" - -#. TRANS: Button text on Authorise Subscription page. -#. TRANS: Submit button text to accept a group membership request on approve group form. -#. TRANS: Submit button text to accept a subscription request on approve sub form. -#: actions/userauthorization.php:202 lib/approvegroupform.php:116 -#: lib/approvesubform.php:110 -msgctxt "BUTTON" -msgid "Accept" -msgstr "" - -#. TRANS: Title for button on Authorise Subscription page. -#. TRANS: Button title to subscribe to a user. -#: actions/userauthorization.php:204 lib/subscribeform.php:132 -msgid "Subscribe to this user." -msgstr "" - -#. TRANS: Button text on Authorise Subscription page. -#. TRANS: Submit button text to reject a group membership request on approve group form. -#. TRANS: Submit button text to reject a subscription request on approve sub form. -#: actions/userauthorization.php:207 lib/approvegroupform.php:118 -#: lib/approvesubform.php:112 -msgctxt "BUTTON" -msgid "Reject" -msgstr "" - -#. TRANS: Title for button on Authorise Subscription page. -#: actions/userauthorization.php:209 -msgid "Reject this subscription." -msgstr "" - -#. TRANS: Client error displayed for an empty authorisation request. -#: actions/userauthorization.php:222 -msgid "No authorization request!" -msgstr "" - -#. TRANS: Accept message header from Authorise subscription page. -#: actions/userauthorization.php:245 -msgid "Subscription authorized" -msgstr "" - -#. TRANS: Accept message text from Authorise subscription page. -#: actions/userauthorization.php:248 -msgid "" -"The subscription has been authorized, but no callback URL was passed. Check " -"with the site's instructions for details on how to authorize the " -"subscription. Your subscription token is:" -msgstr "" - -#. TRANS: Reject message header from Authorise subscription page. -#: actions/userauthorization.php:259 -msgid "Subscription rejected" -msgstr "" - -#. TRANS: Reject message from Authorise subscription page. -#: actions/userauthorization.php:262 -msgid "" -"The subscription has been rejected, but no callback URL was passed. Check " -"with the site's instructions for details on how to fully reject the " -"subscription." -msgstr "" - -#. TRANS: Exception thrown when no valid user is found for an authorisation request. -#. TRANS: %s is a listener URI. -#: actions/userauthorization.php:299 -#, php-format -msgid "Listener URI \"%s\" not found here." -msgstr "" - -#. TRANS: Exception thrown when listenee URI is too long for an authorisation request. -#. TRANS: %s is a listenee URI. -#: actions/userauthorization.php:306 -#, php-format -msgid "Listenee URI \"%s\" is too long." -msgstr "" - -#. TRANS: Exception thrown when listenee URI is a local user for an authorisation request. -#. TRANS: %s is a listenee URI. -#: actions/userauthorization.php:314 -#, php-format -msgid "Listenee URI \"%s\" is a local user." -msgstr "" - -#. TRANS: Exception thrown when profile URL is a local user for an authorisation request. -#. TRANS: %s is a profile URL. -#: actions/userauthorization.php:332 -#, php-format -msgid "Profile URL \"%s\" is for a local user." -msgstr "" - -#. TRANS: Exception thrown when avatar URL is invalid for an authorisation request. -#. TRANS: %s is an avatar URL. -#: actions/userauthorization.php:352 -#, php-format -msgid "Avatar URL \"%s\" is not valid." -msgstr "" - -#. TRANS: Exception thrown when avatar URL could not be read for an authorisation request. -#. TRANS: %s is an avatar URL. -#: actions/userauthorization.php:359 -#, php-format -msgid "Cannot read avatar URL \"%s\"." -msgstr "" - -#. TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request. -#. TRANS: %s is an avatar URL. -#: actions/userauthorization.php:366 -#, php-format -msgid "Wrong image type for avatar URL \"%s\"." -msgstr "" - #. TRANS: Page title for all but the first page of groups for a user. #. TRANS: %1$s is a nickname, %2$d is a page number. #: actions/usergroups.php:67 @@ -7397,7 +7176,7 @@ msgstr "" #: actions/version.php:151 #, php-format msgid "" -"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, " "Inc. and contributors." msgstr "" @@ -7407,12 +7186,12 @@ msgid "Contributors" msgstr "" #. TRANS: Header for StatusNet license section on the version page. -#: actions/version.php:166 +#: actions/version.php:167 msgid "License" msgstr "" #. TRANS: Content part of StatusNet version page. -#: actions/version.php:170 +#: actions/version.php:171 msgid "" "StatusNet is free software: you can redistribute it and/or modify it under " "the terms of the GNU Affero General Public License as published by the Free " @@ -7421,7 +7200,7 @@ msgid "" msgstr "" #. TRANS: Content part of StatusNet version page. -#: actions/version.php:177 +#: actions/version.php:178 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -7431,7 +7210,7 @@ msgstr "" #. TRANS: Content part of StatusNet version page. #. TRANS: %s is a link to the AGPL license with link description "http://www.gnu.org/licenses/agpl.html". -#: actions/version.php:185 +#: actions/version.php:186 #, php-format msgid "" "You should have received a copy of the GNU Affero General Public License " @@ -7439,61 +7218,61 @@ msgid "" msgstr "" #. TRANS: Header for StatusNet plugins section on the version page. -#: actions/version.php:195 +#: actions/version.php:196 msgid "Plugins" msgstr "" #. TRANS: Column header for plugins table on version page. -#: actions/version.php:202 +#: actions/version.php:203 msgctxt "HEADER" msgid "Name" msgstr "" #. TRANS: Column header for plugins table on version page. -#: actions/version.php:204 +#: actions/version.php:205 msgctxt "HEADER" msgid "Version" msgstr "" #. TRANS: Column header for plugins table on version page. -#: actions/version.php:206 +#: actions/version.php:207 msgctxt "HEADER" msgid "Author(s)" msgstr "" #. TRANS: Column header for plugins table on version page. -#: actions/version.php:208 +#: actions/version.php:209 msgctxt "HEADER" msgid "Description" msgstr "" #. TRANS: Activity title when marking a notice as favorite. -#: classes/Fave.php:112 +#: classes/Fave.php:138 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:115 +#: classes/Fave.php:141 #, php-format msgid "%1$s marked notice %2$s as a favorite." msgstr "" #. TRANS: Server exception thrown when a URL cannot be processed. -#: classes/File.php:162 +#: classes/File.php:167 #, php-format msgid "Cannot process URL '%s'" msgstr "" #. TRANS: Server exception thrown when... Robin thinks something is impossible! -#: classes/File.php:194 +#: classes/File.php:199 msgid "Robin thinks something is impossible." msgstr "" #. 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. #. TRANS: %1$s is used for plural. -#: classes/File.php:210 +#: classes/File.php:215 #, php-format msgid "" "No file may be larger than %1$d byte and the file you sent was %2$d bytes. " @@ -7506,7 +7285,7 @@ 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:223 +#: classes/File.php:228 #, 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." @@ -7515,7 +7294,7 @@ msgstr[1] "" #. 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:235 +#: classes/File.php:240 #, 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." @@ -7523,182 +7302,189 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Client exception thrown if a file upload does not have a valid name. -#: classes/File.php:282 classes/File.php:297 +#: classes/File.php:287 classes/File.php:302 msgid "Invalid filename." msgstr "" #. TRANS: Exception thrown providing an invalid profile ID. #. TRANS: %s is the invalid profile ID. -#: classes/Group_join_queue.php:66 classes/Group_member.php:86 +#: classes/Group_join_queue.php:66 classes/Group_member.php:115 #, 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_join_queue.php:79 classes/Group_member.php:99 +#: classes/Group_join_queue.php:79 classes/Group_member.php:128 #, php-format msgid "Group ID %s is invalid." msgstr "" #. TRANS: Exception thrown when joining a group fails. -#: classes/Group_member.php:52 +#: classes/Group_member.php:81 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:65 +#: classes/Group_member.php:94 msgid "Not part of group." msgstr "" #. TRANS: Exception thrown when trying to leave a group fails. -#: classes/Group_member.php:73 +#: classes/Group_member.php:102 msgid "Group leave failed." msgstr "" #. TRANS: Activity title. -#: classes/Group_member.php:148 +#: classes/Group_member.php:174 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:152 +#: classes/Group_member.php:178 #, php-format msgid "%1$s has joined group %2$s." msgstr "" #. TRANS: Server exception thrown when updating a local group fails. -#: classes/Local_group.php:42 +#: classes/Local_group.php:58 msgid "Could not update local group." msgstr "" #. TRANS: Exception thrown when trying creating a login token failed. #. TRANS: %s is the user nickname for which token creation failed. -#: classes/Login_token.php:78 +#: classes/Login_token.php:81 #, php-format msgid "Could not create login token for %s" msgstr "" +#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated. +#: classes/Memcached_DataObject.php:146 classes/Memcached_DataObject.php:254 +#: classes/Memcached_DataObject.php:311 +#, php-format +msgid "Cannot instantiate class %s." +msgstr "" + #. TRANS: Exception thrown when database name or Data Source Name could not be found. -#: classes/Memcached_DataObject.php:555 +#: classes/Memcached_DataObject.php:846 msgid "No database name or DSN found anywhere." msgstr "" #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them. -#: classes/Message.php:45 +#: classes/Message.php:78 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:69 +#: classes/Message.php:102 msgid "Could not insert message." msgstr "" #. TRANS: Message given when a message could not be updated on the server. -#: classes/Message.php:80 +#: classes/Message.php:113 msgid "Could not update message with new URI." msgstr "" #. 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:109 +#: classes/Notice.php:164 #, php-format msgid "No such profile (%1$d) for notice (%2$d)." msgstr "" #. TRANS: Server exception. %s are the error details. -#: classes/Notice.php:211 +#: classes/Notice.php:271 #, php-format msgid "Database error inserting hashtag: %s." msgstr "" #. TRANS: Client exception thrown if a notice contains too many characters. -#: classes/Notice.php:294 +#: classes/Notice.php:357 msgid "Problem saving notice. Too long." msgstr "" #. TRANS: Client exception thrown when trying to save a notice for an unknown user. -#: classes/Notice.php:299 +#: classes/Notice.php:362 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:305 +#: classes/Notice.php:368 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:312 +#: classes/Notice.php:375 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:320 +#: classes/Notice.php:383 msgid "You are banned from posting notices on this site." msgstr "" #. TRANS: Client exception thrown in notice when trying to repeat a missing or deleted notice. -#: classes/Notice.php:367 +#: classes/Notice.php:430 msgid "Cannot repeat; original notice is missing or deleted." msgstr "" #. TRANS: Client error displayed when trying to repeat an own notice. -#: classes/Notice.php:372 +#: classes/Notice.php:435 msgid "You cannot repeat your own notice." msgstr "" #. TRANS: Client error displayed when trying to repeat a non-public notice. -#: classes/Notice.php:378 +#: classes/Notice.php:441 msgid "Cannot repeat a private notice." msgstr "" #. TRANS: Client error displayed when trying to repeat a notice you cannot access. -#: classes/Notice.php:384 +#: classes/Notice.php:447 msgid "Cannot repeat a notice you cannot read." msgstr "" #. TRANS: Client error displayed when trying to repeat an already repeated notice. -#: classes/Notice.php:389 +#: classes/Notice.php:452 msgid "You already repeated that notice." msgstr "" #. TRANS: Client error displayed when trying to reply to a notice a the target has no access to. #. TRANS: %1$s is a user nickname, %2$d is a notice ID (number). -#: classes/Notice.php:401 +#: classes/Notice.php:464 #, php-format msgid "%1$s has no access to notice %2$d." msgstr "" #. TRANS: Server exception thrown when a notice cannot be saved. #. TRANS: Server exception thrown when a notice cannot be updated. -#: classes/Notice.php:490 classes/Notice.php:517 +#: classes/Notice.php:564 classes/Notice.php:591 msgid "Problem saving notice." msgstr "" #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups(). -#: classes/Notice.php:1098 +#: classes/Notice.php:1142 msgid "Bad type provided to saveKnownGroups." msgstr "" #. TRANS: Server exception thrown when an update for a group inbox fails. -#: classes/Notice.php:1190 +#: classes/Notice.php:1234 msgid "Problem saving group inbox." 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:1824 +#: classes/Notice.php:1861 #, php-format msgid "RT @%1$s %2$s" msgstr "" #. TRANS: Full name of a profile or group (%1$s) followed by nickname (%2$s) in parentheses. #. TRANS: Full name of a profile or group followed by nickname in parens -#: classes/Profile.php:186 classes/User_group.php:247 +#: classes/Profile.php:238 classes/User_group.php:307 #, php-format msgctxt "FANCYNAME" msgid "%1$s (%2$s)" @@ -7706,50 +7492,50 @@ 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:1005 +#: classes/Profile.php:1055 #, 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:1014 +#: classes/Profile.php:1064 #, php-format msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error." msgstr "" #. TRANS: Server exception. -#: classes/Profile_list.php:358 +#: classes/Profile_list.php:392 msgid "The tag you are trying to rename to already exists." msgstr "" #. TRANS: Server exception saving new tag without having a tagger specified. -#: classes/Profile_list.php:593 +#: classes/Profile_list.php:627 msgid "No tagger specified." msgstr "" #. TRANS: Server exception saving new tag without having a tag specified. -#: classes/Profile_list.php:598 +#: classes/Profile_list.php:632 msgid "No tag specified." msgstr "" #. TRANS: Server exception saving new tag. -#: classes/Profile_list.php:636 +#: classes/Profile_list.php:670 msgid "Could not create profile tag." msgstr "" #. TRANS: Server exception saving new tag. -#: classes/Profile_list.php:646 +#: classes/Profile_list.php:680 msgid "Could not set profile tag URI." msgstr "" #. TRANS: Server exception saving new tag. -#: classes/Profile_list.php:663 +#: classes/Profile_list.php:697 msgid "Could not set profile tag mainpage." msgstr "" #. TRANS: Client exception thrown trying to set more tags than allowed. -#: classes/Profile_tag.php:157 +#: classes/Profile_tag.php:181 #, php-format msgid "" "You already have created %d or more tags which is the maximum allowed number " @@ -7757,7 +7543,7 @@ msgid "" msgstr "" #. TRANS: Client exception thrown when trying to add more people than allowed to a list. -#: classes/Profile_tag.php:171 +#: classes/Profile_tag.php:195 #, php-format msgid "" "You already have %1$d or more people in list %2$s, which is the maximum " @@ -7765,12 +7551,12 @@ msgid "" msgstr "" #. TRANS: Exception thrown when inserting a list subscription in the database fails. -#: classes/Profile_tag_subscription.php:54 +#: classes/Profile_tag_subscription.php:77 msgid "Adding list subscription failed." msgstr "" #. TRANS: Exception thrown when deleting a list subscription from the database fails. -#: classes/Profile_tag_subscription.php:81 +#: classes/Profile_tag_subscription.php:104 msgid "Removing list subscription failed." msgstr "" @@ -7780,113 +7566,107 @@ msgid "Missing profile." msgstr "" #. TRANS: Exception thrown when a tag cannot be saved. -#: classes/Status_network.php:341 +#: classes/Status_network.php:348 msgid "Unable to save tag." msgstr "" #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing. -#. TRANS: Error message displayed to a banned user when they try to subscribe. -#: classes/Subscription.php:79 lib/oauthstore.php:483 +#: classes/Subscription.php:106 msgid "You have been banned from subscribing." msgstr "" #. TRANS: Exception thrown when trying to subscribe while already subscribed. -#: classes/Subscription.php:84 +#: classes/Subscription.php:111 msgid "Already subscribed!" msgstr "" #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user. -#: classes/Subscription.php:89 +#: classes/Subscription.php:116 msgid "User has blocked you." msgstr "" #. TRANS: Exception thrown when trying to unsibscribe without a subscription. -#: classes/Subscription.php:182 +#: classes/Subscription.php:212 msgid "Not subscribed!" msgstr "" #. TRANS: Exception thrown when trying to unsubscribe a user from themselves. -#: classes/Subscription.php:189 +#: classes/Subscription.php:219 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:217 -msgid "Could not delete subscription OMB token." -msgstr "" - #. TRANS: Exception thrown when a subscription could not be deleted on the server. -#: classes/Subscription.php:229 +#: classes/Subscription.php:236 msgid "Could not delete subscription." msgstr "" #. TRANS: Activity title when subscribing to another person. -#: classes/Subscription.php:271 +#: classes/Subscription.php:275 msgctxt "TITLE" 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:274 +#: classes/Subscription.php:278 #, php-format msgid "%1$s is now following %2$s." msgstr "" #. TRANS: Notice given on user registration. #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname. -#: classes/User.php:414 +#: classes/User.php:466 #, php-format msgid "Welcome to %1$s, @%2$s!" msgstr "" #. TRANS: Exception thrown when trying view "repeated to me". -#: classes/User.php:813 +#: classes/User.php:865 msgid "Not implemented since inbox change." msgstr "" #. TRANS: Server exception. -#: classes/User.php:899 +#: classes/User.php:951 msgid "No single user defined for single-user mode." msgstr "" #. TRANS: Server exception. -#: classes/User.php:903 +#: classes/User.php:955 msgid "Single-user mode code called when not enabled." msgstr "" #. TRANS: Information on password recovery form if no known username or e-mail address was specified. -#: classes/User.php:1037 +#: classes/User.php:1089 msgid "No user with that email address or username." msgstr "" #. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address. -#: classes/User.php:1055 +#: classes/User.php:1107 msgid "No registered email address for that user." msgstr "" #. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form. -#: classes/User.php:1070 +#: classes/User.php:1122 msgid "Error saving address confirmation." msgstr "" #. TRANS: Server exception thrown when creating a group failed. -#: classes/User_group.php:534 +#: classes/User_group.php:606 msgid "Could not create group." msgstr "" #. TRANS: Server exception thrown when updating a group URI failed. -#: classes/User_group.php:544 +#: classes/User_group.php:616 msgid "Could not set group URI." msgstr "" #. TRANS: Server exception thrown when setting group membership failed. -#: classes/User_group.php:567 +#: classes/User_group.php:639 msgid "Could not set group membership." msgstr "" #. TRANS: Server exception thrown when saving local group information failed. -#: classes/User_group.php:584 +#: classes/User_group.php:656 msgid "Could not save local group info." msgstr "" @@ -7928,7 +7708,7 @@ msgid "Edit profile settings." msgstr "" #. TRANS: Link text for link on user profile. -#: lib/accountprofileblock.php:153 +#: lib/accountprofileblock.php:153 lib/groupprofileblock.php:122 msgctxt "BUTTON" msgid "Edit" msgstr "" @@ -7966,6 +7746,15 @@ msgctxt "role" msgid "Moderator" msgstr "" +#. TRANS: Link text for link that will subscribe to a remote profile. +#. TRANS: Button text to subscribe to a user. +#. TRANS: Button text for subscribing to a list. +#: lib/accountprofileblock.php:308 lib/subscribeform.php:130 +#: lib/subscribepeopletagform.php:106 +msgctxt "BUTTON" +msgid "Subscribe" +msgstr "" + #. TRANS: Page title. %1$s is the title, %2$s is the site name. #: lib/action.php:168 #, php-format @@ -7978,25 +7767,25 @@ msgid "Untitled page" msgstr "" #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages. -#: lib/action.php:352 +#: lib/action.php:359 msgctxt "TOOLTIP" msgid "Show more" msgstr "" #. TRANS: Inline reply form submit button: submits a reply comment. -#: lib/action.php:355 +#: lib/action.php:362 msgctxt "BUTTON" msgid "Reply" msgstr "" #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form. #. TRANS: Field label for reply mini form. -#: lib/action.php:358 lib/threadednoticelist.php:396 +#: lib/action.php:365 lib/threadednoticelist.php:412 msgid "Write a reply..." msgstr "" #. TRANS: Tab on the notice form. -#: lib/action.php:608 +#: lib/action.php:623 msgctxt "TAB" msgid "Status" msgstr "" @@ -8005,7 +7794,7 @@ msgstr "" #. TRANS: Text between [] is a link description, text between () is the link itself. #. TRANS: Make sure there is no whitespace between "]" and "(". #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby -#: lib/action.php:984 +#: lib/action.php:999 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -8013,7 +7802,7 @@ msgid "" msgstr "" #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. -#: lib/action.php:987 +#: lib/action.php:1002 #, php-format msgid "**%%site.name%%** is a microblogging service." msgstr "" @@ -8022,7 +7811,7 @@ msgstr "" #. TRANS: Make sure there is no whitespace between "]" and "(". #. TRANS: Text between [] is a link description, text between () is the link itself. #. TRANS: %s is the version of StatusNet that is being used. -#: lib/action.php:994 +#: lib/action.php:1009 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -8032,39 +7821,39 @@ msgstr "" #. TRANS: Content license displayed when license is set to 'private'. #. TRANS: %1$s is the site name. -#: lib/action.php:1012 +#: lib/action.php:1027 #, php-format msgid "Content and data of %1$s are private and confidential." msgstr "" #. TRANS: Content license displayed when license is set to 'allrightsreserved'. #. TRANS: %1$s is the copyright owner. -#: lib/action.php:1019 +#: lib/action.php:1034 #, php-format msgid "Content and data copyright by %1$s. All rights reserved." msgstr "" #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set. -#: lib/action.php:1023 +#: lib/action.php:1038 msgid "Content and data copyright by contributors. All rights reserved." msgstr "" #. TRANS: license message in footer. #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. -#: lib/action.php:1055 +#: lib/action.php:1070 #, php-format msgid "All %1$s content and data are available under the %2$s license." msgstr "" #. TRANS: Pagination message to go to a page displaying information more in the #. TRANS: present than the currently displayed information. -#: lib/action.php:1404 +#: lib/action.php:1423 msgid "After" msgstr "" #. TRANS: Pagination message to go to a page displaying information more in the #. TRANS: past than the currently displayed information. -#: lib/action.php:1414 +#: lib/action.php:1433 msgid "Before" msgstr "" @@ -8147,17 +7936,17 @@ msgid "%1$s %2$s %3$s" msgstr "" #. TRANS: Client exception thrown when there is no source attribute. -#: lib/activityutils.php:201 +#: lib/activityutils.php:229 msgid "Can't handle remote content yet." msgstr "" #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet. -#: lib/activityutils.php:238 +#: lib/activityutils.php:266 msgid "Can't handle embedded XML content yet." msgstr "" #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet. -#: lib/activityutils.php:243 +#: lib/activityutils.php:271 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -8334,47 +8123,6 @@ msgstr "" msgid "Could not authenticate you." msgstr "" -#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer. -#: lib/apioauthstore.php:46 -msgid "Could not create anonymous consumer." -msgstr "" - -#. TRANS: Server error displayed when trying to create an anynymous OAuth application. -#: lib/apioauthstore.php:70 -msgid "Could not create anonymous OAuth application." -msgstr "" - -#. TRANS: Exception thrown when no token association could be found. -#: lib/apioauthstore.php:152 -msgid "" -"Could not find a profile and application associated with the request token." -msgstr "" - -#. TRANS: Exception thrown when no access token can be issued. -#: lib/apioauthstore.php:210 -msgid "Could not issue access token." -msgstr "" - -#. TRANS: Exception thrown when a database error occurs. -#: lib/apioauthstore.php:318 -msgid "Database error inserting OAuth application user." -msgstr "" - -#. TRANS: Exception thrown when a database error occurs. -#: lib/apioauthstore.php:346 -msgid "Database error updating OAuth application user." -msgstr "" - -#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. -#: lib/apioauthstore.php:372 -msgid "Tried to revoke unknown token." -msgstr "" - -#. TRANS: Exception thrown when an attempt is made to remove a revoked token. -#: lib/apioauthstore.php:377 -msgid "Failed to delete revoked token." -msgstr "" - #. TRANS: Form input field label for application icon. #: lib/applicationeditform.php:177 msgid "Icon" @@ -8475,13 +8223,12 @@ msgstr "" #. TRANS: Submit button title. #: lib/applicationeditform.php:353 -msgid "Cancel" +msgid "Cancel application changes." msgstr "" #. TRANS: Submit button title. -#. TRANS: Button text to save a list. -#: lib/applicationeditform.php:357 lib/peopletageditform.php:168 -msgid "Save" +#: lib/applicationeditform.php:357 +msgid "Save application changes." msgstr "" #. TRANS: Name for an anonymous application in application list. @@ -8524,6 +8271,20 @@ msgctxt "BUTTON" msgid "Revoke" msgstr "" +#. TRANS: Submit button text to accept a group membership request on approve group form. +#. TRANS: Submit button text to accept a subscription request on approve sub form. +#: lib/approvegroupform.php:116 lib/approvesubform.php:110 +msgctxt "BUTTON" +msgid "Accept" +msgstr "" + +#. TRANS: Submit button text to reject a group membership request on approve group form. +#. TRANS: Submit button text to reject a subscription request on approve sub form. +#: lib/approvegroupform.php:118 lib/approvesubform.php:112 +msgctxt "BUTTON" +msgid "Reject" +msgstr "" + #. TRANS: Atom feed exception thrown when an author element does not contain a name element. #: lib/atom10feed.php:113 msgid "Author element must contain a name element." @@ -8548,7 +8309,7 @@ msgid "Updates from %1$s's list %2$s on %3$s!" msgstr "" #. TRANS: Title. -#: lib/attachmentnoticesection.php:67 +#: lib/attachmentnoticesection.php:68 msgid "Notices where this attachment appears" msgstr "" @@ -8707,7 +8468,7 @@ msgstr[1] "" #. TRANS: Separator for list of tags. #. TRANS: Separator in list of user names like "Jim, Bob, Mary". -#: lib/command.php:481 lib/command.php:534 lib/threadednoticelist.php:456 +#: lib/command.php:481 lib/command.php:534 lib/threadednoticelist.php:472 msgid ", " msgstr "" @@ -9197,7 +8958,7 @@ msgstr "" #. TRANS: Title of form for deleting a user. #. TRANS: Link text in notice list item to delete a notice. -#: lib/deleteuserform.php:64 lib/noticelistitem.php:659 +#: lib/deleteuserform.php:64 lib/noticelistitem.php:662 msgid "Delete" msgstr "" @@ -9213,8 +8974,7 @@ msgid "Unable to find services for %s." msgstr "" #. TRANS: Form legend for removing the favourite status for a favourite notice. -#. TRANS: Title for button text for removing the favourite status for a favourite notice. -#: lib/disfavorform.php:108 lib/disfavorform.php:140 +#: lib/disfavorform.php:108 msgid "Disfavor this notice" msgstr "" @@ -9224,9 +8984,13 @@ msgctxt "BUTTON" msgid "Disfavor favorite" msgstr "" +#. TRANS: Button title for removing the favourite status for a favourite notice. +#: lib/disfavorform.php:140 +msgid "Remove this notice from your list of favorite notices." +msgstr "" + #. TRANS: Form legend for adding the favourite status to a notice. -#. TRANS: Title for button text for adding the favourite status to a notice. -#: lib/favorform.php:108 lib/favorform.php:139 +#: lib/favorform.php:108 msgid "Favor this notice" msgstr "" @@ -9236,26 +9000,36 @@ msgctxt "BUTTON" msgid "Favor" msgstr "" +#. TRANS: Button title for adding the favourite status to a notice. +#: lib/favorform.php:139 +msgid "Add this notice to your list of favorite notices." +msgstr "" + #. TRANS: Feed type name. -#: lib/feed.php:85 +#: lib/feed.php:88 msgid "RSS 1.0" msgstr "" #. TRANS: Feed type name. -#: lib/feed.php:88 +#: lib/feed.php:91 msgid "RSS 2.0" msgstr "" #. TRANS: Feed type name. -#: lib/feed.php:91 +#: lib/feed.php:94 msgid "Atom" msgstr "" #. TRANS: Feed type name. FOAF stands for Friend of a Friend. -#: lib/feed.php:94 +#: lib/feed.php:97 msgid "FOAF" msgstr "" +#. TRANS: Feed type name. See http://activitystrea.ms/ +#: lib/feed.php:100 +msgid "Activity Streams" +msgstr "" + #. TRANS: Client exception thrown when an imported feed does not have an author. #: lib/feedimporter.php:82 msgid "No author in the feed." @@ -9294,6 +9068,32 @@ msgstr "" msgid "Grant this user the \"%s\" role" msgstr "" +#. TRANS: Header for mini list of group members on a group page (h2). +#: lib/groupaction.php:147 +msgid "Members" +msgstr "" + +#. TRANS: Link to all group members from mini list of group members if group has more than n members. +#: lib/groupaction.php:168 lib/groupaction.php:261 +msgid "All members" +msgstr "" + +#. TRANS: Header for mini list of users with a pending membership request on a group page (h2). +#: lib/groupaction.php:205 +msgid "Pending" +msgstr "" + +#. TRANS: Header for mini list of users that are blocked in a group page (h2). +#: lib/groupaction.php:240 +msgid "Blocked" +msgstr "" + +#. TRANS: Title for list of group administrators on a group page. +#: lib/groupaction.php:312 +msgctxt "TITLE" +msgid "Admins" +msgstr "" + #. TRANS: Button text for the form that will block a user from a group. #: lib/groupblockform.php:124 msgctxt "BUTTON" @@ -9303,7 +9103,7 @@ msgstr "" #. TRANS: Submit button title. #: lib/groupblockform.php:128 msgctxt "TOOLTIP" -msgid "Block this user" +msgid "Block this user so that they can no longer post messages to it." msgstr "" #. TRANS: Field title on group edit form. @@ -9361,98 +9161,31 @@ msgctxt "GROUPADMIN" msgid "Admin" msgstr "" -#. TRANS: Menu item in the group navigation page. -#: lib/groupnav.php:81 -msgctxt "MENU" -msgid "Group" -msgstr "" - -#. TRANS: Tooltip for menu item in the group navigation page. -#. TRANS: %s is the nickname of the group. -#: lib/groupnav.php:84 -#, php-format -msgctxt "TOOLTIP" -msgid "%s group" -msgstr "" - -#. TRANS: Menu item in the group navigation page. -#: lib/groupnav.php:90 -msgctxt "MENU" -msgid "Members" -msgstr "" - -#. TRANS: Tooltip for menu item in the group navigation page. -#. TRANS: %s is the nickname of the group. -#: lib/groupnav.php:93 -#, php-format -msgctxt "TOOLTIP" -msgid "%s group members" -msgstr "" - -#. TRANS: Menu item in the group navigation page. Only shown for group administrators. -#. TRANS: %d is the number of pending members. -#: lib/groupnav.php:106 -#, php-format -msgctxt "MENU" -msgid "Pending members (%d)" -msgid_plural "Pending members (%d)" -msgstr[0] "" -msgstr[1] "" - -#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. -#. TRANS: %s is the nickname of the group. -#: lib/groupnav.php:109 -#, php-format -msgctxt "TOOLTIP" -msgid "%s pending members" -msgstr "" - -#. TRANS: Menu item in the group navigation page. Only shown for group administrators. -#: lib/groupnav.php:116 -msgctxt "MENU" -msgid "Blocked" -msgstr "" - -#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. -#. TRANS: %s is the nickname of the group. -#: lib/groupnav.php:119 -#, php-format -msgctxt "TOOLTIP" -msgid "%s blocked users" -msgstr "" - -#. TRANS: Menu item in the group navigation page. Only shown for group administrators. -#. TRANS: Menu item in primary navigation panel. -#: lib/groupnav.php:125 lib/primarynav.php:66 -msgctxt "MENU" -msgid "Admin" +#. TRANS: Group actions header (h2). Text hidden by default. +#: lib/groupprofileblock.php:93 +msgid "Group actions" msgstr "" #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. -#: lib/groupnav.php:128 +#: lib/groupprofileblock.php:120 #, php-format msgctxt "TOOLTIP" msgid "Edit %s group properties" msgstr "" -#. TRANS: Menu item in the group navigation page. Only shown for group administrators. -#: lib/groupnav.php:134 -msgctxt "MENU" -msgid "Logo" -msgstr "" - #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators. #. TRANS: %s is the nickname of the group. -#: lib/groupnav.php:137 +#: lib/groupprofileblock.php:129 #, php-format msgctxt "TOOLTIP" msgid "Add or edit %s logo" msgstr "" -#. TRANS: Group actions header (h2). Text hidden by default. -#: lib/groupprofileblock.php:94 -msgid "Group actions" +#. TRANS: Link text for link on user profile. +#: lib/groupprofileblock.php:131 +msgctxt "MENU" +msgid "Logo" msgstr "" #. TRANS: Title for groups with the most members section. @@ -9465,11 +9198,15 @@ msgstr "" msgid "Active groups" msgstr "" -#. TRANS: Title for group tag cloud section. -#. TRANS: %s is a group name. -#: lib/grouptagcloudsection.php:57 -#, php-format -msgid "Tags in %s group's notices" +#. TRANS: Link description for seeing all groups. +#. TRANS: Link description for seeing all lists. +#: lib/groupsnav.php:88 lib/listsnav.php:88 +msgid "See all" +msgstr "" + +#. TRANS: Link title for seeing all groups. +#: lib/groupsnav.php:90 +msgid "See all groups you belong to." msgstr "" #. TRANS: Client exception 406 @@ -9570,8 +9307,8 @@ msgctxt "TITLE" msgid "Trends" msgstr "" -#. TRANS: Button text for inviting more users to the StatusNet instance. -#: lib/invitebuttonsection.php:60 +#. TRANS: Default button text for inviting more users to the StatusNet instance. +#: lib/invitebuttonsection.php:56 msgctxt "BUTTON" msgid "Invite more colleagues" msgstr "" @@ -9625,6 +9362,11 @@ msgctxt "BUTTON" msgid "Leave" msgstr "" +#. TRANS: Link title for seeing all lists. +#: lib/listsnav.php:90 +msgid "See all lists you have created." +msgstr "" + #. TRANS: Menu item for logging in to the StatusNet site. #. TRANS: Menu item in primary navigation panel. #: lib/logingroupnav.php:64 lib/primarynav.php:82 @@ -9756,26 +9498,26 @@ msgstr "" #. TRANS: Subject line for SMS-by-email notification messages. #. TRANS: %s is the posting user's nickname. -#: lib/mail.php:513 +#: lib/mail.php:516 #, php-format msgid "%s status" msgstr "" #. TRANS: Subject line for SMS-by-email address confirmation message. -#: lib/mail.php:539 +#: lib/mail.php:542 msgid "SMS confirmation" msgstr "" #. TRANS: Main body heading for SMS-by-email address confirmation message. #. TRANS: %s is the addressed user's nickname. -#: lib/mail.php:543 +#: lib/mail.php:546 #, php-format msgid "%s: confirm you own this phone number with this code:" msgstr "" #. TRANS: Subject for 'nudge' notification email. #. TRANS: %s is the nudging user. -#: lib/mail.php:564 +#: lib/mail.php:567 #, php-format msgid "You have been nudged by %s" msgstr "" @@ -9783,7 +9525,7 @@ msgstr "" #. TRANS: Body for 'nudge' notification email. #. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname, #. TRANS: %3$s is a URL to post notices at. -#: lib/mail.php:571 +#: lib/mail.php:574 #, php-format msgid "" "%1$s (%2$s) is wondering what you are up to these days and is inviting you " @@ -9798,7 +9540,7 @@ msgstr "" #. TRANS: Subject for direct-message notification email. #. TRANS: %s is the sending user's nickname. -#: lib/mail.php:616 +#: lib/mail.php:619 #, php-format msgid "New private message from %s" msgstr "" @@ -9806,7 +9548,7 @@ msgstr "" #. TRANS: Body for direct-message notification email. #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname, #. TRANS: %3$s is the message content, %4$s a URL to the message, -#: lib/mail.php:623 +#: lib/mail.php:626 #, php-format msgid "" "%1$s (%2$s) sent you a private message:\n" @@ -9824,7 +9566,7 @@ 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:673 +#: lib/mail.php:676 #, php-format msgid "%1$s (@%2$s) added your notice as a favorite" msgstr "" @@ -9834,7 +9576,7 @@ msgstr "" #. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text, #. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename, #. TRANS: %7$s is the adding user's nickname. -#: lib/mail.php:680 +#: lib/mail.php:683 #, php-format msgid "" "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n" @@ -9853,7 +9595,7 @@ msgid "" msgstr "" #. TRANS: Line in @-reply notification e-mail. %s is conversation URL. -#: lib/mail.php:737 +#: lib/mail.php:740 #, php-format msgid "" "The full conversation can be read here:\n" @@ -9863,7 +9605,7 @@ 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:745 +#: lib/mail.php:748 #, php-format msgid "%1$s (@%2$s) sent a notice to your attention" msgstr "" @@ -9871,9 +9613,9 @@ msgstr "" #. TRANS: Body of @-reply notification e-mail. #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename, #. TRANS: %3$s is a URL to the notice, %4$s is the notice text, -#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty), +#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty), #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user, -#: lib/mail.php:752 +#: lib/mail.php:755 #, php-format msgid "" "%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n" @@ -9901,14 +9643,14 @@ msgstr "" #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename, #. TRANS: %4$s is a block of profile info about the subscriber. #. TRANS: %5$s is a link to the addressed user's e-mail settings. -#: lib/mail.php:823 lib/mail.php:833 +#: lib/mail.php:826 lib/mail.php:836 #, php-format msgid "%1$s has joined your group %2$s on %3$s." msgstr "" #. TRANS: Subject of pending group join request notification e-mail. #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename. -#: lib/mail.php:870 +#: lib/mail.php:873 #, php-format msgid "%1$s wants to join your group %2$s on %3$s." msgstr "" @@ -9916,7 +9658,7 @@ msgstr "" #. TRANS: Main body of pending group join request notification e-mail. #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename, #. TRANS: %4$s is the URL to the moderation queue page. -#: lib/mail.php:878 +#: lib/mail.php:881 #, php-format msgid "" "%1$s would like to join your group %2$s on %3$s. You may approve or reject " @@ -9998,7 +9740,7 @@ msgstr "" #. TRANS: Submit button title. #: lib/makeadminform.php:124 msgctxt "TOOLTIP" -msgid "Make this user an admin" +msgid "Make this user an admin." msgstr "" #. TRANS: Client exception thrown when a database error was thrown during a file upload operation. @@ -10075,12 +9817,12 @@ msgstr "" #. TRANS: Followed by notice source (usually the client used to send the notice). #. TRANS: Followed by notice source. -#: lib/messagelistitem.php:123 lib/noticelistitem.php:506 +#: lib/messagelistitem.php:123 lib/noticelistitem.php:509 msgid "from" msgstr "" #. TRANS: A possible notice source (web interface). -#: lib/messagelistitem.php:144 lib/noticelistitem.php:501 +#: lib/messagelistitem.php:144 lib/noticelistitem.php:504 msgctxt "SOURCE" msgid "web" msgstr "" @@ -10110,30 +9852,35 @@ msgid "api" msgstr "" #. TRANS: Client exception thrown when no author for an activity was found. -#: lib/microappplugin.php:356 +#: lib/microappplugin.php:358 msgid "Cannot get author for activity." msgstr "" #. TRANS: Client exception thrown when ... -#: lib/microappplugin.php:394 +#: lib/microappplugin.php:396 msgid "Bookmark not posted to this group." msgstr "" #. TRANS: Client exception when ... -#: lib/microappplugin.php:408 +#: lib/microappplugin.php:410 msgid "Object not posted to this user." msgstr "" #. TRANS: Server exception thrown when a micro app plugin uses a target that cannot be handled. -#: lib/microappplugin.php:412 +#: lib/microappplugin.php:414 msgid "Do not know how to handle this kind of target." msgstr "" #. TRANS: Server exception thrown when a micro app plugin developer has not done his job too well. -#: lib/microappplugin.php:554 +#: lib/microappplugin.php:556 msgid "You must implement either adaptNoticeListItem() or showNotice()." msgstr "" +#. TRANS: Link description to show more items in a list. +#: lib/moremenu.php:98 +msgid "More ▼" +msgstr "" + #. TRANS: Validation error in form for registration, profile and group settings, etc. #: lib/nickname.php:178 msgid "Nickname cannot be empty." @@ -10186,28 +9933,28 @@ msgid "" msgstr "" #. TRANS: Separator in profile addressees list. -#: lib/noticelistitem.php:243 +#: lib/noticelistitem.php:246 msgctxt "SEPARATOR" msgid ", " msgstr "" #. TRANS: Used in coordinates as abbreviation of north. -#: lib/noticelistitem.php:429 +#: lib/noticelistitem.php:432 msgid "N" msgstr "" #. TRANS: Used in coordinates as abbreviation of south. -#: lib/noticelistitem.php:431 +#: lib/noticelistitem.php:434 msgid "S" msgstr "" #. TRANS: Used in coordinates as abbreviation of east. -#: lib/noticelistitem.php:433 +#: lib/noticelistitem.php:436 msgid "E" msgstr "" #. TRANS: Used in coordinates as abbreviation of west. -#: lib/noticelistitem.php:435 +#: lib/noticelistitem.php:438 msgid "W" msgstr "" @@ -10216,43 +9963,43 @@ msgstr "" #. TRANS: %3$s is lattitude seconds, %4$s is N (north) or S (south) depending on lattitude, #. TRANS: %5$s is longitude degrees, %6$s is longitude minutes, #. TRANS: %7$s is longitude seconds, %8$s is E (east) or W (west) depending on longitude, -#: lib/noticelistitem.php:442 +#: lib/noticelistitem.php:445 #, php-format msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s" msgstr "" #. TRANS: Followed by geo location. -#: lib/noticelistitem.php:452 +#: lib/noticelistitem.php:455 msgid "at" msgstr "" #. TRANS: Addition in notice list item if notice is part of a conversation. -#: lib/noticelistitem.php:567 +#: lib/noticelistitem.php:570 msgid "in context" msgstr "" #. TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname. -#: lib/noticelistitem.php:602 +#: lib/noticelistitem.php:605 msgid "Repeated by" msgstr "" #. TRANS: Link title in notice list item to reply to a notice. -#: lib/noticelistitem.php:629 -msgid "Reply to this notice" +#: lib/noticelistitem.php:632 +msgid "Reply to this notice." msgstr "" #. TRANS: Link text in notice list item to reply to a notice. -#: lib/noticelistitem.php:631 +#: lib/noticelistitem.php:634 msgid "Reply" msgstr "" #. TRANS: Link title in notice list item to delete a notice. -#: lib/noticelistitem.php:657 -msgid "Delete this notice" +#: lib/noticelistitem.php:660 +msgid "Delete this notice from the timeline." msgstr "" #. TRANS: Title for repeat form status in notice list when a notice has been repeated. -#: lib/noticelistitem.php:680 +#: lib/noticelistitem.php:683 msgid "Notice repeated." msgstr "" @@ -10277,31 +10024,6 @@ msgstr "" msgid "Send a nudge to this user." msgstr "" -#. TRANS: Exception thrown when creating a new profile fails in OAuth store. -#: lib/oauthstore.php:291 -msgid "Error inserting new profile." -msgstr "" - -#. TRANS: Exception thrown when creating a new avatar fails in OAuth store. -#: lib/oauthstore.php:300 -msgid "Error inserting avatar." -msgstr "" - -#. TRANS: Exception thrown when creating a remote profile fails in OAuth store. -#: lib/oauthstore.php:322 -msgid "Error inserting remote profile." -msgstr "" - -#. TRANS: Exception thrown when a notice is denied because it has been sent before. -#: lib/oauthstore.php:362 -msgid "Duplicate notice." -msgstr "" - -#. TRANS: Exception thrown when creating a new subscription fails in OAuth store. -#: lib/oauthstore.php:509 -msgid "Could not insert new subscription." -msgstr "" - #. TRANS: Server exception thrown in oEmbed action if no API endpoint is available. #: lib/oembedhelper.php:135 msgid "No oEmbed API endpoint available." @@ -10332,6 +10054,11 @@ msgid_plural "Describe the list or topic in %d characters." msgstr[0] "" msgstr[1] "" +#. TRANS: Button text to save a list. +#: lib/peopletageditform.php:168 +msgid "Save" +msgstr "" + #. TRANS: Button title to delete a list. #: lib/peopletageditform.php:175 msgid "Delete this list." @@ -10394,11 +10121,6 @@ msgstr "" msgid "Edit %s list by you." msgstr "" -#. TRANS: Link description for link to list of users tagged with a tag. -#: lib/peopletaglist.php:173 -msgid "Tagged" -msgstr "" - #. TRANS: Title for link to edit list settings. #: lib/peopletaglist.php:196 msgid "Edit list settings." @@ -10586,6 +10308,12 @@ msgstr "" msgid "Change your personal settings." msgstr "" +#. TRANS: Menu item in primary navigation panel. +#: lib/primarynav.php:66 +msgctxt "MENU" +msgid "Admin" +msgstr "" + #. TRANS: Menu item title in primary navigation panel. #: lib/primarynav.php:68 msgid "Site configuration." @@ -10607,17 +10335,6 @@ msgstr "" msgid "Login to the site." msgstr "" -#. TRANS: Menu item in primary navigation panel. -#: lib/primarynav.php:92 -msgctxt "MENU" -msgid "Search" -msgstr "" - -#. TRANS: Menu item title in primary navigation panel. -#: lib/primarynav.php:94 -msgid "Search the site." -msgstr "" - #. TRANS: H2 text for user subscription statistics. #: lib/profileaction.php:128 msgid "Following" @@ -10628,6 +10345,11 @@ msgstr "" msgid "Followers" msgstr "" +#. TRANS: H2 text for user statistics. +#: lib/profileaction.php:196 +msgid "Statistics" +msgstr "" + #. TRANS: Label for user statistics. #: lib/profileaction.php:204 msgid "User ID" @@ -10720,7 +10442,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:1152 +#: lib/router.php:1146 msgid "Page not found." msgstr "" @@ -10747,8 +10469,9 @@ msgid "Keyword(s)" msgstr "" #. TRANS: Button text for searching site. +#. TRANS: Button text for search button on search form. #. TRANS: Button text to search profiles. -#: lib/searchaction.php:116 lib/togglepeopletag.php:134 +#: lib/searchaction.php:116 lib/searchform.php:76 lib/togglepeopletag.php:134 msgctxt "BUTTON" msgid "Search" msgstr "" @@ -10967,6 +10690,47 @@ msgstr "" msgid "Silence this user" msgstr "" +#. TRANS: Server error displayed when trying to create an anynymous OAuth consumer. +#: lib/statusnetoauthstore.php:48 +msgid "Could not create anonymous consumer." +msgstr "" + +#. TRANS: Server error displayed when trying to create an anynymous OAuth application. +#: lib/statusnetoauthstore.php:72 +msgid "Could not create anonymous OAuth application." +msgstr "" + +#. TRANS: Exception thrown when no token association could be found. +#: lib/statusnetoauthstore.php:154 +msgid "" +"Could not find a profile and application associated with the request token." +msgstr "" + +#. TRANS: Exception thrown when no access token can be issued. +#: lib/statusnetoauthstore.php:212 +msgid "Could not issue access token." +msgstr "" + +#. TRANS: Exception thrown when a database error occurs. +#: lib/statusnetoauthstore.php:320 +msgid "Database error inserting OAuth application user." +msgstr "" + +#. TRANS: Exception thrown when a database error occurs. +#: lib/statusnetoauthstore.php:348 +msgid "Database error updating OAuth application user." +msgstr "" + +#. TRANS: Exception thrown when an attempt is made to revoke an unknown token. +#: lib/statusnetoauthstore.php:374 +msgid "Tried to revoke unknown token." +msgstr "" + +#. TRANS: Exception thrown when an attempt is made to remove a revoked token. +#: lib/statusnetoauthstore.php:379 +msgid "Failed to delete revoked token." +msgstr "" + #. TRANS: Menu item in local navigation menu. #: lib/subgroupnav.php:85 msgctxt "MENU" @@ -11033,6 +10797,11 @@ msgstr "" msgid "Subscribe to this user" msgstr "" +#. TRANS: Button title to subscribe to a user. +#: lib/subscribeform.php:132 +msgid "Subscribe to this user." +msgstr "" + #. TRANS: Title of personal tag cloud section. #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 @@ -11126,7 +10895,7 @@ msgstr "" #. TRANS: Link to show replies for a notice. #. TRANS: %d is the number of replies to a notice and used for plural. -#: lib/threadednoticelist.php:355 +#: lib/threadednoticelist.php:371 #, php-format msgid "Show reply" msgid_plural "Show all %d replies" @@ -11134,21 +10903,21 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Reference to the logged in user in favourite list. -#: lib/threadednoticelist.php:421 +#: lib/threadednoticelist.php:437 msgctxt "FAVELIST" msgid "You" msgstr "" #. TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this". #. TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list. -#: lib/threadednoticelist.php:459 +#: lib/threadednoticelist.php:475 #, php-format msgctxt "FAVELIST" msgid "%1$s and %2$s" msgstr "" #. TRANS: List message for notice favoured by logged in user. -#: lib/threadednoticelist.php:493 +#: lib/threadednoticelist.php:509 msgctxt "FAVELIST" msgid "You like this." msgstr "" @@ -11156,7 +10925,7 @@ msgstr "" #. TRANS: List message for when more than 4 people like something. #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice. #. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d). -#: lib/threadednoticelist.php:498 +#: lib/threadednoticelist.php:514 #, php-format msgid "%%s and %d others like this." msgid_plural "%%s and %d others like this." @@ -11166,7 +10935,7 @@ msgstr[1] "" #. TRANS: List message for favoured notices. #. TRANS: %%s is a list of users liking a notice. #. TRANS: Plural is based on the number of of users that have favoured a notice. -#: lib/threadednoticelist.php:506 +#: lib/threadednoticelist.php:522 #, php-format msgid "%%s likes this." msgid_plural "%%s like this." @@ -11174,14 +10943,14 @@ msgstr[0] "" msgstr[1] "" #. TRANS: List message for notice repeated by logged in user. -#: lib/threadednoticelist.php:559 +#: lib/threadednoticelist.php:577 msgctxt "REPEATLIST" msgid "You have repeated this notice." msgstr "" #. TRANS: List message for repeated notices. #. TRANS: %d is the number of users that have repeated a notice. -#: lib/threadednoticelist.php:563 +#: lib/threadednoticelist.php:581 #, php-format msgid "One person has repeated this notice." msgid_plural "%d people have repeated this notice." @@ -11297,8 +11066,7 @@ msgid "Unsilence this user" msgstr "" #. TRANS: Form legend on unsubscribe form. -#. TRANS: Button title on unsubscribe form. -#: lib/unsubscribeform.php:109 lib/unsubscribeform.php:134 +#: lib/unsubscribeform.php:109 msgid "Unsubscribe from this user" msgstr "" @@ -11309,6 +11077,11 @@ msgctxt "BUTTON" msgid "Unsubscribe" msgstr "" +#. TRANS: Button title on unsubscribe form. +#: lib/unsubscribeform.php:134 +msgid "Unsubscribe from this user." +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 @@ -11322,17 +11095,17 @@ msgid "Not allowed to log in." msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1343 +#: lib/util.php:1346 msgid "a few seconds ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1346 +#: lib/util.php:1349 msgid "about a minute ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1350 +#: lib/util.php:1353 #, php-format msgid "about one minute ago" msgid_plural "about %d minutes ago" @@ -11340,12 +11113,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1353 +#: lib/util.php:1356 msgid "about an hour ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1357 +#: lib/util.php:1360 #, php-format msgid "about one hour ago" msgid_plural "about %d hours ago" @@ -11353,12 +11126,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1360 +#: lib/util.php:1363 msgid "about a day ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1364 +#: lib/util.php:1367 #, php-format msgid "about one day ago" msgid_plural "about %d days ago" @@ -11366,12 +11139,12 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1367 +#: lib/util.php:1370 msgid "about a month ago" msgstr "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1371 +#: lib/util.php:1374 #, php-format msgid "about one month ago" msgid_plural "about %d months ago" @@ -11379,7 +11152,7 @@ msgstr[0] "" msgstr[1] "" #. TRANS: Used in notices to indicate when the notice was made compared to now. -#: lib/util.php:1374 +#: lib/util.php:1377 msgid "about a year ago" msgstr "" @@ -11405,43 +11178,3 @@ msgstr "" #, php-format msgid "Getting backup from file '%s'." msgstr "" - -#. TRANS: Server exception. %s is a URL. -#: scripts/update_ostatus_profiles.php:56 -#, php-format -msgid "Invalid avatar URL %s." -msgstr "" - -#. TRANS: Server exception. %s is a URI. -#: scripts/update_ostatus_profiles.php:67 -#, php-format -msgid "Tried to update avatar for unsaved remote profile %s." -msgstr "" - -#. TRANS: Server exception. %s is a URL. -#: scripts/update_ostatus_profiles.php:77 -#, php-format -msgid "Unable to fetch avatar from %s." -msgstr "" - -#. TRANS: Exception. %s is a profile URL. -#: scripts/update_ostatus_profiles.php:136 -#, php-format -msgid "Could not reach profile page %s." -msgstr "" - -#. TRANS: Exception. %s is a URL. -#: scripts/update_ostatus_profiles.php:187 -#, php-format -msgid "Could not find a feed URL for profile page %s." -msgstr "" - -#. TRANS: Exception. -#: scripts/update_ostatus_profiles.php:212 -msgid "Not a valid webfinger address." -msgstr "" - -#: scripts/update_ostatus_profiles.php:264 -#, php-format -msgid "Could not find a valid profile for \"%s\"." -msgstr ""