From 6ea9eb33d2767df26fb757e3b507dd2e7e7c7286 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 1 Mar 2010 15:09:44 +0100 Subject: [PATCH 1/4] Update pot file --- locale/statusnet.po | 389 +++++++++++++++++++++++--------------------- 1 file changed, 202 insertions(+), 187 deletions(-) diff --git a/locale/statusnet.po b/locale/statusnet.po index cf44e2d3c9..8e14344978 100644 --- a/locale/statusnet.po +++ b/locale/statusnet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 23:49+0000\n" +"POT-Creation-Date: 2010-03-01 14:08+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326 +#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:337 msgid "Access" msgstr "" @@ -88,14 +88,15 @@ msgstr "" #: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79 #: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75 #: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58 -#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76 -#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154 -#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116 -#: actions/showfavorites.php:105 actions/userbyid.php:74 -#: actions/usergroups.php:91 actions/userrss.php:38 actions/xrds.php:71 -#: lib/command.php:163 lib/command.php:302 lib/command.php:355 -#: lib/command.php:401 lib/command.php:462 lib/command.php:518 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 +#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116 +#: actions/otp.php:76 actions/remotesubscribe.php:145 +#: actions/remotesubscribe.php:154 actions/replies.php:73 +#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105 +#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38 +#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302 +#: lib/command.php:355 lib/command.php:401 lib/command.php:462 +#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82 +#: lib/profileaction.php:77 msgid "No such user." msgstr "" @@ -171,20 +172,20 @@ msgstr "" #: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156 #: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100 #: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100 -#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:136 +#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138 #: actions/apigroupismember.php:114 actions/apigroupjoin.php:155 #: actions/apigroupleave.php:141 actions/apigrouplist.php:132 #: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106 -#: actions/apigroupshow.php:115 actions/apihelptest.php:88 +#: actions/apigroupshow.php:105 actions/apihelptest.php:88 #: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112 -#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:137 +#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:131 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111 #: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187 -#: actions/apitimelinegroup.php:195 actions/apitimelinehome.php:184 +#: actions/apitimelinegroup.php:185 actions/apitimelinehome.php:184 #: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152 #: actions/apitimelineretweetedtome.php:121 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 -#: actions/apitimelineuser.php:207 actions/apiusershow.php:101 +#: actions/apitimelineuser.php:196 actions/apiusershow.php:101 msgid "API method not found." msgstr "" @@ -216,8 +217,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:194 #: actions/apiaccountupdateprofilecolors.php:185 #: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108 -#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80 -#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84 +#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74 +#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66 +#: lib/profileaction.php:84 msgid "User has no profile." msgstr "" @@ -241,7 +243,7 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 -#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297 +#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 msgid "Unable to save your design settings." @@ -351,87 +353,87 @@ msgstr "" msgid "Could not find target user." msgstr "" -#: actions/apigroupcreate.php:164 actions/editgroup.php:182 +#: actions/apigroupcreate.php:166 actions/editgroup.php:186 #: actions/newgroup.php:126 actions/profilesettings.php:215 #: actions/register.php:205 msgid "Nickname must have only lowercase letters and numbers and no spaces." msgstr "" -#: actions/apigroupcreate.php:173 actions/editgroup.php:186 +#: actions/apigroupcreate.php:175 actions/editgroup.php:190 #: actions/newgroup.php:130 actions/profilesettings.php:238 #: actions/register.php:208 msgid "Nickname already in use. Try another one." msgstr "" -#: actions/apigroupcreate.php:180 actions/editgroup.php:189 +#: actions/apigroupcreate.php:182 actions/editgroup.php:193 #: actions/newgroup.php:133 actions/profilesettings.php:218 #: actions/register.php:210 msgid "Not a valid nickname." msgstr "" -#: actions/apigroupcreate.php:196 actions/editapplication.php:215 -#: actions/editgroup.php:195 actions/newapplication.php:203 +#: actions/apigroupcreate.php:198 actions/editapplication.php:215 +#: actions/editgroup.php:199 actions/newapplication.php:203 #: actions/newgroup.php:139 actions/profilesettings.php:222 #: actions/register.php:217 msgid "Homepage is not a valid URL." msgstr "" -#: actions/apigroupcreate.php:205 actions/editgroup.php:198 +#: actions/apigroupcreate.php:207 actions/editgroup.php:202 #: actions/newgroup.php:142 actions/profilesettings.php:225 #: actions/register.php:220 msgid "Full name is too long (max 255 chars)." msgstr "" -#: actions/apigroupcreate.php:213 actions/editapplication.php:190 +#: actions/apigroupcreate.php:215 actions/editapplication.php:190 #: actions/newapplication.php:172 #, php-format msgid "Description is too long (max %d chars)." msgstr "" -#: actions/apigroupcreate.php:224 actions/editgroup.php:204 +#: actions/apigroupcreate.php:226 actions/editgroup.php:208 #: actions/newgroup.php:148 actions/profilesettings.php:232 #: actions/register.php:227 msgid "Location is too long (max 255 chars)." msgstr "" -#: actions/apigroupcreate.php:243 actions/editgroup.php:215 +#: actions/apigroupcreate.php:245 actions/editgroup.php:219 #: actions/newgroup.php:159 #, php-format msgid "Too many aliases! Maximum %d." msgstr "" -#: actions/apigroupcreate.php:264 actions/editgroup.php:224 +#: actions/apigroupcreate.php:266 actions/editgroup.php:228 #: actions/newgroup.php:168 #, php-format msgid "Invalid alias: \"%s\"" msgstr "" -#: actions/apigroupcreate.php:273 actions/editgroup.php:228 +#: actions/apigroupcreate.php:275 actions/editgroup.php:232 #: actions/newgroup.php:172 #, php-format msgid "Alias \"%s\" already in use. Try another one." msgstr "" -#: actions/apigroupcreate.php:286 actions/editgroup.php:234 +#: actions/apigroupcreate.php:288 actions/editgroup.php:238 #: actions/newgroup.php:178 msgid "Alias can't be the same as nickname." msgstr "" #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 +#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91 msgid "Group not found!" msgstr "" -#: actions/apigroupjoin.php:110 actions/joingroup.php:90 +#: actions/apigroupjoin.php:110 actions/joingroup.php:100 msgid "You are already a member of that group." msgstr "" -#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221 +#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221 msgid "You have been blocked from that group by the admin." msgstr "" -#: actions/apigroupjoin.php:138 actions/joingroup.php:124 +#: actions/apigroupjoin.php:138 actions/joingroup.php:134 #, php-format msgid "Could not join user %1$s to group %2$s." msgstr "" @@ -440,7 +442,7 @@ msgstr "" msgid "You are not a member of this group." msgstr "" -#: actions/apigroupleave.php:124 actions/leavegroup.php:119 +#: actions/apigroupleave.php:124 actions/leavegroup.php:129 #, php-format msgid "Could not remove user %1$s from group %2$s." msgstr "" @@ -471,7 +473,7 @@ msgstr "" #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268 #: actions/deletenotice.php:157 actions/disfavor.php:74 #: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54 -#: actions/groupblock.php:66 actions/grouplogo.php:309 +#: actions/groupblock.php:66 actions/grouplogo.php:312 #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 @@ -491,11 +493,11 @@ msgid "Invalid nickname / password!" msgstr "" #: actions/apioauthauthorize.php:159 -msgid "Database error deleting OAuth application user." +msgid "DB error deleting OAuth app user." msgstr "" #: actions/apioauthauthorize.php:185 -msgid "Database error inserting OAuth application user." +msgid "DB error inserting OAuth app user." msgstr "" #: actions/apioauthauthorize.php:214 @@ -512,7 +514,7 @@ msgstr "" #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 #: actions/designadminpanel.php:103 actions/editapplication.php:139 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 +#: actions/emailsettings.php:256 actions/grouplogo.php:322 #: actions/imsettings.php:220 actions/newapplication.php:121 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 #: actions/smssettings.php:248 lib/designsettings.php:304 @@ -541,7 +543,7 @@ msgstr "" #: actions/apioauthauthorize.php:313 actions/login.php:230 #: actions/profilesettings.php:106 actions/register.php:424 -#: actions/showgroup.php:236 actions/tagother.php:94 +#: actions/showgroup.php:244 actions/tagother.php:94 #: actions/userauthorization.php:145 lib/groupeditform.php:152 #: lib/userprofile.php:131 msgid "Nickname" @@ -623,12 +625,12 @@ msgid "%1$s updates favorited by %2$s / %2$s." msgstr "" #: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118 -#: actions/grouprss.php:131 actions/userrss.php:90 +#: actions/grouprss.php:138 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "" -#: actions/apitimelinegroup.php:114 actions/apitimelineuser.php:126 +#: actions/apitimelinegroup.php:112 actions/apitimelineuser.php:124 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" @@ -685,8 +687,7 @@ msgstr "" #: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73 #: actions/editgroup.php:84 actions/groupdesignsettings.php:84 #: actions/grouplogo.php:86 actions/groupmembers.php:76 -#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76 -#: actions/showgroup.php:121 +#: actions/grouprss.php:91 actions/showgroup.php:121 msgid "No nickname." msgstr "" @@ -698,7 +699,7 @@ msgstr "" msgid "Invalid size." msgstr "" -#: actions/avatarsettings.php:67 actions/showgroup.php:221 +#: actions/avatarsettings.php:67 actions/showgroup.php:229 #: lib/accountsettingsaction.php:112 msgid "Avatar" msgstr "" @@ -715,30 +716,30 @@ msgid "User without matching profile" msgstr "" #: actions/avatarsettings.php:119 actions/avatarsettings.php:197 -#: actions/grouplogo.php:251 +#: actions/grouplogo.php:254 msgid "Avatar settings" msgstr "" #: actions/avatarsettings.php:127 actions/avatarsettings.php:205 -#: actions/grouplogo.php:199 actions/grouplogo.php:259 +#: actions/grouplogo.php:202 actions/grouplogo.php:262 msgid "Original" msgstr "" #: actions/avatarsettings.php:142 actions/avatarsettings.php:217 -#: actions/grouplogo.php:210 actions/grouplogo.php:271 +#: actions/grouplogo.php:213 actions/grouplogo.php:274 msgid "Preview" msgstr "" #: actions/avatarsettings.php:149 actions/showapplication.php:252 -#: lib/deleteuserform.php:66 lib/noticelist.php:637 +#: lib/deleteuserform.php:66 lib/noticelist.php:655 msgid "Delete" msgstr "" -#: actions/avatarsettings.php:166 actions/grouplogo.php:233 +#: actions/avatarsettings.php:166 actions/grouplogo.php:236 msgid "Upload" msgstr "" -#: actions/avatarsettings.php:231 actions/grouplogo.php:286 +#: actions/avatarsettings.php:231 actions/grouplogo.php:289 msgid "Crop" msgstr "" @@ -746,7 +747,7 @@ msgstr "" msgid "Pick a square area of the image to be your avatar" msgstr "" -#: actions/avatarsettings.php:343 actions/grouplogo.php:377 +#: actions/avatarsettings.php:343 actions/grouplogo.php:380 msgid "Lost our file data." msgstr "" @@ -778,22 +779,22 @@ msgid "" msgstr "" #: actions/block.php:143 actions/deleteapplication.php:153 -#: actions/deletenotice.php:145 actions/deleteuser.php:147 +#: actions/deletenotice.php:145 actions/deleteuser.php:150 #: actions/groupblock.php:178 msgid "No" msgstr "" -#: actions/block.php:143 actions/deleteuser.php:147 +#: actions/block.php:143 actions/deleteuser.php:150 msgid "Do not block this user" msgstr "" #: actions/block.php:144 actions/deleteapplication.php:158 -#: actions/deletenotice.php:146 actions/deleteuser.php:148 +#: actions/deletenotice.php:146 actions/deleteuser.php:151 #: actions/groupblock.php:179 lib/repeatform.php:132 msgid "Yes" msgstr "" -#: actions/block.php:144 actions/groupmembers.php:348 lib/blockform.php:80 +#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80 msgid "Block this user" msgstr "" @@ -801,39 +802,43 @@ msgstr "" msgid "Failed to save block information." msgstr "" -#: actions/blockedfromgroup.php:80 actions/editgroup.php:96 -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 -#: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86 -#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260 +#: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87 +#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62 +#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83 +#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102 +#: actions/groupmembers.php:83 actions/groupmembers.php:90 +#: actions/grouprss.php:98 actions/grouprss.php:105 +#: actions/groupunblock.php:86 actions/joingroup.php:82 +#: actions/joingroup.php:93 actions/leavegroup.php:82 +#: actions/leavegroup.php:93 actions/makeadmin.php:86 +#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212 +#: lib/command.php:260 msgid "No such group." msgstr "" -#: actions/blockedfromgroup.php:90 +#: actions/blockedfromgroup.php:97 #, php-format msgid "%s blocked profiles" msgstr "" -#: actions/blockedfromgroup.php:93 +#: actions/blockedfromgroup.php:100 #, php-format msgid "%1$s blocked profiles, page %2$d" msgstr "" -#: actions/blockedfromgroup.php:108 +#: actions/blockedfromgroup.php:115 msgid "A list of the users blocked from joining this group." msgstr "" -#: actions/blockedfromgroup.php:281 +#: actions/blockedfromgroup.php:288 msgid "Unblock user from group" msgstr "" -#: actions/blockedfromgroup.php:313 lib/unblockform.php:69 +#: actions/blockedfromgroup.php:320 lib/unblockform.php:69 msgid "Unblock" msgstr "" -#: actions/blockedfromgroup.php:313 lib/unblockform.php:80 +#: actions/blockedfromgroup.php:320 lib/unblockform.php:80 msgid "Unblock this user" msgstr "" @@ -876,7 +881,7 @@ msgid "Couldn't delete email confirmation." msgstr "" #: actions/confirmaddress.php:144 -msgid "Confirm address" +msgid "Confirm Address" msgstr "" #: actions/confirmaddress.php:159 @@ -963,7 +968,7 @@ msgstr "" msgid "Do not delete this notice" msgstr "" -#: actions/deletenotice.php:146 lib/noticelist.php:637 +#: actions/deletenotice.php:146 lib/noticelist.php:655 msgid "Delete this notice" msgstr "" @@ -979,18 +984,18 @@ msgstr "" msgid "Delete user" msgstr "" -#: actions/deleteuser.php:135 +#: actions/deleteuser.php:136 msgid "" "Are you sure you want to delete this user? This will clear all data about " "the user from the database, without a backup." msgstr "" -#: actions/deleteuser.php:148 lib/deleteuserform.php:77 +#: actions/deleteuser.php:151 lib/deleteuserform.php:77 msgid "Delete this user" msgstr "" #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124 -#: lib/adminpanelaction.php:316 lib/groupnav.php:119 +#: lib/adminpanelaction.php:327 lib/groupnav.php:119 msgid "Design" msgstr "" @@ -1182,29 +1187,29 @@ msgstr "" msgid "You must be logged in to create a group." msgstr "" -#: actions/editgroup.php:103 actions/editgroup.php:168 -#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106 +#: actions/editgroup.php:107 actions/editgroup.php:172 +#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109 msgid "You must be an admin to edit the group." msgstr "" -#: actions/editgroup.php:154 +#: actions/editgroup.php:158 msgid "Use this form to edit the group." msgstr "" -#: actions/editgroup.php:201 actions/newgroup.php:145 +#: actions/editgroup.php:205 actions/newgroup.php:145 #, php-format msgid "description is too long (max %d chars)." msgstr "" -#: actions/editgroup.php:253 +#: actions/editgroup.php:258 msgid "Could not update group." msgstr "" -#: actions/editgroup.php:259 classes/User_group.php:433 +#: actions/editgroup.php:264 classes/User_group.php:478 msgid "Could not create aliases." msgstr "" -#: actions/editgroup.php:269 +#: actions/editgroup.php:280 msgid "Options saved." msgstr "" @@ -1533,7 +1538,7 @@ msgstr "" msgid "User is not a member of group." msgstr "" -#: actions/groupblock.php:136 actions/groupmembers.php:316 +#: actions/groupblock.php:136 actions/groupmembers.php:323 msgid "Block user from group" msgstr "" @@ -1565,86 +1570,86 @@ msgstr "" msgid "You must be logged in to edit a group." msgstr "" -#: actions/groupdesignsettings.php:141 +#: actions/groupdesignsettings.php:144 msgid "Group design" msgstr "" -#: actions/groupdesignsettings.php:152 +#: actions/groupdesignsettings.php:155 msgid "" "Customize the way your group looks with a background image and a colour " "palette of your choice." msgstr "" -#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186 +#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186 #: lib/designsettings.php:391 lib/designsettings.php:413 msgid "Couldn't update your design." msgstr "" -#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231 +#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231 msgid "Design preferences saved." msgstr "" -#: actions/grouplogo.php:139 actions/grouplogo.php:192 +#: actions/grouplogo.php:142 actions/grouplogo.php:195 msgid "Group logo" msgstr "" -#: actions/grouplogo.php:150 +#: actions/grouplogo.php:153 #, php-format msgid "" "You can upload a logo image for your group. The maximum file size is %s." msgstr "" -#: actions/grouplogo.php:178 +#: actions/grouplogo.php:181 msgid "User without matching profile." msgstr "" -#: actions/grouplogo.php:362 +#: actions/grouplogo.php:365 msgid "Pick a square area of the image to be the logo." msgstr "" -#: actions/grouplogo.php:396 +#: actions/grouplogo.php:399 msgid "Logo updated." msgstr "" -#: actions/grouplogo.php:398 +#: actions/grouplogo.php:401 msgid "Failed updating logo." msgstr "" -#: actions/groupmembers.php:93 lib/groupnav.php:92 +#: actions/groupmembers.php:100 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "" -#: actions/groupmembers.php:96 +#: actions/groupmembers.php:103 #, php-format msgid "%1$s group members, page %2$d" msgstr "" -#: actions/groupmembers.php:111 +#: actions/groupmembers.php:118 msgid "A list of the users in this group." msgstr "" -#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107 +#: actions/groupmembers.php:182 lib/action.php:448 lib/groupnav.php:107 msgid "Admin" msgstr "" -#: actions/groupmembers.php:348 lib/blockform.php:69 +#: actions/groupmembers.php:355 lib/blockform.php:69 msgid "Block" msgstr "" -#: actions/groupmembers.php:443 +#: actions/groupmembers.php:450 msgid "Make user an admin of the group" msgstr "" -#: actions/groupmembers.php:475 +#: actions/groupmembers.php:482 msgid "Make Admin" msgstr "" -#: actions/groupmembers.php:475 +#: actions/groupmembers.php:482 msgid "Make this user an admin" msgstr "" -#: actions/grouprss.php:133 +#: actions/grouprss.php:140 #, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "" @@ -1924,7 +1929,11 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "" -#: actions/joingroup.php:131 +#: actions/joingroup.php:88 actions/leavegroup.php:88 +msgid "No nickname or ID." +msgstr "" + +#: actions/joingroup.php:141 #, php-format msgid "%1$s joined group %2$s" msgstr "" @@ -1933,11 +1942,11 @@ msgstr "" msgid "You must be logged in to leave a group." msgstr "" -#: actions/leavegroup.php:90 lib/command.php:265 +#: actions/leavegroup.php:100 lib/command.php:265 msgid "You are not a member of that group." msgstr "" -#: actions/leavegroup.php:127 +#: actions/leavegroup.php:137 #, php-format msgid "%1$s left group %2$s" msgstr "" @@ -2194,8 +2203,8 @@ msgstr "" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1040 -#: lib/api.php:1068 lib/api.php:1177 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1039 +#: lib/apiaction.php:1067 lib/apiaction.php:1176 msgid "Not a supported data format." msgstr "" @@ -2208,7 +2217,7 @@ msgid "Notice Search" msgstr "" #: actions/othersettings.php:60 -msgid "Other settings" +msgid "Other Settings" msgstr "" #: actions/othersettings.php:71 @@ -2334,7 +2343,7 @@ msgstr "" msgid "Password saved." msgstr "" -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:342 msgid "Paths" msgstr "" @@ -2367,7 +2376,7 @@ msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" #: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:311 +#: lib/adminpanelaction.php:322 msgid "Site" msgstr "" @@ -2535,7 +2544,7 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "" #: actions/profilesettings.php:111 actions/register.php:448 -#: actions/showgroup.php:247 actions/tagother.php:104 +#: actions/showgroup.php:255 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "" @@ -2563,7 +2572,7 @@ msgid "Bio" msgstr "" #: actions/profilesettings.php:132 actions/register.php:471 -#: actions/showgroup.php:256 actions/tagother.php:112 +#: actions/showgroup.php:264 actions/tagother.php:112 #: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" @@ -3032,7 +3041,7 @@ msgstr "" msgid "You already repeated that notice." msgstr "" -#: actions/repeat.php:114 lib/noticelist.php:656 +#: actions/repeat.php:114 lib/noticelist.php:674 msgid "Repeated" msgstr "" @@ -3105,7 +3114,7 @@ msgid "User is already sandboxed." msgstr "" #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 -#: lib/adminpanelaction.php:336 +#: lib/adminpanelaction.php:347 msgid "Sessions" msgstr "" @@ -3160,7 +3169,7 @@ msgstr "" msgid "Description" msgstr "" -#: actions/showapplication.php:192 actions/showgroup.php:429 +#: actions/showapplication.php:192 actions/showgroup.php:437 #: lib/profileaction.php:174 msgid "Statistics" msgstr "" @@ -3271,67 +3280,67 @@ msgstr "" msgid "%1$s group, page %2$d" msgstr "" -#: actions/showgroup.php:218 +#: actions/showgroup.php:226 msgid "Group profile" msgstr "" -#: actions/showgroup.php:263 actions/tagother.php:118 +#: actions/showgroup.php:271 actions/tagother.php:118 #: actions/userauthorization.php:175 lib/userprofile.php:177 msgid "URL" msgstr "" -#: actions/showgroup.php:274 actions/tagother.php:128 +#: actions/showgroup.php:282 actions/tagother.php:128 #: actions/userauthorization.php:187 lib/userprofile.php:194 msgid "Note" msgstr "" -#: actions/showgroup.php:284 lib/groupeditform.php:184 +#: actions/showgroup.php:292 lib/groupeditform.php:184 msgid "Aliases" msgstr "" -#: actions/showgroup.php:293 +#: actions/showgroup.php:301 msgid "Group actions" msgstr "" -#: actions/showgroup.php:328 +#: actions/showgroup.php:336 #, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "" -#: actions/showgroup.php:334 +#: actions/showgroup.php:342 #, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "" -#: actions/showgroup.php:340 +#: actions/showgroup.php:348 #, php-format msgid "Notice feed for %s group (Atom)" msgstr "" -#: actions/showgroup.php:345 +#: actions/showgroup.php:353 #, php-format msgid "FOAF for %s group" msgstr "" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 +#: actions/showgroup.php:389 actions/showgroup.php:446 lib/groupnav.php:91 msgid "Members" msgstr "" -#: actions/showgroup.php:386 lib/profileaction.php:117 +#: actions/showgroup.php:394 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 #: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "" -#: actions/showgroup.php:392 +#: actions/showgroup.php:400 msgid "All members" msgstr "" -#: actions/showgroup.php:432 +#: actions/showgroup.php:440 msgid "Created" msgstr "" -#: actions/showgroup.php:448 +#: actions/showgroup.php:456 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3341,7 +3350,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:454 +#: actions/showgroup.php:462 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3350,7 +3359,7 @@ msgid "" "their life and interests. " msgstr "" -#: actions/showgroup.php:482 +#: actions/showgroup.php:490 msgid "Admins" msgstr "" @@ -3861,7 +3870,7 @@ msgstr "" msgid "No such tag." msgstr "" -#: actions/twitapitrends.php:87 +#: actions/twitapitrends.php:85 msgid "API method under construction." msgstr "" @@ -3891,7 +3900,7 @@ msgid "" "Listenee stream license ā€˜%1$sā€™ is not compatible with site license ā€˜%2$sā€™." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:332 #: lib/personalgroupnav.php:115 msgid "User" msgstr "" @@ -4164,6 +4173,10 @@ msgstr "" msgid "Group leave failed." msgstr "" +#: classes/Local_group.php:41 +msgid "Could not update local group." +msgstr "" + #: classes/Login_token.php:76 #, php-format msgid "Could not create login token for %s" @@ -4181,43 +4194,43 @@ msgstr "" msgid "Could not update message with new URI." msgstr "" -#: classes/Notice.php:157 +#: classes/Notice.php:172 #, php-format msgid "DB error inserting hashtag: %s" msgstr "" -#: classes/Notice.php:222 +#: classes/Notice.php:239 msgid "Problem saving notice. Too long." msgstr "" -#: classes/Notice.php:226 +#: classes/Notice.php:243 msgid "Problem saving notice. Unknown user." msgstr "" -#: classes/Notice.php:231 +#: classes/Notice.php:248 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "" -#: classes/Notice.php:237 +#: classes/Notice.php:254 msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "" -#: classes/Notice.php:243 +#: classes/Notice.php:260 msgid "You are banned from posting notices on this site." msgstr "" -#: classes/Notice.php:309 classes/Notice.php:335 +#: classes/Notice.php:326 classes/Notice.php:352 msgid "Problem saving notice." msgstr "" -#: classes/Notice.php:882 +#: classes/Notice.php:911 msgid "Problem saving group inbox." msgstr "" -#: classes/Notice.php:1407 +#: classes/Notice.php:1442 #, php-format msgid "RT @%1$s %2$s" msgstr "" @@ -4242,7 +4255,7 @@ msgstr "" msgid "Couldn't delete self-subscription." msgstr "" -#: classes/Subscription.php:179 lib/subs.php:69 +#: classes/Subscription.php:179 msgid "Couldn't delete subscription." msgstr "" @@ -4251,14 +4264,22 @@ msgstr "" msgid "Welcome to %1$s, @%2$s!" msgstr "" -#: classes/User_group.php:423 +#: classes/User_group.php:462 msgid "Could not create group." msgstr "" -#: classes/User_group.php:452 +#: classes/User_group.php:471 +msgid "Could not set group uri." +msgstr "" + +#: classes/User_group.php:492 msgid "Could not set group membership." msgstr "" +#: classes/User_group.php:506 +msgid "Could not save local group info." +msgstr "" + #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "" @@ -4471,15 +4492,15 @@ msgstr "" msgid "Before" msgstr "" -#: lib/activity.php:382 +#: lib/activity.php:449 msgid "Can't handle remote content yet." msgstr "" -#: lib/activity.php:410 +#: lib/activity.php:477 msgid "Can't handle embedded XML content yet." msgstr "" -#: lib/activity.php:414 +#: lib/activity.php:481 msgid "Can't handle embedded Base64 content yet." msgstr "" @@ -4503,35 +4524,35 @@ msgstr "" msgid "Unable to delete design setting." msgstr "" -#: lib/adminpanelaction.php:312 +#: lib/adminpanelaction.php:323 msgid "Basic site configuration" msgstr "" -#: lib/adminpanelaction.php:317 +#: lib/adminpanelaction.php:328 msgid "Design configuration" msgstr "" -#: lib/adminpanelaction.php:322 +#: lib/adminpanelaction.php:333 msgid "User configuration" msgstr "" -#: lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:338 msgid "Access configuration" msgstr "" -#: lib/adminpanelaction.php:332 +#: lib/adminpanelaction.php:343 msgid "Paths configuration" msgstr "" -#: lib/adminpanelaction.php:337 +#: lib/adminpanelaction.php:348 msgid "Sessions configuration" msgstr "" -#: lib/apiauth.php:95 +#: lib/apiauth.php:94 msgid "API resource requires read-write access, but you only have read access." msgstr "" -#: lib/apiauth.php:273 +#: lib/apiauth.php:272 #, php-format msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" msgstr "" @@ -4621,11 +4642,11 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 +#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 msgid "Password changing failed" msgstr "" -#: lib/authenticationplugin.php:233 +#: lib/authenticationplugin.php:197 msgid "Password changing is not allowed" msgstr "" @@ -4782,7 +4803,7 @@ msgstr "" msgid "Subscribed to %s" msgstr "" -#: lib/command.php:582 lib/command.php:685 +#: lib/command.php:582 msgid "Specify the name of the user to unsubscribe from" msgstr "" @@ -4820,42 +4841,37 @@ msgstr "" msgid "This link is useable only once, and is good for only 2 minutes: %s" msgstr "" -#: lib/command.php:692 -#, php-format -msgid "Unsubscribed %s" -msgstr "" - -#: lib/command.php:709 +#: lib/command.php:681 msgid "You are not subscribed to anyone." msgstr "" -#: lib/command.php:711 +#: lib/command.php:683 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:731 +#: lib/command.php:703 msgid "No one is subscribed to you." msgstr "" -#: lib/command.php:733 +#: lib/command.php:705 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:753 +#: lib/command.php:725 msgid "You are not a member of any groups." msgstr "" -#: lib/command.php:755 +#: lib/command.php:727 msgid "You are a member of this group:" msgid_plural "You are a member of these groups:" msgstr[0] "" msgstr[1] "" -#: lib/command.php:769 +#: lib/command.php:741 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4869,7 +4885,6 @@ msgid "" "d - direct message to user\n" "get - get last notice from user\n" "whois - get profile info on user\n" -"lose - force user to stop following you\n" "fav - add user's last notice as a 'fave'\n" "fav # - add notice with the given id as a 'fave'\n" "repeat # - repeat a notice with a given id\n" @@ -5460,23 +5475,23 @@ msgstr "" msgid "at" msgstr "" -#: lib/noticelist.php:558 +#: lib/noticelist.php:566 msgid "in context" msgstr "" -#: lib/noticelist.php:583 +#: lib/noticelist.php:601 msgid "Repeated by" msgstr "" -#: lib/noticelist.php:610 +#: lib/noticelist.php:628 msgid "Reply to this notice" msgstr "" -#: lib/noticelist.php:611 +#: lib/noticelist.php:629 msgid "Reply" msgstr "" -#: lib/noticelist.php:655 +#: lib/noticelist.php:673 msgid "Notice repeated" msgstr "" @@ -5613,7 +5628,7 @@ msgstr "" msgid "Repeat this notice" msgstr "" -#: lib/router.php:665 +#: lib/router.php:668 msgid "No single user defined for single-user mode." msgstr "" @@ -5754,47 +5769,47 @@ msgstr "" msgid "Moderate" msgstr "" -#: lib/util.php:952 +#: lib/util.php:1000 msgid "a few seconds ago" msgstr "" -#: lib/util.php:954 +#: lib/util.php:1002 msgid "about a minute ago" msgstr "" -#: lib/util.php:956 +#: lib/util.php:1004 #, php-format msgid "about %d minutes ago" msgstr "" -#: lib/util.php:958 +#: lib/util.php:1006 msgid "about an hour ago" msgstr "" -#: lib/util.php:960 +#: lib/util.php:1008 #, php-format msgid "about %d hours ago" msgstr "" -#: lib/util.php:962 +#: lib/util.php:1010 msgid "about a day ago" msgstr "" -#: lib/util.php:964 +#: lib/util.php:1012 #, php-format msgid "about %d days ago" msgstr "" -#: lib/util.php:966 +#: lib/util.php:1014 msgid "about a month ago" msgstr "" -#: lib/util.php:968 +#: lib/util.php:1016 #, php-format msgid "about %d months ago" msgstr "" -#: lib/util.php:970 +#: lib/util.php:1018 msgid "about a year ago" msgstr "" From e529ceee21b4fb0c18f32f7a097bce14229af42f Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 1 Mar 2010 12:20:04 -0800 Subject: [PATCH 2/4] Add index on post_id for file_to_post, needed for efficient lookups of files/urls attached to a given post. --- db/08to09.sql | 2 ++ db/statusnet.sql | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/db/08to09.sql b/db/08to09.sql index b10e47dbcb..582981614e 100644 --- a/db/08to09.sql +++ b/db/08to09.sql @@ -110,3 +110,5 @@ insert into queue_item_new (frame,transport,created,claimed) alter table queue_item rename to queue_item_old; alter table queue_item_new rename to queue_item; +alter table file_to_post + add index post_id_idx (post_id); diff --git a/db/statusnet.sql b/db/statusnet.sql index 4158f0167d..4aa37ce1c5 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -523,7 +523,8 @@ create table file_to_post ( post_id integer comment 'id of the notice it belongs to' references notice (id), modified timestamp comment 'date this record was modified', - constraint primary key (file_id, post_id) + constraint primary key (file_id, post_id), + index post_id_idx (post_id) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; From 946445eea945b28d50f7409815a4913f50061958 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 1 Mar 2010 13:09:20 -0800 Subject: [PATCH 3/4] Add index on group_index.notice_id, needed to pull list of target groups for inbox delivery. Index was present on live identi.ca database but missing from master definitions: group_inbox_notice_id_idx --- db/08to09.sql | 3 +++ db/statusnet.sql | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/db/08to09.sql b/db/08to09.sql index 582981614e..f305721541 100644 --- a/db/08to09.sql +++ b/db/08to09.sql @@ -112,3 +112,6 @@ alter table queue_item_new rename to queue_item; alter table file_to_post add index post_id_idx (post_id); + +alter table group_inbox + add index group_inbox_notice_id_idx (notice_id); diff --git a/db/statusnet.sql b/db/statusnet.sql index 4aa37ce1c5..3f95948e1e 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -458,7 +458,8 @@ create table group_inbox ( created datetime not null comment 'date the notice was created', constraint primary key (group_id, notice_id), - index group_inbox_created_idx (created) + index group_inbox_created_idx (created), + index group_inbox_notice_id_idx (notice_id) ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; From 00f724d0e6380f8177bcee0ff2631783f514508a Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 1 Mar 2010 14:10:13 -0800 Subject: [PATCH 4/4] Localization tweak: include doc comments marked as 'TRANS' in .po file output; these should now get automatically pulled through to the TranslateWiki interface as translator help hints. --- plugins/OStatus/actions/ostatussub.php | 6 + plugins/OStatus/locale/OStatus.po | 280 +++++++++++++++++++++---- scripts/update_po_templates.php | 7 +- 3 files changed, 256 insertions(+), 37 deletions(-) diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php index aae22f868a..f45e6a8d1a 100644 --- a/plugins/OStatus/actions/ostatussub.php +++ b/plugins/OStatus/actions/ostatussub.php @@ -332,6 +332,7 @@ class OStatusSubAction extends Action if ($this->oprofile->isGroup()) { $group = $this->oprofile->localGroup(); if ($user->isMember($group)) { + // TRANS: OStatus remote group subscription dialog error. $this->showForm(_m('Already a member!')); return; } @@ -341,18 +342,22 @@ class OStatusSubAction extends Action Event::handle('EndJoinGroup', array($group, $user)); $this->successGroup(); } else { + // TRANS: OStatus remote group subscription dialog error. $this->showForm(_m('Remote group join failed!')); } } else { + // TRANS: OStatus remote group subscription dialog error. $this->showForm(_m('Remote group join aborted!')); } } else { $local = $this->oprofile->localProfile(); if ($user->isSubscribed($local)) { + // TRANS: OStatus remote subscription dialog error. $this->showForm(_m('Already subscribed!')); } elseif ($this->oprofile->subscribeLocalToRemote($user)) { $this->successUser(); } else { + // TRANS: OStatus remote subscription dialog error. $this->showForm(_m('Remote subscription failed!')); } } @@ -450,6 +455,7 @@ class OStatusSubAction extends Action function title() { + // TRANS: Page title for OStatus remote subscription form return _m('Authorize subscription'); } diff --git a/plugins/OStatus/locale/OStatus.po b/plugins/OStatus/locale/OStatus.po index dedc018e3f..ee19cf3dbd 100644 --- a/plugins/OStatus/locale/OStatus.po +++ b/plugins/OStatus/locale/OStatus.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-07 20:38-0800\n" +"POT-Creation-Date: 2010-03-01 14:08-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,89 +16,297 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: tests/gettext-speedtest.php:57 FeedSubPlugin.php:76 -msgid "Feeds" +#: actions/groupsalmon.php:51 +msgid "Can't accept remote posts for a remote group." msgstr "" -#: FeedSubPlugin.php:77 -msgid "Feed subscription options" +#: actions/groupsalmon.php:123 +msgid "Can't read profile to set up group membership." msgstr "" -#: feedmunger.php:215 +#: actions/groupsalmon.php:126 actions/groupsalmon.php:169 +msgid "Groups can't join groups." +msgstr "" + +#: actions/groupsalmon.php:153 #, php-format -msgid "New post: \"%1$s\" %2$s" +msgid "Could not join remote user %1$s to group %2$s." msgstr "" -#: actions/feedsubsettings.php:41 -msgid "Feed subscriptions" +#: actions/groupsalmon.php:166 +msgid "Can't read profile to cancel group membership." msgstr "" -#: actions/feedsubsettings.php:52 -msgid "" -"You can subscribe to feeds from other sites; updates will appear in your " -"personal timeline." +#: actions/groupsalmon.php:182 +#, php-format +msgid "Could not remove remote user %1$s from group %2$s." msgstr "" -#: actions/feedsubsettings.php:96 +#: actions/ostatusinit.php:40 +msgid "You can use the local subscription!" +msgstr "" + +#: actions/ostatusinit.php:61 +msgid "There was a problem with your session token. Try again, please." +msgstr "" + +#: actions/ostatusinit.php:79 actions/ostatussub.php:439 +msgid "Subscribe to user" +msgstr "" + +#: actions/ostatusinit.php:97 +#, php-format +msgid "Subscribe to %s" +msgstr "" + +#: actions/ostatusinit.php:102 +msgid "User nickname" +msgstr "" + +#: actions/ostatusinit.php:103 +msgid "Nickname of the user you want to follow" +msgstr "" + +#: actions/ostatusinit.php:106 +msgid "Profile Account" +msgstr "" + +#: actions/ostatusinit.php:107 +msgid "Your account id (i.e. user@identi.ca)" +msgstr "" + +#: actions/ostatusinit.php:110 actions/ostatussub.php:115 +#: OStatusPlugin.php:205 msgid "Subscribe" msgstr "" -#: actions/feedsubsettings.php:98 +#: actions/ostatusinit.php:128 +msgid "Must provide a remote profile." +msgstr "" + +#: actions/ostatusinit.php:138 +msgid "Couldn't look up OStatus account profile." +msgstr "" + +#: actions/ostatusinit.php:153 +msgid "Couldn't confirm remote profile address." +msgstr "" + +#: actions/ostatusinit.php:171 +msgid "OStatus Connect" +msgstr "" + +#: actions/ostatussub.php:68 +msgid "Address or profile URL" +msgstr "" + +#: actions/ostatussub.php:70 +msgid "Enter the profile URL of a PubSubHubbub-enabled feed" +msgstr "" + +#: actions/ostatussub.php:74 msgid "Continue" msgstr "" -#: actions/feedsubsettings.php:151 -msgid "Empty feed URL!" +#: actions/ostatussub.php:112 OStatusPlugin.php:503 +msgid "Join" msgstr "" -#: actions/feedsubsettings.php:161 +#: actions/ostatussub.php:113 +msgid "Join this group" +msgstr "" + +#: actions/ostatussub.php:116 +msgid "Subscribe to this user" +msgstr "" + +#: actions/ostatussub.php:137 +msgid "You are already subscribed to this user." +msgstr "" + +#: actions/ostatussub.php:165 +msgid "You are already a member of this group." +msgstr "" + +#: actions/ostatussub.php:286 +msgid "Empty remote profile URL!" +msgstr "" + +#: actions/ostatussub.php:297 +msgid "Invalid address format." +msgstr "" + +#: actions/ostatussub.php:302 msgid "Invalid URL or could not reach server." msgstr "" -#: actions/feedsubsettings.php:164 +#: actions/ostatussub.php:304 msgid "Cannot read feed; server returned error." msgstr "" -#: actions/feedsubsettings.php:167 +#: actions/ostatussub.php:306 msgid "Cannot read feed; server returned an empty page." msgstr "" -#: actions/feedsubsettings.php:170 +#: actions/ostatussub.php:308 msgid "Bad HTML, could not find feed link." msgstr "" -#: actions/feedsubsettings.php:173 +#: actions/ostatussub.php:310 msgid "Could not find a feed linked from this URL." msgstr "" -#: actions/feedsubsettings.php:176 +#: actions/ostatussub.php:312 msgid "Not a recognized feed type." msgstr "" -#: actions/feedsubsettings.php:180 -msgid "Bad feed URL." +#: actions/ostatussub.php:315 +#, php-format +msgid "Bad feed URL: %s %s" msgstr "" -#: actions/feedsubsettings.php:188 -msgid "Feed is not PuSH-enabled; cannot subscribe." +#. TRANS: OStatus remote group subscription dialog error. +#: actions/ostatussub.php:336 +msgid "Already a member!" msgstr "" -#: actions/feedsubsettings.php:208 -msgid "Feed subscription failed! Bad response from hub." +#. TRANS: OStatus remote group subscription dialog error. +#: actions/ostatussub.php:346 +msgid "Remote group join failed!" msgstr "" -#: actions/feedsubsettings.php:218 +#. TRANS: OStatus remote group subscription dialog error. +#: actions/ostatussub.php:350 +msgid "Remote group join aborted!" +msgstr "" + +#. TRANS: OStatus remote subscription dialog error. +#: actions/ostatussub.php:356 msgid "Already subscribed!" msgstr "" -#: actions/feedsubsettings.php:220 -msgid "Feed subscribed!" +#. TRANS: OStatus remote subscription dialog error. +#: actions/ostatussub.php:361 +msgid "Remote subscription failed!" msgstr "" -#: actions/feedsubsettings.php:222 -msgid "Feed subscription failed!" +#. TRANS: Page title for OStatus remote subscription form +#: actions/ostatussub.php:459 +msgid "Authorize subscription" msgstr "" -#: actions/feedsubsettings.php:231 -msgid "Previewing feed:" +#: actions/ostatussub.php:470 +msgid "" +"You can subscribe to users from other supported sites. Paste their address " +"or profile URI below:" +msgstr "" + +#: classes/Ostatus_profile.php:789 +#, php-format +msgid "Tried to update avatar for unsaved remote profile %s" +msgstr "" + +#: classes/Ostatus_profile.php:797 +#, php-format +msgid "Unable to fetch avatar from %s" +msgstr "" + +#: lib/salmonaction.php:41 +msgid "This method requires a POST." +msgstr "" + +#: lib/salmonaction.php:45 +msgid "Salmon requires application/magic-envelope+xml" +msgstr "" + +#: lib/salmonaction.php:55 +msgid "Salmon signature verification failed." +msgstr "" + +#: lib/salmonaction.php:66 +msgid "Salmon post must be an Atom entry." +msgstr "" + +#: lib/salmonaction.php:114 +msgid "Unrecognized activity type." +msgstr "" + +#: lib/salmonaction.php:122 +msgid "This target doesn't understand posts." +msgstr "" + +#: lib/salmonaction.php:127 +msgid "This target doesn't understand follows." +msgstr "" + +#: lib/salmonaction.php:132 +msgid "This target doesn't understand unfollows." +msgstr "" + +#: lib/salmonaction.php:137 +msgid "This target doesn't understand favorites." +msgstr "" + +#: lib/salmonaction.php:142 +msgid "This target doesn't understand unfavorites." +msgstr "" + +#: lib/salmonaction.php:147 +msgid "This target doesn't understand share events." +msgstr "" + +#: lib/salmonaction.php:152 +msgid "This target doesn't understand joins." +msgstr "" + +#: lib/salmonaction.php:157 +msgid "This target doesn't understand leave events." +msgstr "" + +#: OStatusPlugin.php:319 +#, php-format +msgid "Sent from %s via OStatus" +msgstr "" + +#: OStatusPlugin.php:371 +msgid "Could not set up remote subscription." +msgstr "" + +#: OStatusPlugin.php:487 +msgid "Could not set up remote group membership." +msgstr "" + +#: OStatusPlugin.php:504 +#, php-format +msgid "%s has joined group %s." +msgstr "" + +#: OStatusPlugin.php:512 +msgid "Failed joining remote group." +msgstr "" + +#: OStatusPlugin.php:553 +msgid "Leave" +msgstr "" + +#: OStatusPlugin.php:554 +#, php-format +msgid "%s has left group %s." +msgstr "" + +#: OStatusPlugin.php:685 +msgid "Subscribe to remote user" +msgstr "" + +#: OStatusPlugin.php:726 +msgid "Profile update" +msgstr "" + +#: OStatusPlugin.php:727 +#, php-format +msgid "%s has updated their profile page." +msgstr "" + +#: tests/gettext-speedtest.php:57 +msgid "Feeds" msgstr "" diff --git a/scripts/update_po_templates.php b/scripts/update_po_templates.php index 61a6ac7833..0bfa62a22e 100755 --- a/scripts/update_po_templates.php +++ b/scripts/update_po_templates.php @@ -36,7 +36,11 @@ xgettext \ --default-domain=$domain \ --output=locale/$domain.po \ --language=PHP \ - --keyword="_m:1" \ + --add-comments=TRANS \ + --keyword="_m:1,1t" \ + --keyword="_m:1c,2,2t" \ + --keyword="_m:1,2,3t" \ + --keyword="_m:1c,2,3,4t" \ --keyword="pgettext:1c,2" \ --keyword="npgettext:1c,2,3" \ actions/*.php \ @@ -62,6 +66,7 @@ xgettext \ --default-domain=$domain \ --output=locale/$domain.po \ --language=PHP \ + --add-comments=TRANS \ --keyword='' \ --keyword="_m:1,1t" \ --keyword="_m:1c,2,2t" \